Results from running autoupdate on gnulib m4 files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Because of the upcoming autoconf 2.70 release gives more warnings, I 
checked the other files in gnulib in the m4 directory with

autoupdate -v *.m4 2>&1 | tee log

Fortunately, there are not too many issues (on top of the other issues I 
already reported).  Here are the relevant excerpts from the output:

-----
gnulib-common.m4:486: warning: AC_PROG_CC_C99 is obsolete; use AC_PROG_CC
gnulib-common.m4:487: warning: AC_PROG_CC_STDC is obsolete; use AC_PROG_CC
autoupdate: 'gnulib-common.m4' is updated

realloc.m4:11: warning: The preprocessor macro `STDC_HEADERS' is obsolete.
  Except in unusual embedded environments, you can safely include all
  ISO C90 headers unconditionally.
autoupdate: 'realloc.m4' is updated

std-gnu11.m4:457: warning: AC_PROG_CC_C89 is obsolete; use AC_PROG_CC
std-gnu11.m4:459: warning: AC_PROG_CC_C99 is obsolete; use AC_PROG_CC
std-gnu11.m4:459: warning: AC_PROG_CC_STDC is obsolete; use AC_PROG_CC
autoupdate: 'std-gnu11.m4' is updated
-----

I went through the changes that autoupdate made and reverted what seemed to be
incorrect changes (e.g. AC_PREREQ version numbers).  The remaining 
changes are almost certainly incorrect but it shows where other problems 
are likely to arise:

* Use of AC_DECL_SYS_SIGLIST in strsignal.m4
* Redefinition of AC_CHECKING in several files to silence AC_CHECK_PROG
* AC_HEADER_STDC in realloc.m4 and malloc.m4

I've attached the diff to this email.

diff --git a/m4/csharpcomp.m4 b/m4/csharpcomp.m4
index 77819d683..dcab1b754 100644
--- a/m4/csharpcomp.m4
+++ b/m4/csharpcomp.m4
@@ -15,12 +15,12 @@ AC_DEFUN([gt_CSHARPCOMP],
   AC_MSG_CHECKING([for C[#] compiler])
   HAVE_CSHARPCOMP=1
   pushdef([AC_MSG_CHECKING],[:])dnl
-  pushdef([AC_CHECKING],[:])dnl
+  pushdef([AS_MESSAGE([checking ...])],[:])dnl
   pushdef([AC_MSG_RESULT],[:])dnl
   AC_CHECK_PROG([HAVE_MCS_IN_PATH], [mcs], [yes])
   AC_CHECK_PROG([HAVE_CSC_IN_PATH], [csc], [yes])
   popdef([AC_MSG_RESULT])dnl
-  popdef([AC_CHECKING])dnl
+  popdef([AS_MESSAGE([checking ...])])dnl
   popdef([AC_MSG_CHECKING])dnl
   for impl in "$CSHARP_CHOICE" mono sscli no; do
     case "$impl" in
diff --git a/m4/csharpexec.m4 b/m4/csharpexec.m4
index 5158a1a58..4269e9232 100644
--- a/m4/csharpexec.m4
+++ b/m4/csharpexec.m4
@@ -21,12 +21,12 @@ AC_DEFUN([gt_CSHARPEXEC],
 ], MONO_PATH_SEPARATOR=';', MONO_PATH_SEPARATOR=':')
   HAVE_CSHARPEXEC=1
   pushdef([AC_MSG_CHECKING],[:])dnl
-  pushdef([AC_CHECKING],[:])dnl
+  pushdef([AS_MESSAGE([checking ...])],[:])dnl
   pushdef([AC_MSG_RESULT],[:])dnl
   AC_CHECK_PROG([HAVE_MONO_IN_PATH], [mono], [yes])
   AC_CHECK_PROG([HAVE_CLIX_IN_PATH], [clix], [yes])
   popdef([AC_MSG_RESULT])dnl
-  popdef([AC_CHECKING])dnl
+  popdef([AS_MESSAGE([checking ...])])dnl
   popdef([AC_MSG_CHECKING])dnl
   for impl in "$CSHARP_CHOICE" mono no; do
     case "$impl" in
diff --git a/m4/exponentd.m4 b/m4/exponentd.m4
index cca879782..457af3f94 100644
--- a/m4/exponentd.m4
+++ b/m4/exponentd.m4
@@ -91,12 +91,14 @@ int main ()
             [
               pushdef([AC_MSG_CHECKING],[:])dnl
               pushdef([AC_MSG_RESULT],[:])dnl
-              pushdef([AC_MSG_RESULT_UNQUOTED],[:])dnl
+              pushdef([_AS_ECHO_UNQUOTED([$as_me:${as_lineno-$LINENO}: result: ],[AS_MESSAGE_LOG_FD])
+_AS_ECHO_UNQUOTED([])],[:])dnl
               AC_C_BIGENDIAN(
                 [gl_cv_cc_double_expbit0="word 0 bit 20"],
                 [gl_cv_cc_double_expbit0="word 1 bit 20"],
                 [gl_cv_cc_double_expbit0="unknown"])
-              popdef([AC_MSG_RESULT_UNQUOTED])dnl
+              popdef([_AS_ECHO_UNQUOTED([$as_me:${as_lineno-$LINENO}: result: ],[AS_MESSAGE_LOG_FD])
+_AS_ECHO_UNQUOTED([])])dnl
               popdef([AC_MSG_RESULT])dnl
               popdef([AC_MSG_CHECKING])dnl
             ])
diff --git a/m4/gethostname.m4 b/m4/gethostname.m4
index 1d05b2a60..1d5c0d450 100644
--- a/m4/gethostname.m4
+++ b/m4/gethostname.m4
@@ -74,7 +74,7 @@ lucky
         dnl mingw.
         gl_cv_decl_HOST_NAME_MAX=256
       else
-        _AC_COMPUTE_INT([MAXHOSTNAMELEN], [gl_cv_decl_HOST_NAME_MAX], [
+        AC_COMPUTE_INT([gl_cv_decl_HOST_NAME_MAX],[MAXHOSTNAMELEN],[
 #include <sys/types.h>
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -85,8 +85,7 @@ lucky
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
-],
-          [dnl The system does not define MAXHOSTNAMELEN in any of the common
+],[dnl The system does not define MAXHOSTNAMELEN in any of the common
            dnl headers. Use a safe fallback.
            gl_cv_decl_HOST_NAME_MAX=256
           ])
diff --git a/m4/javacomp.m4 b/m4/javacomp.m4
index b5eea0795..9c8ecc1f4 100644
--- a/m4/javacomp.m4
+++ b/m4/javacomp.m4
@@ -495,13 +495,13 @@ changequote([,])dnl
   fi
   if test -z "$HAVE_JAVACOMP"; then
     pushdef([AC_MSG_CHECKING],[:])dnl
-    pushdef([AC_CHECKING],[:])dnl
+    pushdef([AS_MESSAGE([checking ...])],[:])dnl
     pushdef([AC_MSG_RESULT],[:])dnl
     AC_CHECK_PROG([HAVE_GCJ_IN_PATH], [gcj], [yes])
     AC_CHECK_PROG([HAVE_JAVAC_IN_PATH], [javac], [yes])
     AC_CHECK_PROG([HAVE_JIKES_IN_PATH], [jikes], [yes])
     popdef([AC_MSG_RESULT])dnl
-    popdef([AC_CHECKING])dnl
+    popdef([AS_MESSAGE([checking ...])])dnl
     popdef([AC_MSG_CHECKING])dnl
     if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
       dnl Test for a good gcj version (>= 3.0).
diff --git a/m4/javaexec.m4 b/m4/javaexec.m4
index c69575b85..83ed47455 100644
--- a/m4/javaexec.m4
+++ b/m4/javaexec.m4
@@ -28,14 +28,14 @@ AC_DEFUN([gt_JAVAEXEC],
     CONF_JAVA="$JAVA"
   else
     pushdef([AC_MSG_CHECKING],[:])dnl
-    pushdef([AC_CHECKING],[:])dnl
+    pushdef([AS_MESSAGE([checking ...])],[:])dnl
     pushdef([AC_MSG_RESULT],[:])dnl
     AC_CHECK_PROG([HAVE_GIJ_IN_PATH], [gij], [yes])
     AC_CHECK_PROG([HAVE_JAVA_IN_PATH], [java], [yes])
     AC_CHECK_PROG([HAVE_JRE_IN_PATH], [jre], [yes])
     AC_CHECK_PROG([HAVE_JVIEW_IN_PATH], [jview], [yes])
     popdef([AC_MSG_RESULT])dnl
-    popdef([AC_CHECKING])dnl
+    popdef([AS_MESSAGE([checking ...])])dnl
     popdef([AC_MSG_CHECKING])dnl
     m4_if([$1], , , [
       save_CLASSPATH="$CLASSPATH"
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index c1f8ea32f..7b4faab96 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -8,7 +8,15 @@ dnl with or without modifications, as long as this notice is preserved.
 # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c
 AC_DEFUN([_AC_FUNC_MALLOC_IF],
 [
-  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([m4_warn([obsolete],
+[The preprocessor macro `STDC_HEADERS' is obsolete.
+  Except in unusual embedded environments, you can safely include all
+  ISO C90 headers unconditionally.])dnl
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
   AC_CHECK_HEADERS([stdlib.h])
   AC_CACHE_CHECK([for GNU libc compatible malloc],
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 85b8f874f..4fb19d9ff 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -8,7 +8,15 @@ dnl with or without modifications, as long as this notice is preserved.
 # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c
 AC_DEFUN([_AC_FUNC_REALLOC_IF],
 [
-  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([m4_warn([obsolete],
+[The preprocessor macro `STDC_HEADERS' is obsolete.
+  Except in unusual embedded environments, you can safely include all
+  ISO C90 headers unconditionally.])dnl
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
   AC_CHECK_HEADERS([stdlib.h])
   AC_CACHE_CHECK([for GNU libc compatible realloc],
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
index db833d820..a20d5b120 100644
--- a/m4/std-gnu11.m4
+++ b/m4/std-gnu11.m4
@@ -454,26 +454,50 @@ dnl preferably extc11.
 ])# _AC_PROG_CC_C11
 
 
-# AC_PROG_CC_C89
+# m4_warn([obsolete],
+[AC_PROG_CC_C89 is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC)
 # --------------
-# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC,
+# Do not use AU_ALIAS here and in m4_warn([obsolete],
+[AC_PROG_CC_C99 is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC) and m4_warn([obsolete],
+[AC_PROG_CC_STDC is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC),
 # as that'd be incompatible with how Automake redefines AC_PROG_CC.  See
 # <https://lists.gnu.org/r/autoconf/2012-10/msg00048.html>.
-AU_DEFUN([AC_PROG_CC_C89],
+AU_DEFUN([m4_warn([obsolete],
+[AC_PROG_CC_C89 is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC)],
   [AC_REQUIRE([AC_PROG_CC])],
   [$0 is obsolete; use AC_PROG_CC]
 )
 
-# AC_PROG_CC_C99
+# m4_warn([obsolete],
+[AC_PROG_CC_C99 is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC)
 # --------------
-AU_DEFUN([AC_PROG_CC_C99],
+AU_DEFUN([m4_warn([obsolete],
+[AC_PROG_CC_C99 is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC)],
   [AC_REQUIRE([AC_PROG_CC])],
   [$0 is obsolete; use AC_PROG_CC]
 )
 
-# AC_PROG_CC_STDC
+# m4_warn([obsolete],
+[AC_PROG_CC_STDC is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC)
 # ---------------
-AU_DEFUN([AC_PROG_CC_STDC],
+AU_DEFUN([m4_warn([obsolete],
+[AC_PROG_CC_STDC is obsolete; use AC_PROG_CC
+])dnl
+AC_REQUIRE(AC_PROG_CC)],
   [AC_REQUIRE([AC_PROG_CC])],
   [$0 is obsolete; use AC_PROG_CC]
 )
diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index e8451fc78..3b1693040 100644
--- a/m4/strsignal.m4
+++ b/m4/strsignal.m4
@@ -54,6 +54,12 @@ AC_DEFUN([gl_FUNC_STRSIGNAL],
 # Prerequisites of lib/strsignal.c.
 AC_DEFUN([gl_PREREQ_STRSIGNAL], [
   AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_REQUIRE([AC_DECL_SYS_SIGLIST])
+  AC_REQUIRE([AC_CHECK_DECLS([sys_siglist],[],[],[#include <signal.h>
+/* NetBSD declares sys_siglist in unistd.h.  */
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+])
+])
   AC_CHECK_DECLS([_sys_siglist], [], [], [[#include <signal.h>]])
 ])

[Index of Archives]     [GCC Help]     [Kernel Discussion]     [RPM Discussion]     [Red Hat Development]     [Yosemite News]     [Linux USB]     [Samba]

  Powered by Linux