* aclang.m4 (AC_PROG_F77): Delete AC_BEFORE(AC_PROG_CPP) that

leads to unnecessary warnings if both C and Fortran are checked.
(AC_PROG_F77_C_O): AC_REQUIRE AC_PROG_F77 instead of pretend you
need to be AC_BEFORE it.

diff --git a/ChangeLog b/ChangeLog
index 0e9acaa52483678ad984775a463f1a45094adea2..d4c5425282686897e86560f0ade8fc10b3d3c94f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2000-07-12 Martin Wilck <martin@tropos.de>
+
+       * aclang.m4 (AC_PROG_F77): Delete AC_BEFORE(AC_PROG_CPP) that
+       leads to unnecessary warnings if both C and Fortran are checked.
+       (AC_PROG_F77_C_O): AC_REQUIRE AC_PROG_F77 instead of pretend you
+       need to be AC_BEFORE it.
+
 2000-07-12  Akim Demaille  <akim@epita.fr>
 
        * autoconf.sh (_ac_warnings): Fix call to tr.
        Reported by Johan Danielsson.
 
-2000-07-10  Martin Wilck <martin@tropos.de>
+2000-07-11  Martin Wilck <martin@tropos.de>
 
        * aclang.m4 (_AC_PROG_F77_V): New macro to determine the flag that
        causes the compiler to output verbose linking information.

diff --git a/aclang.m4 b/aclang.m4
index e8f96749e0a89e897a5ccd397a1769297fa5e205..9921e900799ff36d94b13efb76c79b1a194c9153 100644 (file)
--- a/aclang.m4
+++ b/aclang.m4
@@ -657,7 +657,8 @@ fi
 # AC_PROG_CC_C_O
 # --------------
 AC_DEFUN([AC_PROG_CC_C_O],
-[if test "x$CC" != xcc; then
+[AC_REQUIRE([AC_PROG_F77])dnl
+if test "x$CC" != xcc; then
   AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
@@ -843,8 +844,7 @@ fi[]dnl
 # pgf77 is the Portland Group f77 compiler.
 # lf95 is the Lahey-Fujitsu compiler.
 AC_DEFUN([AC_PROG_F77],
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
 AC_ARG_VAR([F77], [Fortran 77 compiler command])
 AC_ARG_VAR([FFLAGS], [Fortran 77 compiler flags])
 AC_CHECK_TOOLS(F77,
@@ -929,8 +929,7 @@ fi[]dnl
 # why anyone would use it.  The only reason I include it is for
 # completeness, since a similar test exists for the C compiler.
 AC_DEFUN([AC_PROG_F77_C_O],
-[AC_BEFORE([$0], [AC_PROG_F77])dnl
-AC_MSG_CHECKING(whether $F77 understand -c and -o together)
+[AC_MSG_CHECKING(whether $F77 understand -c and -o together)
 set dummy $F77; ac_f77=`echo $[2] |
 sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index e8f96749e0a89e897a5ccd397a1769297fa5e205..9921e900799ff36d94b13efb76c79b1a194c9153 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -657,7 +657,8 @@ fi
 # AC_PROG_CC_C_O
 # --------------
 AC_DEFUN([AC_PROG_CC_C_O],
-[if test "x$CC" != xcc; then
+[AC_REQUIRE([AC_PROG_F77])dnl
+if test "x$CC" != xcc; then
   AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
@@ -843,8 +844,7 @@ fi[]dnl
 # pgf77 is the Portland Group f77 compiler.
 # lf95 is the Lahey-Fujitsu compiler.
 AC_DEFUN([AC_PROG_F77],
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
 AC_ARG_VAR([F77], [Fortran 77 compiler command])
 AC_ARG_VAR([FFLAGS], [Fortran 77 compiler flags])
 AC_CHECK_TOOLS(F77,
@@ -929,8 +929,7 @@ fi[]dnl
 # why anyone would use it.  The only reason I include it is for
 # completeness, since a similar test exists for the C compiler.
 AC_DEFUN([AC_PROG_F77_C_O],
-[AC_BEFORE([$0], [AC_PROG_F77])dnl
-AC_MSG_CHECKING(whether $F77 understand -c and -o together)
+[AC_MSG_CHECKING(whether $F77 understand -c and -o together)
 set dummy $F77; ac_f77=`echo $[2] |
 sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index e8f96749e0a89e897a5ccd397a1769297fa5e205..9921e900799ff36d94b13efb76c79b1a194c9153 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -657,7 +657,8 @@ fi
 # AC_PROG_CC_C_O
 # --------------
 AC_DEFUN([AC_PROG_CC_C_O],
-[if test "x$CC" != xcc; then
+[AC_REQUIRE([AC_PROG_F77])dnl
+if test "x$CC" != xcc; then
   AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
@@ -843,8 +844,7 @@ fi[]dnl
 # pgf77 is the Portland Group f77 compiler.
 # lf95 is the Lahey-Fujitsu compiler.
 AC_DEFUN([AC_PROG_F77],
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
 AC_ARG_VAR([F77], [Fortran 77 compiler command])
 AC_ARG_VAR([FFLAGS], [Fortran 77 compiler flags])
 AC_CHECK_TOOLS(F77,
@@ -929,8 +929,7 @@ fi[]dnl
 # why anyone would use it.  The only reason I include it is for
 # completeness, since a similar test exists for the C compiler.
 AC_DEFUN([AC_PROG_F77_C_O],
-[AC_BEFORE([$0], [AC_PROG_F77])dnl
-AC_MSG_CHECKING(whether $F77 understand -c and -o together)
+[AC_MSG_CHECKING(whether $F77 understand -c and -o together)
 set dummy $F77; ac_f77=`echo $[2] |
 sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index e8f96749e0a89e897a5ccd397a1769297fa5e205..9921e900799ff36d94b13efb76c79b1a194c9153 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -657,7 +657,8 @@ fi
 # AC_PROG_CC_C_O
 # --------------
 AC_DEFUN([AC_PROG_CC_C_O],
-[if test "x$CC" != xcc; then
+[AC_REQUIRE([AC_PROG_F77])dnl
+if test "x$CC" != xcc; then
   AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
@@ -843,8 +844,7 @@ fi[]dnl
 # pgf77 is the Portland Group f77 compiler.
 # lf95 is the Lahey-Fujitsu compiler.
 AC_DEFUN([AC_PROG_F77],
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
 AC_ARG_VAR([F77], [Fortran 77 compiler command])
 AC_ARG_VAR([FFLAGS], [Fortran 77 compiler flags])
 AC_CHECK_TOOLS(F77,
@@ -929,8 +929,7 @@ fi[]dnl
 # why anyone would use it.  The only reason I include it is for
 # completeness, since a similar test exists for the C compiler.
 AC_DEFUN([AC_PROG_F77_C_O],
-[AC_BEFORE([$0], [AC_PROG_F77])dnl
-AC_MSG_CHECKING(whether $F77 understand -c and -o together)
+[AC_MSG_CHECKING(whether $F77 understand -c and -o together)
 set dummy $F77; ac_f77=`echo $[2] |
 sed 's/[[^a-zA-Z0-9_]]/_/g;s/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,