Re: AM_PROG_CC_STDC and am_cv_prog_cc_stdc

[Alexandre Duret-Lutz]

>>> "Kevin" == Kevin Ryde <address@hidden> writes:

 Kevin> Alexandre Duret-Lutz <address@hidden> writes:
 >> 
 >> 2002-10-09  Akim Demaille  <address@hidden>
 >> 
 >> * m4/ccstdc.m4 (AM_PROG_CC_STDC): Its definition is now empty:
 >> the content of this macro was merged in AC_PROG_CC.

 Kevin> In "Public macros" in the manual, AM_PROG_CC_STDC is described as
 Kevin> setting am_cv_prog_cc_stdc to "no" for k&r.

 Kevin> I suspect this change will stop that from happening.  Certainly
 Kevin> am_cv_prog_cc_stdc doesn't seem to make an an appearance in the
 Kevin> configure script any more.

 Kevin> I wouldn't see any need to accept am_cv_prog_cc_stdc as an input,
 Kevin> having never been documented that way, but it probably should be
 Kevin> retained as an output.

How about this?

2002-12-04  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.198
diff -u -r1.198 NEWS
--- NEWS        25 Sep 2002 20:17:12 -0000      1.198
+++ NEWS        4 Dec 2002 21:53:09 -0000
@@ -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.)
+
 New in 1.7:
 * Autoconf 2.54 is required.
 * `aclocal' and `automake' will no longer warn about obsolete
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.313
diff -u -r1.313 automake.texi
--- automake.texi       4 Dec 2002 19:31:42 -0000       1.313
+++ automake.texi       4 Dec 2002 21:53:32 -0000
@@ -1632,18 +1632,6 @@
 manner required by automake.  You must use this instead of
 @code{AC_PROG_CC_C_O} when you need this functionality.
 
address@hidden 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
address@hidden 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
address@hidden option (@pxref{ANSI}).
-
 @item AM_PROG_LEX
 @cindex HP-UX 10, lex problems
 @cindex lex problems with HP-UX 10
Index: m4/ccstdc.m4
===================================================================
RCS file: /cvs/automake/automake/m4/ccstdc.m4,v
retrieving revision 1.12
diff -u -r1.12 ccstdc.m4
--- m4/ccstdc.m4        9 Oct 2002 21:24:50 -0000       1.12
+++ m4/ccstdc.m4        4 Dec 2002 21:53:35 -0000
@@ -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 `ac_cv_prog_cc_stdc', but upon
+        `am_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])


-- 
Alexandre Duret-Lutz