From: Peter Ekberg Date: Sat, 30 Jul 2005 15:51:00 +0000 (+0000) Subject: * m4/libtool.m4 (_LT_PROG_F77): Set it up so that saying F77=no X-Git-Tag: release-2-1b~599 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca1b539fb3885b6eebf12b19bc8617b27110a99;p=thirdparty%2Flibtool.git * 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 46a027efb..0ee28c01b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-30 Peter Ekberg + + * 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 * m4/ltdl.m4 (LTDL_INIT): Handle in addition the new name for diff --git a/m4/libtool.m4 b/m4/libtool.m4 index f11ecbbef..ca87e6a15 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -5838,10 +5838,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 @@ -5887,7 +5887,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" @@ -5959,7 +5959,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