[Opentrep-svn] SF.net SVN: opentrep:[202] trunk/opentrep/config/ax_boost.m4
Status: Beta
Brought to you by:
denis_arnaud
From: <den...@us...> - 2009-10-09 08:55:39
|
Revision: 202 http://opentrep.svn.sourceforge.net/opentrep/?rev=202&view=rev Author: denis_arnaud Date: 2009-10-09 08:55:29 +0000 (Fri, 09 Oct 2009) Log Message: ----------- [Conf] Improved the Boost M4 macro file (added Boost System library). Modified Paths: -------------- trunk/opentrep/config/ax_boost.m4 Modified: trunk/opentrep/config/ax_boost.m4 =================================================================== --- trunk/opentrep/config/ax_boost.m4 2009-10-04 18:10:32 UTC (rev 201) +++ trunk/opentrep/config/ax_boost.m4 2009-10-09 08:55:29 UTC (rev 202) @@ -10,6 +10,7 @@ dnl dnl AC_SUBST(BOOST_CFLAGS) / AC_SUBST(BOOST_LIBS) dnl AC_SUBST(BOOST_FILESYSTEM_LIB) +dnl AC_SUBST(BOOST_SYSTEM_LIB) dnl AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) dnl AC_SUBST(BOOST_THREAD_LIB) dnl AC_SUBST(BOOST_IOSTREAMS_LIB) @@ -25,6 +26,7 @@ dnl dnl HAVE_BOOST dnl HAVE_BOOST_FILESYSTEM +dnl HAVE_BOOST_SYSTEM dnl HAVE_BOOST_PROGRAM_OPTIONS dnl HAVE_BOOST_THREAD dnl HAVE_BOOST_IOSTREAMS @@ -58,6 +60,12 @@ ], [want_boost="yes"]) + AC_ARG_WITH([boost-libs-suffixes], + AC_HELP_STRING([--with-boost-libs-suffixes=SUF1,SUF2...], + [Specify the list of suffix to append to boost libs to try them (separated by commas)]), + [ac_boost_libs_suffixes="$withval"], + [ac_boost_libs_suffixes=",-mt,-$CC,-$CC-mt,-$CC-mt-s,-$CC-s,-mgw,-mgw-mt,-mgw-mt-s,-mgw-s"]) + # AC_CANONICAL_BUILD BOOST_MDW_VERSION="1-33-1" BOOSTLIB_MDW_VERSION="1_33_1" @@ -248,10 +256,7 @@ if test "$ax_cv_boost_filesystem" = "yes"; then AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available]) BN=boost_filesystem - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ - $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break], [link_filesystem="no"]) @@ -261,6 +266,30 @@ fi fi + AC_CACHE_CHECK([whether the Boost::System library is available], + ax_cv_boost_system, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]], + [[using namespace boost::system; + error_code myErrorCode(); + return 0;]]), + ax_cv_boost_system=yes, ax_cv_boost_system=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_boost_system" = "yes"; then + AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::SYSTEM library is available]) + BN=boost_system + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do + AC_CHECK_LIB($ax_lib, main, + [BOOST_SYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes" break], + [link_system="no"]) + done + if test "x$link_system" = "xno"; then + AC_MSG_NOTICE(Could not link against $ax_lib !) + fi + fi + AC_CACHE_CHECK([whether the Boost::Program_Options library is available], ax_cv_boost_program_options, [AC_LANG_SAVE @@ -274,11 +303,7 @@ if test "$ax_cv_boost_program_options" = yes; then AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available]) BN=boost_program_options - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break], [link_program_options="no"]) @@ -320,11 +345,7 @@ AC_SUBST(BOOST_CFLAGS) AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available]) BN=boost_thread - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes" break], [link_thread="no"]) done @@ -351,11 +372,7 @@ if test "x$ax_cv_boost_iostreams" = "xyes"; then AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available]) BN=boost_iostreams - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break], [link_thread="no"]) done @@ -382,21 +399,13 @@ if test "x$ax_cv_boost_serialization" = "xyes"; then AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available]) BN=boost_serialization - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break], [link_thread="no"]) done BN=boost_wserialization - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break], [link_thread="no"]) @@ -421,11 +430,7 @@ if test "x$ax_cv_boost_signals" = "xyes"; then AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available]) BN=boost_signals - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_thread="yes" break], [link_thread="no"]) done @@ -449,11 +454,7 @@ if test "x$ax_cv_boost_date_time" = "xyes"; then AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available]) BN=boost_date_time - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_thread="yes" break], [link_thread="no"]) done @@ -475,11 +476,7 @@ if test "x$ax_cv_boost_regex" = "xyes"; then AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available]) BN=boost_regex - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt \ - $BN-mgw-mt-s $BN-mgw-s \ - $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break], [link_thread="no"]) done @@ -488,27 +485,47 @@ fi fi + # AC_CACHE_CHECK(whether the Boost::Mpi library is available, + # ax_cv_boost_mpi, + # [AC_LANG_SAVE + # AC_LANG_CPLUSPLUS + + # saved_cflags="${CPPFLAGS}" + # saved_ldflags="${LDFLAGS}" + # CPPFLAGS="${CPPFLAGS} ${OPENMPI_CFLAGS}" + # LDFLAGS="${LDFLAGS} ${OPENMPI_LIBS}" + + # AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi/communicator.hpp> + # ]], + # [[boost::mpi::communicator world; return 0;]]), + # ax_cv_boost_mpi=yes, ax_cv_boost_mpi=no) + # AC_LANG_RESTORE + # CPPFLAGS="${saved_cflags}" + # LDFLAGS="${saved_ldflags}" + # ]) + AC_CACHE_CHECK(whether the Boost::Python library is available, ax_cv_boost_python, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS saved_cflags="${CPPFLAGS}" saved_ldflags="${LDFLAGS}" CPPFLAGS="${CPPFLAGS} ${PYTHON_CFLAGS}" LDFLAGS="${LDFLAGS} ${PYTHON_LIBS} ${PYTHON_ADD_LIBS}" - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/python.hpp> char const* greet() { return "hello"; } BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet); }]]), + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/python.hpp> + char const* greet() { return "hello"; } + BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet); }]]), ax_cv_boost_python=yes, ax_cv_boost_python=no) AC_LANG_RESTORE + CPPFLAGS="${saved_cflags}" + LDFLAGS="${saved_ldflags}" ]) BOOST_PYTHON_LIB="-lboost_python" AC_SUBST(BOOST_PYTHON_LIB) - CPPFLAGS="${saved_cflags}" - LDFLAGS="${saved_ldflags}" - AC_CACHE_CHECK(whether the Boost::UnitTestFramework library is available, ax_cv_boost_unit_test_framework, [AC_LANG_SAVE @@ -523,10 +540,7 @@ AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available]) BN=boost_unit_test_framework saved_ldflags="${LDFLAGS}" - for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ - lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \ - lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \ - $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do + for ax_lib in $(echo ${ac_boost_libs_suffixes} | tr ',' '\n' | while read suffix; do echo $BN$suffix lib$BN$suffix; done); do LDFLAGS="${LDFLAGS} -l$ax_lib" AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library, ax_cv_boost_unit_test_framework, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |