Output really nothing if AC_INIT was not given. Unconditional

output can be problematic with autoupdate.

* acgeneral.m4 (AC_INIT_NOTICE): Output ac_includes_default.
(Default includes section): No longer dump ac_includes_default in
AC_DIVERSION_INIT.

diff --git a/ChangeLog b/ChangeLog
index 7e6e54e9cdc263a6a2196d8e6cc8e999681ddb78..419124db44d6ff2a73312c461a258467d6f59b83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-08  Akim Demaille  <akim@epita.fr>
+
+       Output really nothing if AC_INIT was not given.  Unconditional
+       output can be problematic with autoupdate.
+
+       * acgeneral.m4 (AC_INIT_NOTICE): Output ac_includes_default.
+       (Default includes section): No longer dump ac_includes_default in
+       AC_DIVERSION_INIT.
+
 2000-02-08  Akim Demaille  <akim@epita.fr>
 
        * libm4.m4 (m4_namespace_define): Fix a bug: `m4_namespace'

diff --git a/acgeneral.m4 b/acgeneral.m4
index 1ceb10eeb9afb259bd8000321d07b12196394959..1a92edacc736b47fceeb4eb42d00197f130e2de5 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -479,6 +479,31 @@ ac_arg_with_help=
 ac_arg_enable_help=
 ac_arg_var_help=
 ac_default_prefix=/usr/local
+# Factorizing default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#include <sys/types.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
 @PND@ Any additions from configure.in:])
 
 
@@ -1802,12 +1827,14 @@ ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_f77_cross
 ])
 
+
 # AC_LANG_SAVE
 # ------------
 # Push the current language on a stack.
 define(AC_LANG_SAVE,
 [pushdef([AC_LANG_STACK], AC_LANG)])
 
+
 # AC_LANG_RESTORE
 # ---------------
 # Restore the current language from the stack.
@@ -1832,6 +1859,7 @@ AC_DEFUN(AC_TRY_EVAL,
 [{ (eval echo configure:__oline__: \"[$]$1\") 1>&AC_FD_CC; dnl
 (eval [$]$1) 2>&AC_FD_CC; }])
 
+
 # AC_TRY_COMMAND(COMMAND)
 # -----------------------
 AC_DEFUN(AC_TRY_COMMAND,
@@ -1839,9 +1867,9 @@ AC_DEFUN(AC_TRY_COMMAND,
 
 
 
-## ----------------- ##
-## Default headers.  ##
-## ----------------- ##
+## ------------------ ##
+## Default includes.  ##
+## ------------------ ##
 
 # Always use the same set of default headers for all the generic
 # macros.  It is easier to document, to extend, and to understand than
@@ -1854,35 +1882,7 @@ AC_DEFUN(AC_TRY_COMMAND,
 # Therefore, the following *is* buggy, but this is the kind of
 # tradeoff we accept in order to improve configure.
 
-AC_DIVERT_PUSH(AC_DIVERSION_INIT)dnl
-# Factorizing default headers for most tests.
-# Mandatory included if its is not used.
-ac_includes_default="\
-#include <stdio.h>
-#include <sys/types.h>
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-AC_DIVERT_POP()
-
+# See AC_INIT_NOTICE to see the value of the default includes.
 
 # AC_INCLUDES_DEFAULT([INCLUDES])
 # -------------------------------

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 1ceb10eeb9afb259bd8000321d07b12196394959..1a92edacc736b47fceeb4eb42d00197f130e2de5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -479,6 +479,31 @@ ac_arg_with_help=
 ac_arg_enable_help=
 ac_arg_var_help=
 ac_default_prefix=/usr/local
+# Factorizing default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#include <sys/types.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
 @PND@ Any additions from configure.in:])
 
 
@@ -1802,12 +1827,14 @@ ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_f77_cross
 ])
 
+
 # AC_LANG_SAVE
 # ------------
 # Push the current language on a stack.
 define(AC_LANG_SAVE,
 [pushdef([AC_LANG_STACK], AC_LANG)])
 
+
 # AC_LANG_RESTORE
 # ---------------
 # Restore the current language from the stack.
@@ -1832,6 +1859,7 @@ AC_DEFUN(AC_TRY_EVAL,
 [{ (eval echo configure:__oline__: \"[$]$1\") 1>&AC_FD_CC; dnl
 (eval [$]$1) 2>&AC_FD_CC; }])
 
+
 # AC_TRY_COMMAND(COMMAND)
 # -----------------------
 AC_DEFUN(AC_TRY_COMMAND,
@@ -1839,9 +1867,9 @@ AC_DEFUN(AC_TRY_COMMAND,
 
 
 
-## ----------------- ##
-## Default headers.  ##
-## ----------------- ##
+## ------------------ ##
+## Default includes.  ##
+## ------------------ ##
 
 # Always use the same set of default headers for all the generic
 # macros.  It is easier to document, to extend, and to understand than
@@ -1854,35 +1882,7 @@ AC_DEFUN(AC_TRY_COMMAND,
 # Therefore, the following *is* buggy, but this is the kind of
 # tradeoff we accept in order to improve configure.
 
-AC_DIVERT_PUSH(AC_DIVERSION_INIT)dnl
-# Factorizing default headers for most tests.
-# Mandatory included if its is not used.
-ac_includes_default="\
-#include <stdio.h>
-#include <sys/types.h>
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-AC_DIVERT_POP()
-
+# See AC_INIT_NOTICE to see the value of the default includes.
 
 # AC_INCLUDES_DEFAULT([INCLUDES])
 # -------------------------------