* aclang.m4 (AC_F77_LIBRARY_LDFLAGS): Don't override FLIBS if

specified by the user.
Fix a bug: use the cached value to set FLIBS.

diff --git a/ChangeLog b/ChangeLog
index c4037d03e1ea42f9bb0e3963e98534f2a6b9ba09..cce7570a1441b44e56dea4574306f621e91d9a1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-08  Steven G. Johnson  <stevenj@alum.mit.edu>
+
+       * aclang.m4 (AC_F77_LIBRARY_LDFLAGS): Don't override FLIBS if
+       specified by the user.
+       Fix a bug: use the cached value to set FLIBS.
+
 2000-06-07  Dave Love  <fx@gnu.org>
 
        * aclang.m4 (AC_PROG_F77): Check for f95 and fc too.

diff --git a/aclang.m4 b/aclang.m4
index f25511dfdbdd02c70d9d933b3cfcc141c4059141..584ee8e02cecf735e357e1f88661ccd4ad1fb62b 100644 (file)
--- a/aclang.m4
+++ b/aclang.m4
@@ -1324,7 +1324,10 @@ AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
 AC_REQUIRE([AC_CYGWIN])dnl
 AC_CACHE_CHECK([for Fortran 77 libraries],
                 ac_cv_flibs,
-[AC_LANG_PUSH(Fortran 77)
+[if test "x$FLIBS" != "x"; then
+  ac_cv_flibs="$FLIBS" # Let the user override the test.
+else
+AC_LANG_PUSH(Fortran 77)
 
 # This is the simplest of all Fortran 77 programs.
 cat >conftest.$ac_ext <<EOF
@@ -1458,7 +1461,9 @@ ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
 test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 ac_cv_flibs=$FLIBS
+fi # test "x$FLIBS" = "x"
 ])
+FLIBS="$ac_cv_flibs"
 AC_SUBST(FLIBS)
 ])# AC_F77_LIBRARY_LDFLAGS
 

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index f25511dfdbdd02c70d9d933b3cfcc141c4059141..584ee8e02cecf735e357e1f88661ccd4ad1fb62b 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1324,7 +1324,10 @@ AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
 AC_REQUIRE([AC_CYGWIN])dnl
 AC_CACHE_CHECK([for Fortran 77 libraries],
                 ac_cv_flibs,
-[AC_LANG_PUSH(Fortran 77)
+[if test "x$FLIBS" != "x"; then
+  ac_cv_flibs="$FLIBS" # Let the user override the test.
+else
+AC_LANG_PUSH(Fortran 77)
 
 # This is the simplest of all Fortran 77 programs.
 cat >conftest.$ac_ext <<EOF
@@ -1458,7 +1461,9 @@ ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
 test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 ac_cv_flibs=$FLIBS
+fi # test "x$FLIBS" = "x"
 ])
+FLIBS="$ac_cv_flibs"
 AC_SUBST(FLIBS)
 ])# AC_F77_LIBRARY_LDFLAGS
 

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index f25511dfdbdd02c70d9d933b3cfcc141c4059141..584ee8e02cecf735e357e1f88661ccd4ad1fb62b 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -1324,7 +1324,10 @@ AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
 AC_REQUIRE([AC_CYGWIN])dnl
 AC_CACHE_CHECK([for Fortran 77 libraries],
                 ac_cv_flibs,
-[AC_LANG_PUSH(Fortran 77)
+[if test "x$FLIBS" != "x"; then
+  ac_cv_flibs="$FLIBS" # Let the user override the test.
+else
+AC_LANG_PUSH(Fortran 77)
 
 # This is the simplest of all Fortran 77 programs.
 cat >conftest.$ac_ext <<EOF
@@ -1458,7 +1461,9 @@ ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
 test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 ac_cv_flibs=$FLIBS
+fi # test "x$FLIBS" = "x"
 ])
+FLIBS="$ac_cv_flibs"
 AC_SUBST(FLIBS)
 ])# AC_F77_LIBRARY_LDFLAGS
 

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index f25511dfdbdd02c70d9d933b3cfcc141c4059141..584ee8e02cecf735e357e1f88661ccd4ad1fb62b 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -1324,7 +1324,10 @@ AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
 AC_REQUIRE([AC_CYGWIN])dnl
 AC_CACHE_CHECK([for Fortran 77 libraries],
                 ac_cv_flibs,
-[AC_LANG_PUSH(Fortran 77)
+[if test "x$FLIBS" != "x"; then
+  ac_cv_flibs="$FLIBS" # Let the user override the test.
+else
+AC_LANG_PUSH(Fortran 77)
 
 # This is the simplest of all Fortran 77 programs.
 cat >conftest.$ac_ext <<EOF
@@ -1458,7 +1461,9 @@ ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
 test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 ac_cv_flibs=$FLIBS
+fi # test "x$FLIBS" = "x"
 ])
+FLIBS="$ac_cv_flibs"
 AC_SUBST(FLIBS)
 ])# AC_F77_LIBRARY_LDFLAGS