Changeset 3960

Timestamp:

Aug 1, 2020, 6:17:31 AM (3 years ago)

Author:

Peter

Message:

closes #953. Since we are no longer using libboost_thread (or
underlying libbost_system), stop linking agaist them. Instead look for
needed compiler and extra LIBS needed for thread support.

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• m4/ax_boost_system.m4 (deleted)
• m4/ax_boost_thread.m4 (deleted)
• m4/yat_thread.m4 (added)

trunk/NEWS

@@ -7 +7 @@
   - yat now requires GSL 1.13 or later (ticket #945)
   - Building against libbam is no longer supported (ticket #939)
+  - libyat is no longer linked against libboost_system and
+    libboost_thread (ticket #953)
+  - macro YAT_HAVE_WORKING_BOOST_EXCEPTION_PTR is no longer #defined
+    in yat/utility/config_public.h (ticket #953)
   - configure option --disable-cxx11 is no longer supported (ticket #949)
   - configure option --without-samtools is no longer supported; use

trunk/configure.ac

@@ -239 +239 @@
 YAT_USE_LIBTOOL_PUSH
 
+YAT_THREAD([
+  CPPFLAGS="$CPPFLAGS $YAT_THREAD_CPPFLAGS"
+  LIBS="$LIBS $YAT_THREAD_LIBS"
+], [
+  AC_MSG_FAILURE([$CXX does not work with std::thread])
+])
+
 # Checks for libraries.
 AC_MSG_NOTICE([checking for libraries])
@@ -269 +276 @@
 # 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
   YAT_CPP_ADD_FLAG([CPPFLAGS], [$BOOST_CPPFLAGS])
   YAT_LD_ADD_FLAG([LDFLAGS], [$BOOST_LDFLAGS])
-  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>],
-                                  [boost::thread_specific_ptr<int> x;
-                                   x.reset(new int(1));])],
-                 [AC_MSG_RESULT([yes])],
-                 [AC_MSG_RESULT([no])
-                  AC_MSG_FAILURE([Boost thread library not found.])
-                 ])
-  # Check if $BOOST_THREAD_LIB is appropriate for libyat.la
-  YAT_CHECK_LA_LIBS([
-    @%:@include <boost/thread.hpp>
-    int my_func(void)
-    { boost::mutex mutex_; return 0; }
-  ], [$BOOST_THREAD_LIB $user_LIBS], [$BOOST_THREAD_LIB], [YAT_STATIC_LIBS])
-  # Check if $BOOST_SYSTEM_LIB is appropriate for libyat.la
-  YAT_CHECK_LA_LIBS([
-    @%:@include <boost/system/error_code.hpp>
-    int my_func(void)
-    { boost::system::system_category; return 0; }
-  ], [$BOOST_SYSTEM_LIB $user_LIBS], [$BOOST_SYSTEM_LIB], [YAT_STATIC_LIBS])
-
   AX_BOOST_IOSTREAMS
   LIBS="$BOOST_IOSTREAMS_LIB $LIBS"
@@ -350 +329 @@
   [AC_MSG_RESULT([no])]
 )
-
-# Workaround problem that boost 1.41 does not work with certain versions of GCC
-# see ticket #762
-AC_MSG_CHECKING([if boost::mutex workaround is needed])
-AC_COMPILE_IFELSE(
-  [AC_LANG_PROGRAM([@%:@include <boost/thread.hpp>],
-                   [boost::mutex mutex;]
-   )],
-  [AC_MSG_RESULT([no])
-   AC_DEFINE([YAT_HAVE_WORKING_BOOST_EXCEPTION_PTR], [1],
-             [Define to 1 if boost::exception_ptr works])
-  ],
-  [AC_MSG_RESULT([yes])])
 
 # Check if boost::iterator_facade::operator-> works with a proxy class