Changeset 12769

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:

• configure (modified) (22 diffs)
• configure.ac (modified) (4 diffs)

trunk/FACT++/configure

@@ -4796 +4796 @@
   fi
 
-if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
-   as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
-fi
-
-CXXFLAGS+=" -std=c++0x"
+if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then :
+  as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
+fi
+
+# Postponed after the BOOST library tests otherwise the check for boost::thread fails
+#CXXFLAGS+=" -std=c++0x"
 
 ######################################################################
@@ -5356 +5357 @@
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5358: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5359: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5361: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5362: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5364: output\"" >&5)
+  (eval echo "\"\$as_me:5365: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -6567 +6568 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6569 "configure"' > conftest.$ac_ext
+  echo '#line 6570 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -8227 +8228 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8229: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8233: \$? = $ac_status" >&5
+   echo "$as_me:8234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8566 +8567 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8568: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8569: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8572: \$? = $ac_status" >&5
+   echo "$as_me:8573: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8671 +8672 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8673: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8674: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8677: \$? = $ac_status" >&5
+   echo "$as_me:8678: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -8726 +8727 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8728: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8729: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8732: \$? = $ac_status" >&5
+   echo "$as_me:8733: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -11110 +11111 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11112 "configure"
+#line 11113 "configure"
 #include "confdefs.h"
 
@@ -11206 +11207 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11208 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 
@@ -13162 +13163 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13165: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13168: \$? = $ac_status" >&5
+   echo "$as_me:13169: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -13261 +13262 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13264: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13267: \$? = $ac_status" >&5
+   echo "$as_me:13268: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -13313 +13314 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13315: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13316: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13319: \$? = $ac_status" >&5
+   echo "$as_me:13320: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -17646 +17647 @@
   fi
 
-
-if test "x$have_readline" != "xyes"; then
-   as_fn_error $? "The readline library is not properly installed." "$LINENO" 5
+if test "x$have_readline" != "xyes"; then :
+  as_fn_error $? "The readline library is not properly installed." "$LINENO" 5
 fi
 
@@ -20029 +20029 @@
         fi
 
+if test "x$ax_cv_boost_system" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::System libarary." "$LINENO" 5
+fi
+
 
 
@@ -20206 +20210 @@
         LDFLAGS="$LDFLAGS_SAVED"
         fi
+
+if test "x$ax_cv_boost_asio" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::ASIO libarary." "$LINENO" 5
+fi
 
 
@@ -20433 +20441 @@
         fi
 
+if test "x$ax_cv_boost_date_time" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::Date_Time libarary." "$LINENO" 5
+fi
+
 
 
@@ -20669 +20681 @@
         fi
 
+if test "x$ax_cv_boost_filesystem" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::Filesystem libarary." "$LINENO" 5
+fi
+
 
 
@@ -20891 +20907 @@
         fi
 
+if test "x$ax_cv_boost_program_options" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::Program_Options libarary." "$LINENO" 5
+fi
+
 
 
@@ -21114 +21134 @@
         LDFLAGS="$LDFLAGS_SAVED"
         fi
+
+if test "x$ax_cv_boost_regex" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::Regex libarary." "$LINENO" 5
+fi
 
 
@@ -21383 +21407 @@
         fi
 
+if test "x$ax_cv_boost_thread" != "xyes"; then :
+  as_fn_error $? "Problems with the Boost::Thread libarary." "$LINENO" 5
+fi
 #AX_BOOST_IOSTREAMS
 #AX_BOOST_PYTHON
@@ -21402 +21429 @@
 
 CPPFLAGS+=" "$BOOST_CPPFLAGS
+
+# Now we can safely add the compiler option for your prefered standard
+CXXFLAGS+=" -std=c++0x"
 
 #AC_CHECK_HEADERS(
@@ -22603 +22633 @@
 
                 cat > conftest.$ac_ext <<EOF
-#line 22605 "configure"
+#line 22635 "configure"
 #include "confdefs.h"
 #include <qglobal.h>

trunk/FACT++/configure.ac

@@ -47 +47 @@
 #AC_CXX_HEADER_STDCXX_0X
 AC_CXX_COMPILE_STDCXX_0X
-if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
-   AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.])
-fi
-
-CXXFLAGS+=" -std=c++0x"
+AS_IF([test "$ax_cv_cxx_compile_cxx0x_cxx" != yes], 
+   AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.]))
+
+# Postponed after the BOOST library tests otherwise the check for boost::thread fails
+#CXXFLAGS+=" -std=c++0x"
 
 ######################################################################
@@ -110 +110 @@
 # Needed to compile FACT++
 AC_CHECK_READLINE
-
-if test "x$have_readline" != "xyes"; then
-   AC_MSG_ERROR([The readline library is not properly installed.])
-fi
+AS_IF([test "x$have_readline" != "xyes"], 
+   AC_MSG_ERROR([The readline library is not properly installed.]))
 
 CPPFLAGS+=" "$READLINE_INCLUDES
@@ -200 +198 @@
 # Keep this order AX_BOOST_FILESYSTEM needs AX_BOOST_SYSTEM_LIB
 AX_BOOST_SYSTEM
+AS_IF([test "x$ax_cv_boost_system" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::System libarary.]))
+
 AX_BOOST_ASIO
+AS_IF([test "x$ax_cv_boost_asio" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::ASIO libarary.]))
+
 AX_BOOST_DATE_TIME
+AS_IF([test "x$ax_cv_boost_date_time" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::Date_Time libarary.]))
+
 AX_BOOST_FILESYSTEM
+AS_IF([test "x$ax_cv_boost_filesystem" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::Filesystem libarary.]))
+
 AX_BOOST_PROGRAM_OPTIONS
+AS_IF([test "x$ax_cv_boost_program_options" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::Program_Options libarary.]))
+
 AX_BOOST_REGEX
+AS_IF([test "x$ax_cv_boost_regex" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::Regex libarary.]))
+
 AX_BOOST_THREAD
+AS_IF([test "x$ax_cv_boost_thread" != "xyes"],
+   AC_MSG_ERROR([Problems with the Boost::Thread libarary.]))
 #AX_BOOST_IOSTREAMS
 #AX_BOOST_PYTHON
@@ -225 +243 @@
 
 CPPFLAGS+=" "$BOOST_CPPFLAGS
+
+# Now we can safely add the compiler option for your prefered standard
+CXXFLAGS+=" -std=c++0x"
 
 #AC_CHECK_HEADERS(