From: Akim Demaille Date: Wed, 8 Nov 2000 17:46:24 +0000 (+0000) Subject: * aclang.m4 (AC_LANG_PROGRAM(Fortran 77): Complain about $1 having X-Git-Tag: autoconf-2.50~456 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a1fe2294223baba5c4a174eed7b7d7ddd4b71e7;p=thirdparty%2Fautoconf.git * 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 42801b879..364f9c541 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-11-08 Akim Demaille + + * 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 * autoconf.sh: Temporarily disable recognizing of abbreviated diff --git a/aclang.m4 b/aclang.m4 index a3b33597e..91c30d373 100644 --- 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 a3b33597e..91c30d373 100644 --- 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 a3b33597e..91c30d373 100644 --- 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 a3b33597e..91c30d373 100644 --- 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 2cab1d16e..cb5e52613 100644 --- 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 9f4e99ce3..8e592eb1c 100644 --- 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 dc8f0a2db..ca9e4a181 100644 --- 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 def6f856b..7c309f6f5 100644 --- 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 35fba7ef5..983d1f4b0 100644 --- 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