Create config.log after processing --help and --version.

diff --git a/ChangeLog b/ChangeLog
index ff1774ba693e4df5e3cbdcec437d240ae31bd34f..22c6f4a63701adee5fc455260053a046e09c4b06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-04  Lars J. Aas  <larsa@sim.no>
+
+       * acgeneral (_AC_INIT_CONFIG_LOG): New macro for setting up the
+       config.log file.
+       (_AC_INIT_DEFAULTS_FDS): Log to /dev/null instead of config.log.
+       (AC_INIT): Invoke _AC_INIT_CONFIG_LOG after _AC_INIT_VERSION.
+
 2001-04-04  Lars J. Aas  <larsa@sim.no>
 
        * acgeneral.m4 (_AC_INIT_DEFAULTS): Produce better version

diff --git a/acgeneral.m4 b/acgeneral.m4
index 649e89804b7f539ff87f0a16f9ca03764067f44d..4e8ccc17cd878e3eefe7cd83becc670ef74fca3b 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -704,7 +704,7 @@ m4_define([_AC_INIT_DEFAULTS_FDS],
 # 2 errors and warnings
 @%:@ AS_MESSAGE_LOG_FD compiler messages saved in config.log
 @%:@ AS_MESSAGE_FD checking for... messages and results
-exec AS_MESSAGE_LOG_FD>>config.log
+exec AS_MESSAGE_LOG_FD>>/dev/null
 exec AS_MESSAGE_FD>&1
 ])# _AC_INIT_DEFAULTS_FDS
 
@@ -723,27 +723,6 @@ AS_SHELL_SANITIZE
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-cat >config.log <<EOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by m4_ifset([AC_PACKAGE_NAME],
-                           [AC_PACKAGE_NAME ])dnl
-$as_me[]m4_ifset([AC_PACKAGE_VERSION],
-                 [ AC_PACKAGE_VERSION]), which was
-generated by GNU Autoconf AC_ACVERSION.  Invocation command line was
-
-  $ $[0] $[@]
-
-EOF
-AS_UNAME >>config.log
-
-cat >>config.log <<EOF
-## ------------ ##
-## Core tests.  ##
-## ------------ ##
-
-EOF
 
 _AC_INIT_DEFAULTS_FDS
 #
@@ -1381,6 +1360,35 @@ fi])dnl
 ])# _AC_INIT_VERSION
 
 
+# _AC_INIT_CONFIG_LOG
+# -------------------
+# Initialize the config.log file descriptor and write header to it.
+m4_define([_AC_INIT_CONFIG_LOG],
+[m4_divert_text([INIT_PREPARE],
+[exec AS_MESSAGE_LOG_FD>>config.log
+cat >config.log <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by m4_ifset([AC_PACKAGE_NAME],
+                           [AC_PACKAGE_NAME ])dnl
+$as_me[]m4_ifset([AC_PACKAGE_VERSION],
+                 [ AC_PACKAGE_VERSION]), which was
+generated by GNU Autoconf AC_ACVERSION.  Invocation command line was
+
+  $ $[0] $[@]
+
+EOF
+AS_UNAME >>config.log
+
+cat >>config.log <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+])])# _AC_INIT_CONFIG_LOG
+
 # _AC_INIT_PREPARE_FS_SEPARATORS
 # ------------------------------
 # Compute the directory and path separators.
@@ -1540,6 +1548,7 @@ _AC_INIT_PARSE_ARGS
 _AC_INIT_SRCDIR
 _AC_INIT_HELP
 _AC_INIT_VERSION
+_AC_INIT_CONFIG_LOG
 _AC_INIT_PREPARE
 dnl _AC_INIT_COPYRIGHT must be called after _AC_INIT_VERSION, since
 dnl it dumps into a diversion prepared by _AC_INIT_VERSION.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 649e89804b7f539ff87f0a16f9ca03764067f44d..4e8ccc17cd878e3eefe7cd83becc670ef74fca3b 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -704,7 +704,7 @@ m4_define([_AC_INIT_DEFAULTS_FDS],
 # 2 errors and warnings
 @%:@ AS_MESSAGE_LOG_FD compiler messages saved in config.log
 @%:@ AS_MESSAGE_FD checking for... messages and results
-exec AS_MESSAGE_LOG_FD>>config.log
+exec AS_MESSAGE_LOG_FD>>/dev/null
 exec AS_MESSAGE_FD>&1
 ])# _AC_INIT_DEFAULTS_FDS
 
@@ -723,27 +723,6 @@ AS_SHELL_SANITIZE
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-cat >config.log <<EOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by m4_ifset([AC_PACKAGE_NAME],
-                           [AC_PACKAGE_NAME ])dnl
-$as_me[]m4_ifset([AC_PACKAGE_VERSION],
-                 [ AC_PACKAGE_VERSION]), which was
-generated by GNU Autoconf AC_ACVERSION.  Invocation command line was
-
-  $ $[0] $[@]
-
-EOF
-AS_UNAME >>config.log
-
-cat >>config.log <<EOF
-## ------------ ##
-## Core tests.  ##
-## ------------ ##
-
-EOF
 
 _AC_INIT_DEFAULTS_FDS
 #
@@ -1381,6 +1360,35 @@ fi])dnl
 ])# _AC_INIT_VERSION
 
 
+# _AC_INIT_CONFIG_LOG
+# -------------------
+# Initialize the config.log file descriptor and write header to it.
+m4_define([_AC_INIT_CONFIG_LOG],
+[m4_divert_text([INIT_PREPARE],
+[exec AS_MESSAGE_LOG_FD>>config.log
+cat >config.log <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by m4_ifset([AC_PACKAGE_NAME],
+                           [AC_PACKAGE_NAME ])dnl
+$as_me[]m4_ifset([AC_PACKAGE_VERSION],
+                 [ AC_PACKAGE_VERSION]), which was
+generated by GNU Autoconf AC_ACVERSION.  Invocation command line was
+
+  $ $[0] $[@]
+
+EOF
+AS_UNAME >>config.log
+
+cat >>config.log <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
+])])# _AC_INIT_CONFIG_LOG
+
 # _AC_INIT_PREPARE_FS_SEPARATORS
 # ------------------------------
 # Compute the directory and path separators.
@@ -1540,6 +1548,7 @@ _AC_INIT_PARSE_ARGS
 _AC_INIT_SRCDIR
 _AC_INIT_HELP
 _AC_INIT_VERSION
+_AC_INIT_CONFIG_LOG
 _AC_INIT_PREPARE
 dnl _AC_INIT_COPYRIGHT must be called after _AC_INIT_VERSION, since
 dnl it dumps into a diversion prepared by _AC_INIT_VERSION.