Ignore:
Timestamp:
01/25/12 18:06:23 (13 years ago)
Author:
tbretz
Message:
Make sure that the boost libarary check stop configure if they fail; moved the -std=c++0x behind the boost libarary checks otherwise the check for boost::thread fails for some boost versions with gcc 4.5
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/configure.ac

    r12768 r12769  
    4747#AC_CXX_HEADER_STDCXX_0X
    4848AC_CXX_COMPILE_STDCXX_0X
    49 if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
    50    AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.])
    51 fi
    52 
    53 CXXFLAGS+=" -std=c++0x"
     49AS_IF([test "$ax_cv_cxx_compile_cxx0x_cxx" != yes],
     50   AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.]))
     51
     52# Postponed after the BOOST library tests otherwise the check for boost::thread fails
     53#CXXFLAGS+=" -std=c++0x"
    5454
    5555######################################################################
     
    110110# Needed to compile FACT++
    111111AC_CHECK_READLINE
    112 
    113 if test "x$have_readline" != "xyes"; then
    114    AC_MSG_ERROR([The readline library is not properly installed.])
    115 fi
     112AS_IF([test "x$have_readline" != "xyes"],
     113   AC_MSG_ERROR([The readline library is not properly installed.]))
    116114
    117115CPPFLAGS+=" "$READLINE_INCLUDES
     
    200198# Keep this order AX_BOOST_FILESYSTEM needs AX_BOOST_SYSTEM_LIB
    201199AX_BOOST_SYSTEM
     200AS_IF([test "x$ax_cv_boost_system" != "xyes"],
     201   AC_MSG_ERROR([Problems with the Boost::System libarary.]))
     202
    202203AX_BOOST_ASIO
     204AS_IF([test "x$ax_cv_boost_asio" != "xyes"],
     205   AC_MSG_ERROR([Problems with the Boost::ASIO libarary.]))
     206
    203207AX_BOOST_DATE_TIME
     208AS_IF([test "x$ax_cv_boost_date_time" != "xyes"],
     209   AC_MSG_ERROR([Problems with the Boost::Date_Time libarary.]))
     210
    204211AX_BOOST_FILESYSTEM
     212AS_IF([test "x$ax_cv_boost_filesystem" != "xyes"],
     213   AC_MSG_ERROR([Problems with the Boost::Filesystem libarary.]))
     214
    205215AX_BOOST_PROGRAM_OPTIONS
     216AS_IF([test "x$ax_cv_boost_program_options" != "xyes"],
     217   AC_MSG_ERROR([Problems with the Boost::Program_Options libarary.]))
     218
    206219AX_BOOST_REGEX
     220AS_IF([test "x$ax_cv_boost_regex" != "xyes"],
     221   AC_MSG_ERROR([Problems with the Boost::Regex libarary.]))
     222
    207223AX_BOOST_THREAD
     224AS_IF([test "x$ax_cv_boost_thread" != "xyes"],
     225   AC_MSG_ERROR([Problems with the Boost::Thread libarary.]))
    208226#AX_BOOST_IOSTREAMS
    209227#AX_BOOST_PYTHON
     
    225243
    226244CPPFLAGS+=" "$BOOST_CPPFLAGS
     245
     246# Now we can safely add the compiler option for your prefered standard
     247CXXFLAGS+=" -std=c++0x"
    227248
    228249#AC_CHECK_HEADERS(
Note: See TracChangeset for help on using the changeset viewer.