Changeset 3561 for trunk/configure.ac

Timestamp:

Jan 4, 2017, 1:55:10 AM (6 years ago)

Author:

Peter

Message:

Merged release 0.13.1 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -247 +247 @@
 # skip boost link tests if boost is not wanted (--without-boost)
 AS_IF([test x"$want_boost" = x"yes"],[
+  AX_BOOST_SYSTEM
+  LIBS="$BOOST_SYSTEM_LIB $LIBS"
   AX_BOOST_THREAD
-  AX_BOOST_SYSTEM
   YAT_CPP_ADD_FLAG([CPPFLAGS], [$BOOST_CPPFLAGS])
   YAT_LD_ADD_FLAG([LDFLAGS], [$BOOST_LDFLAGS])
-  # boost tests above only test compilation, so let's try link in the libs
-  LIBS="$LIBS $BOOST_THREAD_LIB $BOOST_SYSTEM_LIB"
+  LIBS="$BOOST_THREAD_LIB $LIBS"
+  # linking tests in AX_BOOST_SYSTEM occasionaly miss to detect
+  # missing lib (see ticket #719), so link specifically here to catch
+  # that case.
   AC_MSG_CHECKING([for boost::thread_specific_ptr])
   AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <boost/thread/tss.hpp>],
@@ -533 +536 @@
 AS_IF([test x$with_htslib != x"no"], [
   # htslib comes with a pc file, so we can require htslib in yat.pc
-  AS_IF([test x$with_hts = x"yes"], [
+  AS_IF([test x$have_hts = x"yes"], [
     YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [$BAM_LIBS -lz])
     YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lhts], [
@@ -544 +547 @@
     # require zlib
     YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [-lz])
-    YAT_PC_REQUIRES="$YAT_PC_REQUIRES zlib"
     YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lz], [
       YAT_PC_REQUIRES_PRIVATE="$YAT_PC_REQUIRES_PRIVATE zlib"