* lib/autoconf/general.m4 (_AC_INIT_PREPARE): Remove the leading

newline from the `trap' code to finish `config.log'; the NetBSD
/bin/sh resets the exit status after an empty command, as
documented in doc/autoconf.texi.

diff --git a/ChangeLog b/ChangeLog
index 77df2c82aa35e961e9a60e447a7a2a1e22197cc4..67db276610b79fe3ac45ff6be7e377269054cf08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PREPARE): Remove the leading
+       newline from the `trap' code to finish `config.log'; the NetBSD
+       /bin/sh resets the exit status after an empty command, as
+       documented in doc/autoconf.texi.
+       Reported by Dalibor Topic <robilad@kaffe.org>.
+
 2006-04-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/autoconf.texi (C Compiler): Clarify AC_C_TYPEOF.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 890af0baaa53fc96fb02f8c3598319eb5682f275..5158ab52db75ee33bbf000f85dd36da8e810f09b 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1200,8 +1200,8 @@ AS_UNSET(ac_configure_args1)
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
 # WARNING: Use '\'' to represent an apostrophe within the trap.
-trap '
-  exit_status=$?
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo