Changeset 12769


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
Location:
trunk/FACT++
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/configure

    r12768 r12769  
    47964796  fi
    47974797
    4798 if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
    4799    as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
    4800 fi
    4801 
    4802 CXXFLAGS+=" -std=c++0x"
     4798if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then :
     4799  as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
     4800fi
     4801
     4802# Postponed after the BOOST library tests otherwise the check for boost::thread fails
     4803#CXXFLAGS+=" -std=c++0x"
    48034804
    48044805######################################################################
     
    53565357  lt_cv_nm_interface="BSD nm"
    53575358  echo "int some_variable = 0;" > conftest.$ac_ext
    5358   (eval echo "\"\$as_me:5358: $ac_compile\"" >&5)
     5359  (eval echo "\"\$as_me:5359: $ac_compile\"" >&5)
    53595360  (eval "$ac_compile" 2>conftest.err)
    53605361  cat conftest.err >&5
    5361   (eval echo "\"\$as_me:5361: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     5362  (eval echo "\"\$as_me:5362: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    53625363  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    53635364  cat conftest.err >&5
    5364   (eval echo "\"\$as_me:5364: output\"" >&5)
     5365  (eval echo "\"\$as_me:5365: output\"" >&5)
    53655366  cat conftest.out >&5
    53665367  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     
    65676568*-*-irix6*)
    65686569  # Find out which ABI we are using.
    6569   echo '#line 6569 "configure"' > conftest.$ac_ext
     6570  echo '#line 6570 "configure"' > conftest.$ac_ext
    65706571  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    65716572  (eval $ac_compile) 2>&5
     
    82278228   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82288229   -e 's:$: $lt_compiler_flag:'`
    8229    (eval echo "\"\$as_me:8229: $lt_compile\"" >&5)
     8230   (eval echo "\"\$as_me:8230: $lt_compile\"" >&5)
    82308231   (eval "$lt_compile" 2>conftest.err)
    82318232   ac_status=$?
    82328233   cat conftest.err >&5
    8233    echo "$as_me:8233: \$? = $ac_status" >&5
     8234   echo "$as_me:8234: \$? = $ac_status" >&5
    82348235   if (exit $ac_status) && test -s "$ac_outfile"; then
    82358236     # The compiler can only warn and ignore the option if not recognized
     
    85668567   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85678568   -e 's:$: $lt_compiler_flag:'`
    8568    (eval echo "\"\$as_me:8568: $lt_compile\"" >&5)
     8569   (eval echo "\"\$as_me:8569: $lt_compile\"" >&5)
    85698570   (eval "$lt_compile" 2>conftest.err)
    85708571   ac_status=$?
    85718572   cat conftest.err >&5
    8572    echo "$as_me:8572: \$? = $ac_status" >&5
     8573   echo "$as_me:8573: \$? = $ac_status" >&5
    85738574   if (exit $ac_status) && test -s "$ac_outfile"; then
    85748575     # The compiler can only warn and ignore the option if not recognized
     
    86718672   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86728673   -e 's:$: $lt_compiler_flag:'`
    8673    (eval echo "\"\$as_me:8673: $lt_compile\"" >&5)
     8674   (eval echo "\"\$as_me:8674: $lt_compile\"" >&5)
    86748675   (eval "$lt_compile" 2>out/conftest.err)
    86758676   ac_status=$?
    86768677   cat out/conftest.err >&5
    8677    echo "$as_me:8677: \$? = $ac_status" >&5
     8678   echo "$as_me:8678: \$? = $ac_status" >&5
    86788679   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    86798680   then
     
    87268727   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87278728   -e 's:$: $lt_compiler_flag:'`
    8728    (eval echo "\"\$as_me:8728: $lt_compile\"" >&5)
     8729   (eval echo "\"\$as_me:8729: $lt_compile\"" >&5)
    87298730   (eval "$lt_compile" 2>out/conftest.err)
    87308731   ac_status=$?
    87318732   cat out/conftest.err >&5
    8732    echo "$as_me:8732: \$? = $ac_status" >&5
     8733   echo "$as_me:8733: \$? = $ac_status" >&5
    87338734   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87348735   then
     
    1111011111  lt_status=$lt_dlunknown
    1111111112  cat > conftest.$ac_ext <<_LT_EOF
    11112 #line 11112 "configure"
     11113#line 11113 "configure"
    1111311114#include "confdefs.h"
    1111411115
     
    1120611207  lt_status=$lt_dlunknown
    1120711208  cat > conftest.$ac_ext <<_LT_EOF
    11208 #line 11208 "configure"
     11209#line 11209 "configure"
    1120911210#include "confdefs.h"
    1121011211
     
    1316213163   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1316313164   -e 's:$: $lt_compiler_flag:'`
    13164    (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
     13165   (eval echo "\"\$as_me:13165: $lt_compile\"" >&5)
    1316513166   (eval "$lt_compile" 2>conftest.err)
    1316613167   ac_status=$?
    1316713168   cat conftest.err >&5
    13168    echo "$as_me:13168: \$? = $ac_status" >&5
     13169   echo "$as_me:13169: \$? = $ac_status" >&5
    1316913170   if (exit $ac_status) && test -s "$ac_outfile"; then
    1317013171     # The compiler can only warn and ignore the option if not recognized
     
    1326113262   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1326213263   -e 's:$: $lt_compiler_flag:'`
    13263    (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
     13264   (eval echo "\"\$as_me:13264: $lt_compile\"" >&5)
    1326413265   (eval "$lt_compile" 2>out/conftest.err)
    1326513266   ac_status=$?
    1326613267   cat out/conftest.err >&5
    13267    echo "$as_me:13267: \$? = $ac_status" >&5
     13268   echo "$as_me:13268: \$? = $ac_status" >&5
    1326813269   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1326913270   then
     
    1331313314   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1331413315   -e 's:$: $lt_compiler_flag:'`
    13315    (eval echo "\"\$as_me:13315: $lt_compile\"" >&5)
     13316   (eval echo "\"\$as_me:13316: $lt_compile\"" >&5)
    1331613317   (eval "$lt_compile" 2>out/conftest.err)
    1331713318   ac_status=$?
    1331813319   cat out/conftest.err >&5
    13319    echo "$as_me:13319: \$? = $ac_status" >&5
     13320   echo "$as_me:13320: \$? = $ac_status" >&5
    1332013321   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1332113322   then
     
    1764617647  fi
    1764717648
    17648 
    17649 if test "x$have_readline" != "xyes"; then
    17650    as_fn_error $? "The readline library is not properly installed." "$LINENO" 5
     17649if test "x$have_readline" != "xyes"; then :
     17650  as_fn_error $? "The readline library is not properly installed." "$LINENO" 5
    1765117651fi
    1765217652
     
    2002920029        fi
    2003020030
     20031if test "x$ax_cv_boost_system" != "xyes"; then :
     20032  as_fn_error $? "Problems with the Boost::System libarary." "$LINENO" 5
     20033fi
     20034
    2003120035
    2003220036
     
    2020620210        LDFLAGS="$LDFLAGS_SAVED"
    2020720211        fi
     20212
     20213if test "x$ax_cv_boost_asio" != "xyes"; then :
     20214  as_fn_error $? "Problems with the Boost::ASIO libarary." "$LINENO" 5
     20215fi
    2020820216
    2020920217
     
    2043320441        fi
    2043420442
     20443if test "x$ax_cv_boost_date_time" != "xyes"; then :
     20444  as_fn_error $? "Problems with the Boost::Date_Time libarary." "$LINENO" 5
     20445fi
     20446
    2043520447
    2043620448
     
    2066920681        fi
    2067020682
     20683if test "x$ax_cv_boost_filesystem" != "xyes"; then :
     20684  as_fn_error $? "Problems with the Boost::Filesystem libarary." "$LINENO" 5
     20685fi
     20686
    2067120687
    2067220688
     
    2089120907        fi
    2089220908
     20909if test "x$ax_cv_boost_program_options" != "xyes"; then :
     20910  as_fn_error $? "Problems with the Boost::Program_Options libarary." "$LINENO" 5
     20911fi
     20912
    2089320913
    2089420914
     
    2111421134        LDFLAGS="$LDFLAGS_SAVED"
    2111521135        fi
     21136
     21137if test "x$ax_cv_boost_regex" != "xyes"; then :
     21138  as_fn_error $? "Problems with the Boost::Regex libarary." "$LINENO" 5
     21139fi
    2111621140
    2111721141
     
    2138321407        fi
    2138421408
     21409if test "x$ax_cv_boost_thread" != "xyes"; then :
     21410  as_fn_error $? "Problems with the Boost::Thread libarary." "$LINENO" 5
     21411fi
    2138521412#AX_BOOST_IOSTREAMS
    2138621413#AX_BOOST_PYTHON
     
    2140221429
    2140321430CPPFLAGS+=" "$BOOST_CPPFLAGS
     21431
     21432# Now we can safely add the compiler option for your prefered standard
     21433CXXFLAGS+=" -std=c++0x"
    2140421434
    2140521435#AC_CHECK_HEADERS(
     
    2260322633
    2260422634                cat > conftest.$ac_ext <<EOF
    22605 #line 22605 "configure"
     22635#line 22635 "configure"
    2260622636#include "confdefs.h"
    2260722637#include <qglobal.h>
  • 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.