diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-10-26 20:31:30 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-10-26 20:31:30 +0000 |
| commit | 3b0db7521b3b71425d5a726285a4179b0b7b33fa (patch) | |
| tree | a6511fa49aef8cc497669e91b5f5474940c79231 /config | |
| parent | 8745a7d237a14b4f6b899b651c2d99bbd68c1772 (diff) | |
new boost.m4 makes boost-thread require boost-system. relax this dependence (since it doesn't appear to affect us?!), and make it non-fatal anyway, since threads aren't strictly required for all cvc4 builds. give a warning.
Diffstat (limited to 'config')
| -rw-r--r-- | config/boost.m4 | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/config/boost.m4 b/config/boost.m4 index 6252f966c..8eb1b7b18 100644 --- a/config/boost.m4 +++ b/config/boost.m4 @@ -420,17 +420,19 @@ done done rm -f conftest.$ac_objext ]) -case $Boost_lib in #( +case $Boost_lib in #(( no) _AC_MSG_LOG_CONFTEST m4_if([$6], [], [AC_MSG_ERROR([cannot find the flags to link with Boost $1])], [AC_MSG_NOTICE([cannot find the flags to link with Boost $1])]) $6 ;; + *) + AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl + AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl + AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl + AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl + ;; esac -AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl -AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl -AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl -AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl CPPFLAGS=$boost_save_CPPFLAGS AS_VAR_POPDEF([Boost_lib])dnl AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl @@ -804,15 +806,16 @@ BOOST_DEFUN([String_Algo], ]) -# BOOST_SYSTEM([PREFERRED-RT-OPT]) -# -------------------------------- +# BOOST_SYSTEM([PREFERRED-RT-OPT], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------------------- # Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the # documentation of BOOST_FIND_LIB above. This library was introduced in Boost # 1.35.0. BOOST_DEFUN([System], [BOOST_FIND_LIB([system], [$1], [boost/system/error_code.hpp], - [boost::system::error_code e; e.clear();]) + [boost::system::error_code e; e.clear();], + [], [$2]) ])# BOOST_SYSTEM @@ -846,7 +849,7 @@ boost_threads_save_LDFLAGS=$LDFLAGS boost_threads_save_CPPFLAGS=$CPPFLAGS # Link-time dependency from thread to system was added as of 1.49.0. if test $boost_major_version -ge 149; then -BOOST_SYSTEM([$1]) +BOOST_SYSTEM([$1], [AC_MSG_WARN([[Boost system library (libboost-system) not installed or unusable; this may lead to problems with using threads. It is recommended that you install your distribution's libboost-system development package (probably named libboost-system###-dev, or boost-system-devel, or something like that).]])]) fi # end of the Boost.System check. m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" |