Revise the configury scheme: F77 support libraries are now put into F77LIBS and are...

git-svn-id: https://svn.dealii.org/trunk@4705 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index d49117149d6214a6b15a656f4c90ed693f2d7e95..f4b0b199859e2644cf389f950a5c1a50e0b747ee 100644 (file)
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -25,7 +25,7 @@ GXX-VERSION          = @GXX_VERSION@
 LDFLAGS              = @LDFLAGS@
 F77                  = @F77@
 F77-VERSION          = @F77_VERSION@
-F77LDFLAGS           = @F77LDFLAGS@
+F77LIBS              = @F77LIBS@
 LIBS                 = @LIBS@
 LIBDIR               = $D/lib
 PERL                 = @PERL@
@@ -39,6 +39,7 @@ USE_CONTRIB_HSL      = @USE_CONTRIB_HSL@
 # if HSL sublibs are used, add F77 libs to linker flags
 ifeq ($(USE_CONTRIB_HSL),yes)
   LDFLAGS += $(F77LDFLAGS)
+  LIBS    += $(F77LIBS)
 endif
 
 ######################################################
@@ -122,6 +123,7 @@ ifneq ($(with-multithreading),no)
   LIBPATH    += -L$(ACE_ROOT)/ace
 
   lib-ACE     = $(ACE_ROOT)/ace/libACE.so
+  LIBS       += -l$(lib-ACE)
 
   vpath %.a $(ACE_ROOT)
 endif

diff --git a/deal.II/configure b/deal.II/configure
index db0dac8ccc1ec1224c6185056312dd20e86be3c8..0791de62dd547824247818150ef6d56a83862219 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -64,10 +64,6 @@ ac_help="$ac_help
   --with-multithreading=DIR use DIR as path to the ACE library"
 ac_help="$ac_help
   --enable-compat-blocker=mapping Block functions that implicitely assume a Q1 mapping"
-ac_help="$ac_help
-  --with-blas=LIB use the BLAS-library file LIB"
-ac_help="$ac_help
-  --with-lapack=LIB use the LAPACK-library file LIB"
 ac_help="$ac_help
   --enable-multigrid Include multigrid code in library"
 ac_help="$ac_help
@@ -643,7 +639,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:647: checking host system type" >&5
+echo "configure:643: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -664,7 +660,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:668: checking target system type" >&5
+echo "configure:664: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -682,7 +678,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:686: checking build system type" >&5
+echo "configure:682: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -720,7 +716,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:724: checking for $ac_word" >&5
+echo "configure:720: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -750,7 +746,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:754: checking for $ac_word" >&5
+echo "configure:750: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -801,7 +797,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:805: checking for $ac_word" >&5
+echo "configure:801: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -833,7 +829,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:833: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -844,12 +840,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 848 "configure"
+#line 844 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -875,12 +871,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:879: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:875: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:884: checking whether we are using GNU C" >&5
+echo "configure:880: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -889,7 +885,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -908,7 +904,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:912: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:908: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -942,7 +938,7 @@ fi
 # Extract the first word of "$CC", so it can be a program name with args.
 set dummy $CC; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:946: checking for $ac_word" >&5
+echo "configure:942: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -983,7 +979,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:987: checking for $ac_word" >&5
+echo "configure:983: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1015,7 +1011,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1019: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1015: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1026,12 +1022,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1030 "configure"
+#line 1026 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1057,12 +1053,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1061: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1057: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1066: checking whether we are using GNU C++" >&5
+echo "configure:1062: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1071,7 +1067,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1090,7 +1086,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1094: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1090: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1125,7 +1121,7 @@ CXXFLAGS="$OLDCXXFLAGS"
 # Extract the first word of "$CXX", so it can be a program name with args.
 set dummy $CXX; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1129: checking for $ac_word" >&5
+echo "configure:1125: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1322,15 +1318,18 @@ fi
 
 
 
+
+
+
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1329: checking for $ac_func" >&5
+echo "configure:1328: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1334 "configure"
+#line 1333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1356,7 +1355,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1385,12 +1384,12 @@ done
 
 if test "$GXX" = yes ; then
   echo $ac_n "checking whether -ggdb works for long symbols""... $ac_c" 1>&6
-echo "configure:1389: checking whether -ggdb works for long symbols" >&5
+echo "configure:1388: checking whether -ggdb works for long symbols" >&5
   case "$target" in
           alpha*-osf*)
          CXXFLAGS="-ggdb $CXXFLAGSG"
          cat > conftest.$ac_ext <<EOF
-#line 1394 "configure"
+#line 1393 "configure"
 #include "confdefs.h"
 
 #include <string>
@@ -1411,7 +1410,7 @@ int main() {
            
 ; return 0; }
 EOF
-if { (eval echo configure:1415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
               CXXFLAGSG="-ggdb $CXXFLAGSG"
@@ -1489,7 +1488,7 @@ 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:1493: checking for platform specific thread flags" >&5
+echo "configure:1492: checking for platform specific thread flags" >&5
   
   for i in threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do
     CXXFLAGS="$CXXFLAGSG -$i"
@@ -1525,7 +1524,7 @@ echo "configure:1493: checking for platform specific thread flags" >&5
 
     
   echo $ac_n "checking for platform specific multi-threading defines""... $ac_c" 1>&6
-echo "configure:1529: checking for platform specific multi-threading defines" >&5
+echo "configure:1528: 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'
@@ -1534,7 +1533,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
   cat > conftest.$ac_ext <<EOF
-#line 1538 "configure"
+#line 1537 "configure"
 #include "confdefs.h"
 
 #if !defined (_REENTRANT) && !defined (_THREAD_SAFE)
@@ -1548,7 +1547,7 @@ int main() {
    
 ; return 0; }
 EOF
-if { (eval echo configure:1552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
        echo "$ac_t"""not necessary"" 1>&6
@@ -1599,7 +1598,7 @@ fi
 
 if test "$withmultithreading" != no ; then
   echo $ac_n "checking for ACE""... $ac_c" 1>&6
-echo "configure:1603: checking for ACE" >&5
+echo "configure:1602: checking for ACE" >&5
   if test -d "$withmultithreading" ; then
     echo "$ac_t""found" 1>&6
   else
@@ -1620,7 +1619,7 @@ fi
 if test "$enablemultithreading" = yes ; then
   if test "$GXX" = yes ; then
       echo $ac_n "checking whether compilation with ACE disallows flags""... $ac_c" 1>&6
-echo "configure:1624: checking whether compilation with ACE disallows flags" >&5
+echo "configure:1623: checking whether compilation with ACE disallows flags" >&5
   ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -1630,7 +1629,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
   CXXFLAGS="-ansi -I$withmultithreading"
   cat > conftest.$ac_ext <<EOF
-#line 1634 "configure"
+#line 1633 "configure"
 #include "confdefs.h"
 
 #  include <ace/Thread_Manager.h>
@@ -1640,7 +1639,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
       deal_II_ace_remove_ansi="no"
@@ -1656,7 +1655,7 @@ fi
 rm -f conftest*
   CXXFLAGS="-pedantic -Werror -I$withmultithreading"
   cat > conftest.$ac_ext <<EOF
-#line 1660 "configure"
+#line 1659 "configure"
 #include "confdefs.h"
 
 #  include <ace/Thread_Manager.h>
@@ -1666,7 +1665,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
       deal_II_ace_remove_pedantic="no"
@@ -1748,7 +1747,7 @@ done
 
 
   echo $ac_n "checking whether AssertThrow works with debug flags""... $ac_c" 1>&6
-echo "configure:1752: checking whether AssertThrow works with debug flags" >&5
+echo "configure:1751: 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'
@@ -1758,7 +1757,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
   CXXFLAGS=$CXXFLAGSG
   cat > conftest.$ac_ext <<EOF
-#line 1762 "configure"
+#line 1761 "configure"
 #include "confdefs.h"
 
 #include "base/include/base/exceptions.h"
@@ -1769,7 +1768,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:1773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
        echo "$ac_t"""yes"" 1>&6
@@ -1786,7 +1785,7 @@ fi
 rm -f conftest*
 
   echo $ac_n "checking whether AssertThrow works with optimized flags""... $ac_c" 1>&6
-echo "configure:1790: checking whether AssertThrow works with optimized flags" >&5
+echo "configure:1789: 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'
@@ -1796,7 +1795,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
   CXXFLAGS=$CXXFLAGSO
   cat > conftest.$ac_ext <<EOF
-#line 1800 "configure"
+#line 1799 "configure"
 #include "confdefs.h"
 
 #include "base/include/base/exceptions.h"
@@ -1807,7 +1806,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:1811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
        echo "$ac_t"""yes"" 1>&6
@@ -1825,7 +1824,7 @@ rm -f conftest*
 
 
   echo $ac_n "checking for std::vector bug""... $ac_c" 1>&6
-echo "configure:1829: checking for std::vector bug" >&5
+echo "configure:1828: 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'
@@ -1835,7 +1834,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
   CXXFLAGS="$CXXFLAGSG"
   cat > conftest.$ac_ext <<EOF
-#line 1839 "configure"
+#line 1838 "configure"
 #include "confdefs.h"
 
       namespace std {
@@ -1855,7 +1854,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
       echo "$ac_t""no" 1>&6
@@ -1876,7 +1875,7 @@ rm -f conftest*
 
 
   echo $ac_n "checking for std::iterator class""... $ac_c" 1>&6
-echo "configure:1880: checking for std::iterator class" >&5
+echo "configure:1879: 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'
@@ -1886,7 +1885,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
   CXXFLAGS="$CXXFLAGSG"
   cat > conftest.$ac_ext <<EOF
-#line 1890 "configure"
+#line 1889 "configure"
 #include "confdefs.h"
 
 #include <iterator>
@@ -1897,7 +1896,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
       echo "$ac_t""yes" 1>&6
@@ -1918,7 +1917,7 @@ rm -f conftest*
 
 
   echo $ac_n "checking whether lrand48 needs to be declared with -ansi""... $ac_c" 1>&6
-echo "configure:1922: checking whether lrand48 needs to be declared with -ansi" >&5
+echo "configure:1921: 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'
@@ -1928,7 +1927,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
   CXXFLAGS="$CXXFLAGSG"
   cat > conftest.$ac_ext <<EOF
-#line 1932 "configure"
+#line 1931 "configure"
 #include "confdefs.h"
 
 #include <vector>
@@ -1944,7 +1943,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
       echo "$ac_t""no" 1>&6
@@ -1965,7 +1964,7 @@ rm -f conftest*
 
 
   echo $ac_n "checking whether getrusage is properly declared""... $ac_c" 1>&6
-echo "configure:1969: checking whether getrusage is properly declared" >&5
+echo "configure:1968: 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'
@@ -1974,7 +1973,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
   cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1977 "configure"
 #include "confdefs.h"
 
 #include <sys/resource.h>
@@ -1986,7 +1985,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:1990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
        echo "$ac_t"""yes"" 1>&6
@@ -2005,7 +2004,7 @@ rm -f conftest*
 
 
     echo $ac_n "checking whether isnan is declared with debug flags""... $ac_c" 1>&6
-echo "configure:2009: checking whether isnan is declared with debug flags" >&5
+echo "configure:2008: 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'
@@ -2016,7 +2015,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
   CXXFLAGS=$CXXFLAGSG
   deal_II_isnan_flag=""
   cat > conftest.$ac_ext <<EOF
-#line 2020 "configure"
+#line 2019 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2028,7 +2027,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:2032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
        echo "$ac_t"""yes"" 1>&6
@@ -2044,7 +2043,7 @@ rm -f conftest*
 
   if test "x$deal_II_isnan_flag" = "x" ; then
             cat > conftest.$ac_ext <<EOF
-#line 2048 "configure"
+#line 2047 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2056,7 +2055,7 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:2060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
          echo "$ac_t"""yes"" 1>&6
@@ -2076,7 +2075,7 @@ rm -f conftest*
     for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do 
       CXXFLAGS="$CXXFLAGSG $testflag"
       cat > conftest.$ac_ext <<EOF
-#line 2080 "configure"
+#line 2079 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2088,7 +2087,7 @@ int main() {
        
 ; return 0; }
 EOF
-if { (eval echo configure:2092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                          deal_II_isnan_flag="-DHAVE_ISNAN $testflag"
@@ -2101,7 +2100,7 @@ fi
 rm -f conftest*
 
                         cat > conftest.$ac_ext <<EOF
-#line 2105 "configure"
+#line 2104 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2113,7 +2112,7 @@ int main() {
        
 ; return 0; }
 EOF
-if { (eval echo configure:2117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                          deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag"
@@ -2135,7 +2134,7 @@ rm -f conftest*
   fi
 
     echo $ac_n "checking whether isnan is declared with optimized flags""... $ac_c" 1>&6
-echo "configure:2139: checking whether isnan is declared with optimized flags" >&5
+echo "configure:2138: 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'
@@ -2146,7 +2145,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
   CXXFLAGS=$CXXFLAGSO
   deal_II_isnan_flag=""
   cat > conftest.$ac_ext <<EOF
-#line 2150 "configure"
+#line 2149 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2158,7 +2157,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:2162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
        echo "$ac_t"""yes"" 1>&6
@@ -2174,7 +2173,7 @@ rm -f conftest*
 
   if test "x$deal_II_isnan_flag" = "x" ; then
             cat > conftest.$ac_ext <<EOF
-#line 2178 "configure"
+#line 2177 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2186,7 +2185,7 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:2190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
          echo "$ac_t"""yes"" 1>&6
@@ -2206,7 +2205,7 @@ rm -f conftest*
     for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do 
       CXXFLAGS="$CXXFLAGSO $testflag"
       cat > conftest.$ac_ext <<EOF
-#line 2210 "configure"
+#line 2209 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2218,7 +2217,7 @@ int main() {
        
 ; return 0; }
 EOF
-if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                          deal_II_isnan_flag="-DHAVE_ISNAN $testflag"
@@ -2231,7 +2230,7 @@ fi
 rm -f conftest*
 
                         cat > conftest.$ac_ext <<EOF
-#line 2235 "configure"
+#line 2234 "configure"
 #include "confdefs.h"
 
 #include <cmath>
@@ -2243,7 +2242,7 @@ int main() {
        
 ; return 0; }
 EOF
-if { (eval echo configure:2247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                          deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag"
@@ -2273,7 +2272,7 @@ rm -f conftest*
 # 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:2277: checking for $ac_word" >&5
+echo "configure:2276: 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
@@ -2309,7 +2308,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:2313: checking for $ac_word" >&5
+echo "configure:2312: 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
@@ -2390,7 +2389,7 @@ if test "x$F77" != "x" ; then
       F77FLAGSO="$F77FLAGSO -fPIC"
     fi
 
-                LIBS="$LIBS -lg2c"
+                F77LIBS="$F77LIBS -lg2c"
 
   else
 
@@ -2400,7 +2399,7 @@ if test "x$F77" != "x" ; then
       echo "$ac_t""compiler is AIX Fortran77" 1>&6
       F77FLAGSG="$FFLAGS -g"
       F77FLAGSO="$FFLAGS -O3 -w"
-      LIBS="$LIBS -lxlf90"  
+      F77LIBS="$F77LIBS -lxlf90"  
 
                   
     else
@@ -2412,7 +2411,7 @@ if test "x$F77" != "x" ; then
        F77_VERSION="SunF77"
        F77FLAGSG="$FFLAGS -silent -g"
        F77FLAGSO="$FFLAGS -silent -O3 -w"
-       LIBS="$LIBS -lF77 -lsunmath -lM77"
+       F77LIBS="$F77LIBS -lF77 -lsunmath -lM77"
 
                if test $enableshared = yes ; then
          F77FLAGSG="$F77FLAGSG -PIC"
@@ -2427,7 +2426,7 @@ if test "x$F77" != "x" ; then
          F77_VERSION="MIPSproF77"
          F77FLAGSG="$FFLAGS -ansi -g"
          F77FLAGSO="$FFLAGS -O3 -woffall"
-         LIBS="$LIBS -lftn"
+         F77LIBS="$F77LIBS -lftn"
 
                  if test $enableshared = yes ; then
            F77FLAGSG="$F77FLAGSG -shared -KPIC"
@@ -2456,7 +2455,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:2460: checking for $ac_word" >&5
+echo "configure:2459: 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
@@ -2494,7 +2493,7 @@ fi
 
 
 echo $ac_n "checking for HSL subroutines""... $ac_c" 1>&6
-echo "configure:2498: checking for HSL subroutines" >&5
+echo "configure:2497: checking for HSL subroutines" >&5
 hsl_subroutines=""
 if test -r contrib/hsl/source/ma27.f ; then
   hsl_subroutines="$hsl_subroutines MA27"
@@ -2524,151 +2523,6 @@ fi
 
 
 
-# Check whether --with-blas or --without-blas was given.
-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:2533: checking for BLAS" >&5
-    if test -r "$withval" ; then
-      echo "$ac_t""found" 1>&6
-    else
-      echo "$ac_t""not found" 1>&6
-      { echo "configure: error: BLAS library $withval not readable" 1>&2; exit 1; }
-    fi
-    cat >> confdefs.h <<\EOF
-#define HAVE_LIBBLAS 1
-EOF
-
-    LIBS="$withval -lg2c $LIBS";
-  fi
-  
-else
-  echo $ac_n "checking for daxpy_ in -lblas""... $ac_c" 1>&6
-echo "configure:2549: checking for daxpy_ in -lblas" >&5
-ac_lib_var=`echo blas'_'daxpy_ | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lblas -lg2c $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2557 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char daxpy_();
-
-int main() {
-daxpy_()
-; return 0; }
-EOF
-if { (eval echo configure:2571: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="-lblas -lg2c $LIBS" ; cat >> confdefs.h <<\EOF
-#define HAVE_LIBBLAS 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-fi
-
-
-# Check whether --with-lapack or --without-lapack was given.
-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:2603: checking for LAPACK" >&5
-    if test -r "$withval" ; then
-      echo "$ac_t""found" 1>&6
-    else
-      echo "$ac_t""not found" 1>&6
-      { echo "configure: error: LAPACK library $withval not readable" 1>&2; exit 1; }
-    fi
-    cat >> confdefs.h <<\EOF
-#define HAVE_LIBLAPACK 1
-EOF
-
-    LIBS="$withval $LIBS";
-  fi
-  
-else
-  echo $ac_n "checking for dgels_ in -llapack""... $ac_c" 1>&6
-echo "configure:2619: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-llapack  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2627 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dgels_();
-
-int main() {
-dgels_()
-; return 0; }
-EOF
-if { (eval echo configure:2641: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo lapack | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-llapack $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-$LIBS
-fi
-
-
-fi
-
-
 
 # Check whether --enable-multigrid or --disable-multigrid was given.
 if test "${enable_multigrid+set}" = set; then
@@ -2704,7 +2558,7 @@ else
 fi
 
 echo $ac_n "checking for kdoc""... $ac_c" 1>&6
-echo "configure:2708: checking for kdoc" >&5
+echo "configure:2562: 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
@@ -2740,7 +2594,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:2744: checking for $ac_word" >&5
+echo "configure:2598: 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
@@ -2774,7 +2628,7 @@ fi
 
 else
   echo $ac_n "checking for doc++""... $ac_c" 1>&6
-echo "configure:2778: checking for doc++" >&5
+echo "configure:2632: checking for doc++" >&5
   if test -x "$docxx" ; then
     echo "$ac_t""yes" 1>&6
   else
@@ -2797,16 +2651,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:2801: checking for consistency of CXXFLAGSG flags" >&5
+echo "configure:2655: checking for consistency of CXXFLAGSG flags" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2803 "configure"
+#line 2657 "configure"
 #include "confdefs.h"
 
 int main() {
 ;
 ; return 0; }
 EOF
-if { (eval echo configure:2810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     echo "$ac_t""yes" 1>&6
@@ -2824,16 +2678,16 @@ rm -f conftest*
 
 CXXFLAGS="$CXXFLAGSO"
 echo $ac_n "checking for consistency of CXXFLAGSO flags""... $ac_c" 1>&6
-echo "configure:2828: checking for consistency of CXXFLAGSO flags" >&5
+echo "configure:2682: checking for consistency of CXXFLAGSO flags" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2830 "configure"
+#line 2684 "configure"
 #include "confdefs.h"
 
 int main() {
 ;
 ; return 0; }
 EOF
-if { (eval echo configure:2837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     echo "$ac_t""yes" 1>&6
@@ -2992,6 +2846,7 @@ s%@F77_VERSION@%$F77_VERSION%g
 s%@F77FLAGSO@%$F77FLAGSO%g
 s%@F77FLAGSG@%$F77FLAGSG%g
 s%@F77LDFLAGS@%$F77LDFLAGS%g
+s%@F77LIBS@%$F77LIBS%g
 s%@PERL@%$PERL%g
 s%@USE_CONTRIB_HSL@%$USE_CONTRIB_HSL%g
 s%@enablemultigrid@%$enablemultigrid%g

diff --git a/deal.II/configure.in b/deal.II/configure.in
index d0cc3a61d5464d8d4dc5f6aa1462e724f3544b70..cade990cf759c945d310e574b81eb8f197e48a99 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -290,6 +290,9 @@ fi
 
 AC_SUBST(CXXFLAGSG)
 AC_SUBST(CXXFLAGSO)
+AC_SUBST(LIBS)
+AC_SUBST(LDFLAGS)
+
 
 dnl ======================================================================
 dnl Check for operating system properties like header files and
@@ -624,7 +627,7 @@ if test "x$F77" != "x" ; then
     dnl Then we have to set the set of libraries we have to link with
     dnl when linking C++ and Fortran code with the C++ compiler. For
     dnl g77, this is only libg2c
-    LIBS="$LIBS -lg2c"
+    F77LIBS="$F77LIBS -lg2c"
 
   else
 
@@ -636,7 +639,7 @@ if test "x$F77" != "x" ; then
       AC_MSG_RESULT(compiler is AIX Fortran77)
       F77FLAGSG="$FFLAGS -g"
       F77FLAGSO="$FFLAGS -O3 -w"
-      LIBS="$LIBS -lxlf90"  
+      F77LIBS="$F77LIBS -lxlf90"  
 
       dnl Note: presently, we don't support shared libs on AIX, so we don't need
       dnl to set -PIC or the like for this compiler (nonetheless, I couldn't find
@@ -654,7 +657,7 @@ if test "x$F77" != "x" ; then
        F77_VERSION="SunF77"
        F77FLAGSG="$FFLAGS -silent -g"
        F77FLAGSO="$FFLAGS -silent -O3 -w"
-       LIBS="$LIBS -lF77 -lsunmath -lM77"
+       F77LIBS="$F77LIBS -lF77 -lsunmath -lM77"
 
        dnl If necessary, add shared lib flags
        if test $enableshared = yes ; then
@@ -672,7 +675,7 @@ if test "x$F77" != "x" ; then
          F77_VERSION="MIPSproF77"
          F77FLAGSG="$FFLAGS -ansi -g"
          F77FLAGSO="$FFLAGS -O3 -woffall"
-         LIBS="$LIBS -lftn"
+         F77LIBS="$F77LIBS -lftn"
 
          dnl If necessary, add shared lib flags
          if test $enableshared = yes ; then
@@ -696,8 +699,7 @@ fi
 AC_SUBST(F77_VERSION)
 AC_SUBST(F77FLAGSO)
 AC_SUBST(F77FLAGSG)
-AC_SUBST(F77LDFLAGS)
-AC_SUBST(LIBS)
+AC_SUBST(F77LIBS)
 
 
 dnl    Find path to perl
@@ -738,45 +740,6 @@ AC_SUBST(USE_CONTRIB_HSL)
 
 
 
-dnl ------------------------------------------------------------
-dnl   Check for LAPACK and BLAS
-dnl   Consider this part experimental!
-dnl ------------------------------------------------------------
-AC_ARG_WITH(blas,
-[  --with-blas=LIB use the BLAS-library file LIB],
-  if test "$withval" != no ; then
-    AC_MSG_CHECKING(for BLAS)
-    if test -r "$withval" ; then
-      AC_MSG_RESULT(found)
-    else
-      AC_MSG_RESULT(not found)
-      AC_MSG_ERROR(BLAS library $withval not readable)
-    fi
-    AC_DEFINE(HAVE_LIBBLAS)
-    LIBS="$withval -lg2c $LIBS";
-  fi
-  ,
-  AC_CHECK_LIB(blas, daxpy_,
-               LIBS="-lblas -lg2c $LIBS" ; AC_DEFINE(HAVE_LIBBLAS),,-lg2c)
-)
-
-AC_ARG_WITH(lapack,
-[  --with-lapack=LIB use the LAPACK-library file LIB],
-  if test "$withval" != no ; then
-    AC_MSG_CHECKING(for LAPACK)
-    if test -r "$withval" ; then
-      AC_MSG_RESULT(found)
-    else
-      AC_MSG_RESULT(not found)
-      AC_MSG_ERROR(LAPACK library $withval not readable)
-    fi
-    AC_DEFINE(HAVE_LIBLAPACK)
-    LIBS="$withval $LIBS";
-  fi
-  ,
-  AC_CHECK_LIB(lapack, dgels_,,$LIBS)
-)
-
 dnl -------------------------------------------------------------
 dnl Multigrid
 dnl -------------------------------------------------------------

diff --git a/deal.II/doc/development/Makefile b/deal.II/doc/development/Makefile
index 8002c8a7584a5c2c9d1f7025542a58522d50c97e..2f87fa6df827bf7314dfa2619e83c502e5ccf73f 100644 (file)
--- a/deal.II/doc/development/Makefile
+++ b/deal.II/doc/development/Makefile
@@ -25,6 +25,7 @@ makefiles.html: Makefile makefiles.1.html $D/common/Make.global_options makefile
        @echo '<li><code>lib-path-deal2=$(lib-path-deal2)</code>' >> $@
        @echo '<li><code>lib-path-contrib-hsl=$(lib-path-contrib-hsl)</code>' >> $@
        @echo '<li><code>LIBPATH=$(LIBPATH)</code>' >> $@
+       @echo '<li><code>LIBS=$(LIBS)</code>' >> $@
        @echo '<li><code>lib-base.o=$(lib-base.o)</code>' >> $@
        @echo '<li><code>lib-base.g=$(lib-base.g)</code>' >> $@
        @echo '<li><code>lib-lac.o=$(lib-lac.o)</code>' >> $@
@@ -46,7 +47,7 @@ makefiles.html: Makefile makefiles.1.html $D/common/Make.global_options makefile
        @echo '<li><code>F77FLAGS.g=$(F77FLAGS.g)</code>' >> $@
        @echo '<li><code>F77FLAGS.o=$(F77FLAGS.o)</code>' >> $@
        @echo '<li><code>LDFLAGS=$(LDFLAGS)</code>' >> $@
-       @echo '<li><code>F77LDFLAGS=$(F77LDFLAGS)</code>' >> $@
+       @echo '<li><code>F77LIBS=$(F77LIBS)</code>' >> $@
        @echo '<li><code>ACE_ROOT=$(ACE_ROOT)</code>' >> $@
        @echo '<li><code>lib-ACE=$(lib-ACE)</code>' >> $@
        @echo '<li><code>with-multithreading=$(with-multithreading)</code>' >> $@

diff --git a/deal.II/doc/development/Makefile.large b/deal.II/doc/development/Makefile.large
index 2801622b061df4b230d7ef1e5707d6e5d0860572..c1c7a3df29bb54dee9031cd99f94fed274926826 100644 (file)
--- a/deal.II/doc/development/Makefile.large
+++ b/deal.II/doc/development/Makefile.large
@@ -91,13 +91,6 @@ endif
 flags += -Ddeal_II_dimension=$(deal_II_dimension)
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
 # The following two rules define how to compile C++ files into object
 # files:
 lib/$(deal_II_dimension)d/%.go :

diff --git a/deal.II/doc/development/Makefile.small b/deal.II/doc/development/Makefile.small
index d007082377b17d57f47540fd564c9faab541c9c9..33919d51ca2f78035fc16bacc306e817fe81939c 100644 (file)
--- a/deal.II/doc/development/Makefile.small
+++ b/deal.II/doc/development/Makefile.small
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html
index ab27df2a909faa1f88704c470bb61f7b7e795d28..903b2b16f26903889576607ba2d04dfc623d5112 100644 (file)
--- a/deal.II/doc/development/makefiles.1.html
+++ b/deal.II/doc/development/makefiles.1.html
@@ -189,6 +189,22 @@
            was in $(LIBPATH) before.
            </p>
       </dd>
+
+      <dt> <code>LIBS</code> </dt>
+      <dd> <p>
+           Additional libraries to be linked in, such as Fortran
+           support or the ACE library when multithreading is enabled.
+           </p>
+      </dd>
+
+      <dt> <code>F77LIBS</code> </dt>
+      <dd> <p>
+           Libraries to be linked in when we link with Fortran
+           files. These libraries are checked at configuration time,
+           and are included into <code>$(LIBS)</code> when they are
+           actually needed
+           </p>
+      </dd>
     </dl>
 
 
@@ -334,14 +350,6 @@
            General linker flags
            </p>
       </dd>
-
-      <dt> <code>F77LDFLAGS</code> </dt>
-      <dd> <p>
-           Linker flags when linking Fortran 77 code into the
-           executable where the main part is C++. This includes
-           libraries as <code>libg2c</code> for g77, or vendor libraries
-           </p>
-      </dd>
     </dl>
 
 

diff --git a/deal.II/doc/news/2001/c-3-1.html b/deal.II/doc/news/2001/c-3-1.html
index e4b8365d05c775eef2cb1ccc33adad854d535baf..ffaeba49acb04c1c37ce9a9a67fbf560e914393f 100644 (file)
--- a/deal.II/doc/news/2001/c-3-1.html
+++ b/deal.II/doc/news/2001/c-3-1.html
@@ -26,6 +26,15 @@ documentation, etc</a>.
 <h3>General</h3>
 
 <ol>
+  <li> <p>
+       Change: If in multithreaded mode, the ACE library is now
+       automatically added to the <code>$(LIBS)</code> Makefile
+       variable. There is no need anymore for a special clause in your
+       Makefile.
+       <br>
+       (WB 2001/05/22)
+       </p>
+
   <li> <p>
        New: the <code>./configure</code> script now also recognizes
        the Intel ICC compiler that was released for Linux lately.

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index 78d2c0413bcb6af2e98c2f58744e165aedddad3f..9761232d00e38fa52a00183cec56a6573f39404c 100644 (file)
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile
index 90599cc42e73011837a6686ad8332b3f668895f3..41b6eb1e896a98d180023f46f6fe5cd4a924a900 100644 (file)
--- a/deal.II/examples/step-2/Makefile
+++ b/deal.II/examples/step-2/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile
index 9430661aec0bcf9807f7c36eebd0ec42a0116e2c..c02ef0f148efae8f641362e505aadb2afadd4f50 100644 (file)
--- a/deal.II/examples/step-3/Makefile
+++ b/deal.II/examples/step-3/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile
index 7d300b7511067825e2456200137f8c23129b99f4..270d71c47dba5b4bb131617bf03197db55908cf8 100644 (file)
--- a/deal.II/examples/step-4/Makefile
+++ b/deal.II/examples/step-4/Makefile
@@ -82,14 +82,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile
index 9430661aec0bcf9807f7c36eebd0ec42a0116e2c..c02ef0f148efae8f641362e505aadb2afadd4f50 100644 (file)
--- a/deal.II/examples/step-5/Makefile
+++ b/deal.II/examples/step-5/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile
index 9430661aec0bcf9807f7c36eebd0ec42a0116e2c..c02ef0f148efae8f641362e505aadb2afadd4f50 100644 (file)
--- a/deal.II/examples/step-6/Makefile
+++ b/deal.II/examples/step-6/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index 85ccf54f0ebc099c1efe812a0bd146ce7fa62e10..6360bcca20162bd174d67d4692443f3fc47b97f3 100644 (file)
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile
index 9430661aec0bcf9807f7c36eebd0ec42a0116e2c..c02ef0f148efae8f641362e505aadb2afadd4f50 100644 (file)
--- a/deal.II/examples/step-8/Makefile
+++ b/deal.II/examples/step-8/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/deal.II/examples/step-9/Makefile b/deal.II/examples/step-9/Makefile
index 9430661aec0bcf9807f7c36eebd0ec42a0116e2c..c02ef0f148efae8f641362e505aadb2afadd4f50 100644 (file)
--- a/deal.II/examples/step-9/Makefile
+++ b/deal.II/examples/step-9/Makefile
@@ -80,14 +80,6 @@ else
 endif
 
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  libraries += $(lib-ACE)
-endif
-
-
-
 # Now comes the first production rule: how to link the single object
 # file produced from the single C++ file into the executable. Since
 # this is the first rule in the Makefile, it is the one `make' selects

diff --git a/tests/Makefile.rules b/tests/Makefile.rules
index 04c7b75ca0b1c092c4ae0f0e79346bd0063d5123..bfbca415a9d1aa3c7d5cbad7a936a80083933a29 100644 (file)
--- a/tests/Makefile.rules
+++ b/tests/Makefile.rules
@@ -18,12 +18,6 @@ verbose = off
 # flags:
 ############################################################
 
-# If in multithread mode, add the ACE library to the libraries which
-# we need to link with:
-ifneq ($(with-multithreading),no)
-  LIBS += $(lib-ACE)
-endif
-
 flags     = $(CXXFLAGS.g)
 
 ifeq ($(findstring gcc,$(GXX_VERSION)),gcc)