[SCM] GNU Autoconf source repository branch, master, updated. v2.68-21-g727ce95

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=727ce95b292404047d50fe27cb5bfec09233537d

The branch, master has been updated
       via  727ce95b292404047d50fe27cb5bfec09233537d (commit)
      from  b85c2ea6062909b13760d0921ac7e01fb4ce28fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 727ce95b292404047d50fe27cb5bfec09233537d
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jan 9 10:16:33 2011 +0100

    Avoid reference to $CYGWIN in Fortran macros.
    
    * lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Require
    AC_CANONICAL_HOST.  Replace test for $CYGWIN with $host_s test.
    * tests/fortran.at (AC_F77_DUMMY_MAIN usage)
    (AC_FC_DUMMY_MAIN usage, AC_F77_MAIN usage, AC_FC_MAIN usage):
    Use AT_CONFIGURE_AC and simplify accordingly, so auxiliary
    scripts are copied into the test directories.
    (AC_F77_FUNC usage, AC_FC_FUNC usage): Likewise.  Adjust to
    autoheader being used now.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   10 ++++++++++
 lib/autoconf/fortran.m4 |    9 +++++++--
 tests/fortran.at        |   40 ++++++++++++++--------------------------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cad88b0..acae932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-10  Ralf Wildenhues  <address@hidden>
 
+       Avoid reference to $CYGWIN in Fortran macros.
+       * lib/autoconf/fortran.m4 (_AC_FC_LIBRARY_LDFLAGS): Require
+       AC_CANONICAL_HOST.  Replace test for $CYGWIN with $host_s test.
+       * tests/fortran.at (AC_F77_DUMMY_MAIN usage)
+       (AC_FC_DUMMY_MAIN usage, AC_F77_MAIN usage, AC_FC_MAIN usage):
+       Use AT_CONFIGURE_AC and simplify accordingly, so auxiliary
+       scripts are copied into the test directories.
+       (AC_F77_FUNC usage, AC_FC_FUNC usage): Likewise.  Adjust to
+       autoheader being used now.
+
        docs: link to Gnulib configmake documentation.
        * doc/autoconf.texi (Defining Directories): Use proper crossref,
        now that the Gnulib manual has a configmake section.
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index c704868..bed9c96 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -609,7 +609,8 @@ fi],
 # in "octave-2.0.13/aclocal.m4", and full credit should go to John
 # W. Eaton for writing this extremely useful macro.  Thank you John.
 AC_DEFUN([_AC_FC_LIBRARY_LDFLAGS],
-[_AC_FORTRAN_ASSERT()dnl
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_AC_FORTRAN_ASSERT()dnl
 _AC_PROG_FC_V
 AC_CACHE_CHECK([for _AC_LANG libraries of $[]_AC_FC[]], 
ac_cv_[]_AC_LANG_ABBREV[]_libs,
 [if test "x$[]_AC_LANG_PREFIX[]LIBS" != "x"; then
@@ -641,7 +642,11 @@ while test address@hidden:@] != 1; do
          |-LANG:=* | -LIST:* | -LNO:* | -link)
          ;;
        -lkernel32)
-         test x"$CYGWIN" != xyes && 
ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs $ac_arg"
+         case $host_os in
+         *cygwin*) ;;
+         *) ac_cv_[]_AC_LANG_ABBREV[]_libs="$ac_cv_[]_AC_LANG_ABBREV[]_libs 
$ac_arg"
+           ;;
+         esac
          ;;
        -[[LRuYz]])
          # These flags, when seen by themselves, take an argument.
diff --git a/tests/fortran.at b/tests/fortran.at
index 92df39d..f0fec7c 100644
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -173,15 +173,12 @@ AT_CLEANUP
 
 AT_SETUP([AC_F77_DUMMY_MAIN usage])
 
-AT_DATA([configure.ac],
-[[AC_INIT
-AC_CONFIG_HEADERS([config.h:config.hin])
+AT_CONFIGURE_AC([[
 AC_PROG_F77
 AC_F77_DUMMY_MAIN([], [AC_MSG_FAILURE([failed to determine F77 dummy main], 
[77])])
 AC_F77_WRAPPERS
 AC_PROG_CC
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
 ]])
 
 AT_DATA([Makefile.in],
@@ -253,16 +250,13 @@ AT_CLEANUP
 
 AT_SETUP([AC_FC_DUMMY_MAIN usage])
 
-AT_DATA([configure.ac],
-[[AC_INIT
-AC_CONFIG_HEADERS([config.h:config.hin])
+AT_CONFIGURE_AC([[
 AC_PROG_FC
 AC_FC_FIXEDFORM
 AC_FC_DUMMY_MAIN([], [AC_MSG_FAILURE([failed to determine FC dummy main], 
[77])])
 AC_FC_WRAPPERS
 AC_PROG_CC
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
 ]])
 
 AT_DATA([Makefile.in],
@@ -334,15 +328,12 @@ AT_CLEANUP
 
 AT_SETUP([AC_F77_MAIN usage])
 
-AT_DATA([configure.ac],
-[[AC_INIT
-AC_CONFIG_HEADERS([config.h:config.hin])
+AT_CONFIGURE_AC([[
 AC_PROG_F77
 AC_F77_MAIN
 AC_F77_WRAPPERS
 AC_PROG_CC
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
 ]])
 
 AT_DATA([Makefile.in],
@@ -416,16 +407,13 @@ AT_CLEANUP
 
 AT_SETUP([AC_FC_MAIN usage])
 
-AT_DATA([configure.ac],
-[[AC_INIT
-AC_CONFIG_HEADERS([config.h:config.hin])
+AT_CONFIGURE_AC([[
 AC_PROG_FC
 AC_FC_FIXEDFORM
 AC_FC_MAIN
 AC_FC_WRAPPERS
 AC_PROG_CC
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
 ]])
 
 AT_DATA([Makefile.in],
@@ -498,15 +486,13 @@ AT_CLEANUP
 
 AT_SETUP([AC_F77_FUNC usage])
 
-AT_DATA([configure.ac],
-[[AC_INIT
+AT_CONFIGURE_AC([[
 AC_PROG_F77
 AC_F77_FUNC([foobar])
 AC_SUBST([foobar])
 AC_PROG_CC
 AC_CONFIG_FILES([cprogram.c:cprogram.in])
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
 ]])
 
 AT_DATA([Makefile.in],
@@ -520,7 +506,7 @@ address@hidden@: address@hidden@ address@hidden@
 address@hidden@:
        @F77@ @FFLAGS@ -c $<
 address@hidden@:
-       @CC@ @DEFS@ @CPPFLAGS@ @CFLAGS@ -c $<
+       @CC@ @DEFS@ -I. @CPPFLAGS@ @CFLAGS@ -c $<
 ]])
 
 AT_DATA([foobar.f],
@@ -532,7 +518,8 @@ AT_DATA([foobar.f],
 ]])
 
 AT_DATA([cprogram.in],
-[[#include <math.h>
+[[#include <config.h>
+#include <math.h>
 
 #ifdef __cplusplus
 extern "C"  /* prevent C++ name mangling */
@@ -558,6 +545,7 @@ int main(int argc, char *argv[])
 ]])
 
 AT_CHECK_AUTOCONF
+AT_CHECK_AUTOHEADER
 AT_CHECK_CONFIGURE
 : "${MAKE=make}"
 AT_CHECK([$MAKE], [], [ignore], [ignore])
@@ -572,15 +560,13 @@ AT_CLEANUP
 
 AT_SETUP([AC_FC_FUNC usage])
 
-AT_DATA([configure.ac],
-[[AC_INIT
+AT_CONFIGURE_AC([[
 AC_PROG_FC
 AC_FC_FUNC([foobar])
 AC_SUBST([foobar])
 AC_PROG_CC
 AC_CONFIG_FILES([cprogram.c:cprogram.in])
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
 ]])
 
 AT_DATA([Makefile.in],
@@ -594,7 +580,7 @@ address@hidden@: address@hidden@ address@hidden@
 address@hidden@:
        @FC@ @FCFLAGS@ -c $<
 address@hidden@:
-       @CC@ @DEFS@ @CPPFLAGS@ @CFLAGS@ -c $<
+       @CC@ @DEFS@ -I. @CPPFLAGS@ @CFLAGS@ -c $<
 ]])
 
 AT_DATA([foobar.f],
@@ -606,7 +592,8 @@ AT_DATA([foobar.f],
 ]])
 
 AT_DATA([cprogram.in],
-[[#include <math.h>
+[[#include <config.h>
+#include <math.h>
 
 #ifdef __cplusplus
 extern "C"  /* prevent C++ name mangling */
@@ -632,6 +619,7 @@ int main(int argc, char *argv[])
 ]])
 
 AT_CHECK_AUTOCONF
+AT_CHECK_AUTOHEADER
 AT_CHECK_CONFIGURE
 : "${MAKE=make}"
 AT_CHECK([$MAKE], [], [ignore], [ignore])


hooks/post-receive
-- 
GNU Autoconf source repository