* m4/ccstdc.m4: Define am_cv_prog_cc_stdc for backward

compatibility and diagnose the use of AM_PROG_CC_STDC.
* automake.texi (Public macros) <AM_PROG_CC_STDC>: Remove
documentation, this macro is no longer supported.
Reported by Kevin Ryde.

diff --git a/ChangeLog b/ChangeLog
index c1b6029..eedc424 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2002-12-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * m4/ccstdc.m4: Define am_cv_prog_cc_stdc for backward
+       compatibility and diagnose the use of AM_PROG_CC_STDC.
+       * automake.texi (Public macros) <AM_PROG_CC_STDC>: Remove
+       documentation, this macro is no longer supported.
+       Reported by Kevin Ryde.
+
 2002-12-04  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (handle_languages): Test $objdir, not $srcdir, to
-       decides whether a _.c file is in a subdirectory and has to be
+       decide whether a _.c file is in a subdirectory and has to be
        cleaned separately.
        Reported by Kevin Ryde.
 

diff --git a/NEWS b/NEWS
index 78734ec..43962a5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+New in 1.7a:
+* AM_PROG_CC_STDC is now empty.  The content of this macro was
+  merged in AC_PROG_CC.  If your code uses $am_cv_prog_cc_stdc,
+  you should adjust it to use $ac_cv_prog_cc_stdc instead.
+  (This renaming should be safe, even if you have to support several,
+  versions of Automake, because AC_PROG_CC defines this variable since
+  Autoconf 2.54.)
+\f
 New in 1.7:
 * Autoconf 2.54 is required.
 * `aclocal' and `automake' will no longer warn about obsolete

diff --git a/automake.texi b/automake.texi
index eb4bbf2..c4e0558 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1632,18 +1632,6 @@ This is like @code{AC_PROG_CC_C_O}, but it generates its results in the
 manner required by automake.  You must use this instead of
 @code{AC_PROG_CC_C_O} when you need this functionality.
 
-@item AM_PROG_CC_STDC
-If the C compiler is not in ANSI C mode by default, try to add an option
-to output variable @code{CC} to make it so.  This macro tries various
-options that select ANSI C on some system or another.  It considers the
-compiler to be in ANSI C mode if it handles function prototypes correctly.
-
-If you use this macro, you should check after calling it whether the C
-compiler has been set to accept ANSI C; if not, the shell variable
-@code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-code in ANSI C, you can make an un-ANSIfied copy of it by using the
-@code{ansi2knr} option (@pxref{ANSI}).
-
 @item AM_PROG_LEX
 @cindex HP-UX 10, lex problems
 @cindex lex problems with HP-UX 10

diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
index acd63da..6c94866 100644 (file)
--- a/m4/ccstdc.m4
+++ b/m4/ccstdc.m4
@@ -24,5 +24,13 @@
 
 # This was merged into AC_PROG_CC in Autoconf.
 
-AU_DEFUN([AM_PROG_CC_STDC])
+AU_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+AC_DIAGNOSE([obsolete], [$0:
+        your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+        `ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
+        you adjust the code.  You can also remove the above call to
+       AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+])
 AU_DEFUN([fp_PROG_CC_STDC])