* m4/libtool.m4 (_LT_PROG_F77): Set it up so that saying F77=no

to configure disables the fortran tests in the testsuite.

diff --git a/ChangeLog b/ChangeLog
index 14baf723d02199aeada8b5b6831d9627b77e1596..3e732b80c7ceadcb09b88a74b28c5926acd94fb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-30  Peter Ekberg  <peda@lysator.liu.se>
+
+       * m4/libtool.m4 (_LT_PROG_F77): Set it up so that saying F77=no
+       to configure disables the fortran tests in the testsuite.
+
 2005-07-29  Richard Moseley  <dickie.moseley@virgin.net>
 
        * m4/ltdl.m4 (LTDL_INIT): Handle in addition the new name for 

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4ff27bf3244b99052eace1b3acc02dfdbc0de7a9..047ef8339a13de6f0995bcf37cb1ff3347ac0e81 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5789,10 +5789,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
 # if there is no fortran compiler, we have our own version here.
 m4_defun([_LT_PROG_F77],
 [
-pushdef([AC_MSG_ERROR], [_lt_caught_F77_error=yes])
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
 AC_PROG_F77
-if test -z "$F77"; then
-  _lt_caught_F77_error=yes
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
 fi
 popdef([AC_MSG_ERROR])
 ])# _LT_PROG_F77
@@ -5838,7 +5838,7 @@ _LT_TAGVAR(objext, $1)=$objext
 # the F77 compiler isn't working.  Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_F77_error" != yes; then
+if test "$_lt_disable_F77" != yes; then
   # Code to be used in simple compile tests
   lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
 
@@ -5910,7 +5910,7 @@ if test "$_lt_caught_F77_error" != yes; then
   fi # test -n "$compiler"
 
   CC="$lt_save_CC"
-fi # test "$_lt_caught_F77_error" != yes
+fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG