* aclang.m4 (AC_LANG_PROGRAM(Fortran 77): Complain about $1 having

a value.
Reported by Paul Martinolich.
(_AC_LANG_COMPILER_GNU): Pass the test as the body of
AC_LANG_PROGRAM, not the prologue.

diff --git a/ChangeLog b/ChangeLog
index 42801b8797f9c373685703038d9ce3f78e9dd1f8..364f9c5413672304d2c2f2b76bb96faa6579afb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-08  Akim Demaille  <akim@epita.fr>
+
+       * aclang.m4 (AC_LANG_PROGRAM(Fortran 77): Complain about $1 having
+       a value.
+       Reported by Paul Martinolich.
+       (_AC_LANG_COMPILER_GNU): Pass the test as the body of
+       AC_LANG_PROGRAM, not the prologue.
+
 2000-11-07  Pavel Roskin  <proski@gnu.org>
 
        * autoconf.sh: Temporarily disable recognizing of abbreviated

diff --git a/aclang.m4 b/aclang.m4
index a3b33597e6419a7b0a1ab72cfde9ea9151731927..91c30d37306a27e1617a2e02f4b2e2d30c4daf44 100644 (file)
--- a/aclang.m4
+++ b/aclang.m4
@@ -466,7 +466,9 @@ m4_define([AC_LANG_SOURCE(Fortran 77)],
 # -----------------------------------------------
 # Yes, we discard the PROLOGUE.
 m4_define([AC_LANG_PROGRAM(Fortran 77)],
-[      program main
+[ifval([$1],
+       [m4_warn([syntax], [$0: ignoring PROLOGUE: $1])])dnl
+      program main
 $2
       end])
 
@@ -549,7 +551,7 @@ AC_MSG_RESULT($cross_compiling)
 m4_define([_AC_LANG_COMPILER_GNU],
 [AC_CACHE_CHECK([whether we are using the GNU _AC_LANG compiler],
                 [ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu],
-[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __GNUC__
+[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
   choke me
 #endif
 ]])],

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index a3b33597e6419a7b0a1ab72cfde9ea9151731927..91c30d37306a27e1617a2e02f4b2e2d30c4daf44 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -466,7 +466,9 @@ m4_define([AC_LANG_SOURCE(Fortran 77)],
 # -----------------------------------------------
 # Yes, we discard the PROLOGUE.
 m4_define([AC_LANG_PROGRAM(Fortran 77)],
-[      program main
+[ifval([$1],
+       [m4_warn([syntax], [$0: ignoring PROLOGUE: $1])])dnl
+      program main
 $2
       end])
 
@@ -549,7 +551,7 @@ AC_MSG_RESULT($cross_compiling)
 m4_define([_AC_LANG_COMPILER_GNU],
 [AC_CACHE_CHECK([whether we are using the GNU _AC_LANG compiler],
                 [ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu],
-[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __GNUC__
+[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
   choke me
 #endif
 ]])],

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index a3b33597e6419a7b0a1ab72cfde9ea9151731927..91c30d37306a27e1617a2e02f4b2e2d30c4daf44 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -466,7 +466,9 @@ m4_define([AC_LANG_SOURCE(Fortran 77)],
 # -----------------------------------------------
 # Yes, we discard the PROLOGUE.
 m4_define([AC_LANG_PROGRAM(Fortran 77)],
-[      program main
+[ifval([$1],
+       [m4_warn([syntax], [$0: ignoring PROLOGUE: $1])])dnl
+      program main
 $2
       end])
 
@@ -549,7 +551,7 @@ AC_MSG_RESULT($cross_compiling)
 m4_define([_AC_LANG_COMPILER_GNU],
 [AC_CACHE_CHECK([whether we are using the GNU _AC_LANG compiler],
                 [ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu],
-[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __GNUC__
+[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
   choke me
 #endif
 ]])],

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index a3b33597e6419a7b0a1ab72cfde9ea9151731927..91c30d37306a27e1617a2e02f4b2e2d30c4daf44 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -466,7 +466,9 @@ m4_define([AC_LANG_SOURCE(Fortran 77)],
 # -----------------------------------------------
 # Yes, we discard the PROLOGUE.
 m4_define([AC_LANG_PROGRAM(Fortran 77)],
-[      program main
+[ifval([$1],
+       [m4_warn([syntax], [$0: ignoring PROLOGUE: $1])])dnl
+      program main
 $2
       end])
 
@@ -549,7 +551,7 @@ AC_MSG_RESULT($cross_compiling)
 m4_define([_AC_LANG_COMPILER_GNU],
 [AC_CACHE_CHECK([whether we are using the GNU _AC_LANG compiler],
                 [ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu],
-[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __GNUC__
+[_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__
   choke me
 #endif
 ]])],

diff --git a/man/autoconf.1 b/man/autoconf.1
index 2cab1d16ed1a67336e81816b0115b7b4731bc5ac..cb5e5261329180347f2c28356e22119691079779 100644 (file)
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.022.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
 .TH AUTOCONF "1" "November 2000" "GNU autoconf 2.49b" FSF
 .SH NAME
 autoconf \- Generate configuration scripts

diff --git a/man/autoheader.1 b/man/autoheader.1
index 9f4e99ce3b3bc7783a64295fa2aa77ca2681718f..8e592eb1ce74e3be88e3959abcb608d3b933e808 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.022.
-.TH AUTOHEADER "1" "October 2000" "GNU autoconf 2.49b" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
+.TH AUTOHEADER "1" "November 2000" "GNU autoconf 2.49b" FSF
 .SH NAME
 autoheader \- Create a template header for configure
 .SH SYNOPSIS

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index dc8f0a2db9cafef5ba0645401a4d6cfe7203a561..ca9e4a181965363d2b832a07492a1954a24fa5e0 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.022.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
 .TH AUTORECONF "1" "November 2000" "GNU autoconf 2.49b" FSF
 .SH NAME
 autoreconf \- Update generated configuration files

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index def6f856befb2160a714d2af578e5695e046d15b..7c309f6f5dfea7478ee28c258db6d6794e9f2c31 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.022.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
 .TH AUTOUPDATE "1" "November 2000" "GNU autoconf 2.49b" FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf

diff --git a/man/ifnames.1 b/man/ifnames.1
index 35fba7ef5306f14030e4beb5b8aa7aaab3e814c0..983d1f4b0d7a1cbea6cf458a3b3622f5c82fc5cb 100644 (file)
--- a/man/ifnames.1
+++ b/man/ifnames.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.022.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
 .TH IFNAMES "1" "November 2000" "GNU autoconf 2.49b" FSF
 .SH NAME
 ifnames \- Extract CPP conditionals from a set of files