From 693e93c9ac3dda0896a62c66077b646dcdb15445 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 22 Feb 2001 18:09:59 +0000 Subject: [PATCH] Fix a quite annoying bug: -D__EXTENSION__ was defined if checked for before the MT block, but not if after. defining it in MT mode led to compiler errors in system header files. Arg!!!! git-svn-id: https://svn.dealii.org/trunk@4016 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 414 ++++++++++++++++++++++--------------------- deal.II/configure.in | 63 ++++--- 2 files changed, 244 insertions(+), 233 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index fe1f1a9d0f..e470188819 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.54 +# From configure.in Revision: 1.55 @@ -1383,8 +1383,158 @@ fi + + + +# Check whether --enable-multithreading or --disable-multithreading was given. +if test "${enable_multithreading+set}" = set; then + enableval="$enable_multithreading" + enablemultithreading=$enableval +else + enablemultithreading=no +fi + + + + +if test "$enablemultithreading" = yes ; then + if test "$GXX" = yes ; then + + echo $ac_n "checking for platform specific thread flags""... $ac_c" 1>&6 +echo "configure:1405: checking for platform specific thread flags" >&5 + + for i in threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do + CXXFLAGS="$CXXFLAGSG -$i" + + echo 'int main() { return 0; }' > conftest.$ac_ext + + deal_II_compiler_output=`eval $ac_compile 2>&1` + if test ! "$deal_II_compiler_output"; then + + rm -rf conftest* + + thread_flag=$i + CXXFLAGSG="$CXXFLAGSG -$i" + CXXFLAGSO="$CXXFLAGSO -$i" + LDFLAGS="$LDFLAGS -$i" + + break + + + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + fi + rm -f conftest* + + done + if test "$thread_flag" = invalid_last_entry ; then + echo "$ac_t"""no flag found!"" 1>&6 + { echo "configure: error: "Could not determine multithreading flag for this platform. Aborting!"" 1>&2; exit 1; } + fi + echo "$ac_t"""-$thread_flag"" 1>&6 + + + echo $ac_n "checking for platform specific multi-threading defines""... $ac_c" 1>&6 +echo "configure:1441: checking for platform specific multi-threading defines" >&5 + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t"""not necessary"" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t"""-D_REENTRANT -D_THREAD_SAFE"" 1>&6 + CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" + CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" + +fi +rm -f conftest* + + + cat >> confdefs.h <<\EOF +#define __USE_MALLOC 1 +EOF + + cat >> confdefs.h <<\EOF +#define _REENTRANT 1 +EOF + + + CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-ansi//g;'`" + else + if test "x$GXX_VERSION" = "xibm_xlc" ; then + CXXFLAGSG = "$CXXFLAGSG -threaded" + CXXFLAGSO = "$CXXFLAGSO -threaded" + else + { echo "configure: error: No threading compiler options for this C++ compiler + specified at present" 1>&2; exit 1; } + exit 1 + fi + fi +fi + + + +# Check whether --with-multithreading or --without-multithreading was given. +if test "${with_multithreading+set}" = set; then + withval="$with_multithreading" + withmultithreading=$withval +else + withmultithreading=no +fi + +if test "$withmultithreading" != no ; then + echo $ac_n "checking for ACE""... $ac_c" 1>&6 +echo "configure:1516: checking for ACE" >&5 + if test -d "$withmultithreading" ; then + echo "$ac_t""found" 1>&6 + else + echo "$ac_t""not found" 1>&6 + { echo "configure: error: Invalid ACE path" 1>&2; exit 1; } + fi + + cat >> confdefs.h <<\EOF +#define DEAL_II_USE_MT 1 +EOF + +fi + + + + + + + + echo $ac_n "checking whether AssertThrow works with debug flags""... $ac_c" 1>&6 -echo "configure:1388: checking whether AssertThrow works with debug flags" >&5 +echo "configure:1538: checking whether AssertThrow works with debug flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1394,7 +1544,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSG cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1422,7 +1572,7 @@ fi rm -f conftest* echo $ac_n "checking whether AssertThrow works with optimized flags""... $ac_c" 1>&6 -echo "configure:1426: checking whether AssertThrow works with optimized flags" >&5 +echo "configure:1576: checking whether AssertThrow works with optimized flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1432,7 +1582,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSO cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1461,7 +1611,7 @@ rm -f conftest* echo $ac_n "checking for std::vector bug""... $ac_c" 1>&6 -echo "configure:1465: checking for std::vector bug" >&5 +echo "configure:1615: checking for std::vector bug" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1471,7 +1621,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -1512,7 +1662,7 @@ rm -f conftest* echo $ac_n "checking for std::iterator class""... $ac_c" 1>&6 -echo "configure:1516: checking for std::iterator class" >&5 +echo "configure:1666: checking for std::iterator class" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1522,7 +1672,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext < @@ -1533,7 +1683,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -1554,7 +1704,7 @@ rm -f conftest* echo $ac_n "checking whether lrand48 needs to be declared with -ansi""... $ac_c" 1>&6 -echo "configure:1558: checking whether lrand48 needs to be declared with -ansi" >&5 +echo "configure:1708: checking whether lrand48 needs to be declared with -ansi" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1564,7 +1714,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext < @@ -1580,7 +1730,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -1601,7 +1751,7 @@ rm -f conftest* echo $ac_n "checking whether getrusage is properly declared""... $ac_c" 1>&6 -echo "configure:1605: checking whether getrusage is properly declared" >&5 +echo "configure:1755: checking whether getrusage is properly declared" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1610,7 +1760,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -1622,7 +1772,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1641,7 +1791,7 @@ rm -f conftest* echo $ac_n "checking whether isnan is declared with debug flags""... $ac_c" 1>&6 -echo "configure:1645: checking whether isnan is declared with debug flags" >&5 +echo "configure:1795: checking whether isnan is declared with debug flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1652,7 +1802,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSG deal_II_isnan_flag="" cat > conftest.$ac_ext < @@ -1664,7 +1814,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1680,7 +1830,7 @@ rm -f conftest* if test "x$deal_II_isnan_flag" = "x" ; then cat > conftest.$ac_ext < @@ -1692,7 +1842,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1712,7 +1862,7 @@ rm -f conftest* for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSG $testflag" cat > conftest.$ac_ext < @@ -1724,7 +1874,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -1737,7 +1887,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -1749,7 +1899,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -1771,7 +1921,7 @@ rm -f conftest* fi echo $ac_n "checking whether isnan is declared with optimized flags""... $ac_c" 1>&6 -echo "configure:1775: checking whether isnan is declared with optimized flags" >&5 +echo "configure:1925: checking whether isnan is declared with optimized flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1782,7 +1932,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSO deal_II_isnan_flag="" cat > conftest.$ac_ext < @@ -1794,7 +1944,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1810,7 +1960,7 @@ rm -f conftest* if test "x$deal_II_isnan_flag" = "x" ; then cat > conftest.$ac_ext < @@ -1822,7 +1972,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1842,7 +1992,7 @@ rm -f conftest* for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSO $testflag" cat > conftest.$ac_ext < @@ -1854,7 +2004,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -1867,7 +2017,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -1879,7 +2029,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -1906,158 +2056,10 @@ rm -f conftest* - -# Check whether --enable-multithreading or --disable-multithreading was given. -if test "${enable_multithreading+set}" = set; then - enableval="$enable_multithreading" - enablemultithreading=$enableval -else - enablemultithreading=no -fi - - - - -if test "$enablemultithreading" = yes ; then - if test "$GXX" = yes ; then - - echo $ac_n "checking for platform specific thread flags""... $ac_c" 1>&6 -echo "configure:1926: checking for platform specific thread flags" >&5 - - for i in threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do - CXXFLAGS="$CXXFLAGSG -$i" - - echo 'int main() { return 0; }' > conftest.$ac_ext - - deal_II_compiler_output=`eval $ac_compile 2>&1` - if test ! "$deal_II_compiler_output"; then - - rm -rf conftest* - - thread_flag=$i - CXXFLAGSG="$CXXFLAGSG -$i" - CXXFLAGSO="$CXXFLAGSO -$i" - LDFLAGS="$LDFLAGS -$i" - - break - - - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - fi - rm -f conftest* - - done - if test "$thread_flag" = invalid_last_entry ; then - echo "$ac_t"""no flag found!"" 1>&6 - { echo "configure: error: "Could not determine multithreading flag for this platform. Aborting!"" 1>&2; exit 1; } - fi - echo "$ac_t"""-$thread_flag"" 1>&6 - - - echo $ac_n "checking for platform specific multi-threading defines""... $ac_c" 1>&6 -echo "configure:1962: checking for platform specific multi-threading defines" >&5 - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - echo "$ac_t"""not necessary"" 1>&6 - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - echo "$ac_t"""-D_REENTRANT -D_THREAD_SAFE"" 1>&6 - CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" - CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" - -fi -rm -f conftest* - - - cat >> confdefs.h <<\EOF -#define __USE_MALLOC 1 -EOF - - cat >> confdefs.h <<\EOF -#define _REENTRANT 1 -EOF - - - CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-ansi//g;'`" - else - if test "x$GXX_VERSION" = "xibm_xlc" ; then - CXXFLAGSG = "$CXXFLAGSG -threaded" - CXXFLAGSO = "$CXXFLAGSO -threaded" - else - { echo "configure: error: No threading compiler options for this C++ compiler - specified at present" 1>&2; exit 1; } - exit 1 - fi - fi -fi - - - -# Check whether --with-multithreading or --without-multithreading was given. -if test "${with_multithreading+set}" = set; then - withval="$with_multithreading" - withmultithreading=$withval -else - withmultithreading=no -fi - -if test "$withmultithreading" != no ; then - echo $ac_n "checking for ACE""... $ac_c" 1>&6 -echo "configure:2037: checking for ACE" >&5 - if test -d "$withmultithreading" ; then - echo "$ac_t""found" 1>&6 - else - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Invalid ACE path" 1>&2; exit 1; } - fi - - cat >> confdefs.h <<\EOF -#define DEAL_II_USE_MT 1 -EOF - -fi - - - - - - - - # Extract the first word of "f77", so it can be a program name with args. set dummy f77; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2061: checking for $ac_word" >&5 +echo "configure:2063: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2093,7 +2095,7 @@ if test "x$F77" = "x" ; then # Extract the first word of "g77", so it can be a program name with args. set dummy g77; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2097: checking for $ac_word" >&5 +echo "configure:2099: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2235,7 +2237,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2239: checking for $ac_word" >&5 +echo "configure:2241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2273,7 +2275,7 @@ fi echo $ac_n "checking for HSL subroutines""... $ac_c" 1>&6 -echo "configure:2277: checking for HSL subroutines" >&5 +echo "configure:2279: checking for HSL subroutines" >&5 hsl_subroutines="" if test -r contrib/hsl/source/ma27.f ; then hsl_subroutines="$hsl_subroutines MA27" @@ -2308,7 +2310,7 @@ if test "${with_blas+set}" = set; then withval="$with_blas" if test "$withval" != no ; then echo $ac_n "checking for BLAS""... $ac_c" 1>&6 -echo "configure:2312: checking for BLAS" >&5 +echo "configure:2314: checking for BLAS" >&5 if test -r "$withval" ; then echo "$ac_t""found" 1>&6 else @@ -2324,7 +2326,7 @@ EOF else echo $ac_n "checking for main in -lblas""... $ac_c" 1>&6 -echo "configure:2328: checking for main in -lblas" >&5 +echo "configure:2330: checking for main in -lblas" >&5 ac_lib_var=`echo blas'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2332,14 +2334,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lblas $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2371,7 +2373,7 @@ if test "${with_lapack+set}" = set; then withval="$with_lapack" if test "$withval" != no ; then echo $ac_n "checking for LAPACK""... $ac_c" 1>&6 -echo "configure:2375: checking for LAPACK" >&5 +echo "configure:2377: checking for LAPACK" >&5 if test -r "$withval" ; then echo "$ac_t""found" 1>&6 else @@ -2387,7 +2389,7 @@ EOF else echo $ac_n "checking for dgels_ in -llapack""... $ac_c" 1>&6 -echo "configure:2391: checking for dgels_ in -llapack" >&5 +echo "configure:2393: checking for dgels_ in -llapack" >&5 ac_lib_var=`echo lapack'_'dgels_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2395,7 +2397,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llapack $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2476,7 +2478,7 @@ else fi echo $ac_n "checking for kdoc""... $ac_c" 1>&6 -echo "configure:2480: checking for kdoc" >&5 +echo "configure:2482: checking for kdoc" >&5 if test "$kdocdir" != ${DEAL2_DIR}/contrib/kdoc/bin ; then if test -r $kdocdir/kdoc ; then echo "$ac_t""found" 1>&6 @@ -2512,7 +2514,7 @@ if test "$docxx" = to-be-determined ; then # Extract the first word of ""doc++"", so it can be a program name with args. set dummy "doc++"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2516: checking for $ac_word" >&5 +echo "configure:2518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_docxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2546,7 +2548,7 @@ fi else echo $ac_n "checking for doc++""... $ac_c" 1>&6 -echo "configure:2550: checking for doc++" >&5 +echo "configure:2552: checking for doc++" >&5 if test -x "$docxx" ; then echo "$ac_t""yes" 1>&6 else @@ -2569,16 +2571,16 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" echo $ac_n "checking for consistency of CXXFLAGSG flags""... $ac_c" 1>&6 -echo "configure:2573: checking for consistency of CXXFLAGSG flags" >&5 +echo "configure:2575: checking for consistency of CXXFLAGSG flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -2596,16 +2598,16 @@ rm -f conftest* CXXFLAGS="$CXXFLAGSO" echo $ac_n "checking for consistency of CXXFLAGSO flags""... $ac_c" 1>&6 -echo "configure:2600: checking for consistency of CXXFLAGSO flags" >&5 +echo "configure:2602: checking for consistency of CXXFLAGSO flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 diff --git a/deal.II/configure.in b/deal.II/configure.in index a9700ea548..bc8143a765 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -348,33 +348,6 @@ fi -dnl On some systems (well, DEC Alphas are the only ones we know of), -dnl gcc2.95 throws the hands in the air if it sees one of the AssertThrow -dnl calls, and dies with an internal compiler error. If this is the case, -dnl we disable AssertThrow and simply replace it with an `abort' if the -dnl condition is not satisfied. Check this for debug and optimized mode -dnl compiler flags, and define `DISABLE_ASSERT_THROW' if necessary. -DEAL_II_CHECK_ASSERT_THROW(debug, $CXXFLAGSG, CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG") -DEAL_II_CHECK_ASSERT_THROW(optimized, $CXXFLAGSO, CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO") - -dnl IBM's xlC compiler has a problem with some kind of code that does not -dnl "using namespace std;" Try to work around if necessary -DEAL_II_CHECK_IBM_XLC_ERROR - -dnl See whether we can use the std::iterator class -DEAL_II_HAVE_STD_ITERATOR - -dnl See whether we have to declare lrand48 ourselves with -ansi -DEAL_II_HAVE_LRAND48_DECLARED - -dnl See whether getrusage() is declared properly -DEAL_II_CHECK_GETRUSAGE - -dnl Likewise for isnan() -DEAL_II_CHECK_ISNAN - - - dnl ------------------------------------------------------------- @@ -446,6 +419,42 @@ AC_SUBST(withmultithreading) +dnl -------------------------------------------------------------- +dnl Various kludges for various systems: some systems need special +dnl treatment for some things. Since they sometimes depend on +dnl whether other flags are set (e.g. the need for defining +dnl -D__EXTENSIONS__ depends on whether we use/not use threading +dnl options), this is done after checking for multithreading +dnl -------------------------------------------------------------- + + +dnl On some systems (well, DEC Alphas are the only ones we know of), +dnl gcc2.95 throws the hands in the air if it sees one of the AssertThrow +dnl calls, and dies with an internal compiler error. If this is the case, +dnl we disable AssertThrow and simply replace it with an `abort' if the +dnl condition is not satisfied. Check this for debug and optimized mode +dnl compiler flags, and define `DISABLE_ASSERT_THROW' if necessary. +DEAL_II_CHECK_ASSERT_THROW(debug, $CXXFLAGSG, CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG") +DEAL_II_CHECK_ASSERT_THROW(optimized, $CXXFLAGSO, CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO") + +dnl IBM's xlC compiler has a problem with some kind of code that does not +dnl "using namespace std;" Try to work around if necessary +DEAL_II_CHECK_IBM_XLC_ERROR + +dnl See whether we can use the std::iterator class +DEAL_II_HAVE_STD_ITERATOR + +dnl See whether we have to declare lrand48 ourselves with -ansi +DEAL_II_HAVE_LRAND48_DECLARED + +dnl See whether getrusage() is declared properly +DEAL_II_CHECK_GETRUSAGE + +dnl Likewise for isnan() +DEAL_II_CHECK_ISNAN + + + dnl Find path to a Fortran 77 compiler. By default try to find a -- 2.39.5