[PATCH] gnulib-tool: port better to current Autoconf

[Paul Eggert]

* doc/gnulib-tool.texi (Initial import): Don’t mention
AC_PROG_CC_STDC as it’s deprecated in current Autoconf.
* gnulib-tool (func_done_dir): Suggest replacing
AC_PROG_CC_STDC and AC_PROG_CC_C99, as per current Autoconf.
---
 ChangeLog            |  8 ++++++++
 doc/gnulib-tool.texi | 11 -----------
 gnulib-tool          |  2 ++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a449380e..bc7427cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+       gnulib-tool: port better to current Autoconf
+       * doc/gnulib-tool.texi (Initial import): Don’t mention
+       AC_PROG_CC_STDC as it’s deprecated in current Autoconf.
+       * gnulib-tool (func_done_dir): Suggest replacing
+       AC_PROG_CC_STDC and AC_PROG_CC_C99, as per current Autoconf.
+
 2021-04-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        reallocarray: a bit more tuning
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index 465bb4246..b35c71366 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -234,17 +234,6 @@ gl_EARLY
 ...
 @end example
 
-If you are using @code{AC_PROG_CC_STDC}, the macro @code{gl_EARLY} must
-be called after it, like this:
-
-@example
-...
-AC_PROG_CC
-AC_PROG_CC_STDC
-gl_EARLY
-...
-@end example
-
 The core part of the gnulib checks are done by the macro
 @code{gl_INIT}.  Place it further down in the file, typically where
 you normally check for header files or functions.  It must come after
diff --git a/gnulib-tool b/gnulib-tool
index 1a9a45aaf..182b9b4a4 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -6142,9 +6142,11 @@ s,//*$,/,'
     fi
   done
   if grep '^ *AC_PROG_CC_STDC' "$configure_ac" > /dev/null; then
+    echo "  - replace AC_PROG_CC_STDC with AC_PROG_CC in $configure_ac,"
     position_early_after=AC_PROG_CC_STDC
   else
     if grep '^ *AC_PROG_CC_C99' "$configure_ac" > /dev/null; then
+      echo "  - replace AC_PROG_CC_C99 with AC_PROG_CC in $configure_ac,"
       position_early_after=AC_PROG_CC_C99
     else
       position_early_after=AC_PROG_CC
-- 
2.27.0