From: Ralf Wildenhues Date: Sun, 9 Jan 2011 09:16:33 +0000 (+0100) Subject: Avoid reference to $CYGWIN in Fortran macros. X-Git-Tag: v2.68b~123 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727ce95b292404047d50fe27cb5bfec09233537d;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index cad88b0e..acae9321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2011-01-10 Ralf Wildenhues + 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 c704868c..bed9c96b 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 $[@%:@] != 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 92df39d4..f0fec7cd 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 @@ cprogram@EXEEXT@: cprogram.@OBJEXT@ foobar.@OBJEXT@ .f.@OBJEXT@: @F77@ @FFLAGS@ -c $< .c.@OBJEXT@: - @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 +[[#include +#include #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 @@ cprogram@EXEEXT@: cprogram.@OBJEXT@ foobar.@OBJEXT@ .f.@OBJEXT@: @FC@ @FCFLAGS@ -c $< .c.@OBJEXT@: - @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 +[[#include +#include #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])