[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: ac-init-default-fds.patch
From: |
Akim Demaille |
Subject: |
FYI: ac-init-default-fds.patch |
Date: |
03 Nov 2000 11:02:26 +0100 |
User-agent: |
Gnus/5.0807 (Gnus v5.8.7) XEmacs/21.1 (Channel Islands) |
now that AC_MSG_* uses config.log, we have to set it up earlier.
This weekend I will move AC_MSG_* and the log facility into M4sh.
This is why I don't fix the same problem in config.status for the time
being: it would be duplicate work with importing this into M4sh.
Index: ChangeLog
from Akim Demaille <address@hidden>
Set up config.log earlier so that AC_MSG_ERROR and AC_MSG_WARN can
be used early.
* acgeneral.m4 (_AC_INIT_DEFAULTS): Call `_AC_INIT_PREPARE_FDS'.
(_AC_INIT_PREPARE): Don't.
(_AC_INIT_PREPARE_ENVIRONMENT, _AC_INIT_PREPARE_FDS): Rename as...
(_AC_INIT_DEFAULTS_ENVIRONMENT, _AC_INIT_DEFAULTS_FDS): these,
since they are called from `_AC_INIT_DEFAULTS', not
`_AC_INIT_PREPARE'.
(_AC_INIT_DEFAULTS_FDS): Dump `$@' in config.log, not
`$ac_configure_args' which is not computed yet.
2000-11-03 Akim Demaille <address@hidden>
Index: acgeneral.m4
===================================================================
RCS file: /cvs/autoconf/acgeneral.m4,v
retrieving revision 1.611
diff -u -u -r1.611 acgeneral.m4
--- acgeneral.m4 2000/11/03 09:43:33 1.611
+++ acgeneral.m4 2000/11/03 09:58:34
@@ -740,10 +740,10 @@
])
-# _AC_INIT_PREPARE_ENVIRONMENT
-# ----------------------------
+# _AC_INIT_DEFAULTS_ENVIRONMENT
+# -----------------------------
# Tune the behavior of the shell.
-define([_AC_INIT_PREPARE_ENVIRONMENT],
+define([_AC_INIT_DEFAULTS_ENVIRONMENT],
[# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
@@ -772,7 +772,60 @@
# CDPATH.
AS_UNSET([CDPATH], [:])
-])
+])# _AC_INIT_DEFAULTS_ENVIRONMENT
+
+
+# _AC_INIT_DEFAULTS_FDS
+# ---------------------
+# Set up the file descriptors used by `configure'.
+
+define([AC_FD_MSG], 6)
+define([AC_FD_LOG], 5)
+# That's how it used to be named.
+AU_ALIAS([AC_FD_CC], [AC_FD_LOG])
+
+define([_AC_INIT_DEFAULTS_FDS],
+[# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
address@hidden:@ AC_FD_MSG checking for... messages and results
address@hidden:@ AC_FD_LOG compiler messages saved in config.log
+if test "$silent" = yes; then
+ exec AC_FD_MSG>/dev/null
+else
+ exec AC_FD_MSG>&1
+fi
+exec AC_FD_LOG>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by configure ifset([AC_PACKAGE_STRING],
+ [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
+ > $[0] address@hidden
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+" >&AC_FD_LOG
+])# _AC_INIT_DEFAULTS_FDS
# _AC_INIT_DEFAULTS
@@ -780,8 +833,10 @@
# Values which defaults can be set from `configure.in'.
define([_AC_INIT_DEFAULTS],
[m4_divert_push([DEFAULTS])dnl
-_AC_INIT_PREPARE_ENVIRONMENT
+_AC_INIT_DEFAULTS_ENVIRONMENT
+_AC_INIT_DEFAULTS_FDS
+
#
# Initializations.
#
@@ -1440,59 +1495,6 @@
])# _AC_INIT_VERSION
-# _AC_INIT_PREPARE_FDS
-# --------------------
-# Set up the file descriptors used by `configure'.
-
-define([AC_FD_MSG], 6)
-define([AC_FD_LOG], 5)
-# That's how it used to be named.
-AU_ALIAS([AC_FD_CC], [AC_FD_LOG])
-
-define([_AC_INIT_PREPARE_FDS],
-[# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
address@hidden:@ AC_FD_MSG checking for... messages and results
address@hidden:@ AC_FD_LOG compiler messages saved in config.log
-if test "$silent" = yes; then
- exec AC_FD_MSG>/dev/null
-else
- exec AC_FD_MSG>&1
-fi
-exec AC_FD_LOG>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure ifset([AC_PACKAGE_STRING],
- [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
- > $[0] $ac_configure_args
-
-on $ac_hostname:
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-" >&AC_FD_LOG
-])# _AC_INIT_PREPARE_FDS
-
-
# _AC_INIT_PREPARE
# ----------------
# Called by AC_INIT to build the preamble of the `configure' scripts.
@@ -1528,8 +1530,6 @@
# Get rid of the leading space.
done
-_AC_INIT_PREPARE_FDS
-
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log.
trap 'exit_status=$?
@@ -3938,7 +3938,7 @@
# Compiler output produced by configure, useful for debugging
# configure, is in ./config.log if it exists.
-_AC_INIT_PREPARE_ENVIRONMENT
+_AC_INIT_DEFAULTS_ENVIRONMENT
debug=false
me=`echo "$[0]" | sed 's,.*/,,'`
SHELL=${CONFIG_SHELL-/bin/sh}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: ac-init-default-fds.patch,
Akim Demaille <=