* acgeneral.m4 (_AC_INIT_PREPARE): Don't use a newline before

        accessing $? - newlines in "trap" reset $? to 0 on FreeBSD 4.0.

diff --git a/ChangeLog b/ChangeLog
index c3b4b51c012281deb7462dc931c987ff4cc98cac..a33b453893bd726b761f1e87a63b4a42eb1cd20b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-29  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (_AC_INIT_PREPARE): Don't use a newline before
+       accessing $? - newlines in "trap" reset $? to 0 on FreeBSD 4.0.
+
 2000-10-29  Jim Meyering  <meyering@lucent.com>
 
        * acgeneral.m4 (AC_MSG_WARN): Now that this macro expands to

diff --git a/acgeneral.m4 b/acgeneral.m4
index a780b49b9a2388a4f642ede441faa43c62059d95..64b7e1fd3be75483362bb4701e64eb832e188a00 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1931,8 +1931,7 @@ _AC_INIT_PREPARE_FDS
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.
-trap '
-  exit_status=$?
+trap 'exit_status=$?
   test "$ac_signal" != 0 &&
     echo "configure: caught signal $ac_signal" >&AC_FD_LOG
   echo "configure: exit $exit_status" >&AC_FD_LOG

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index a780b49b9a2388a4f642ede441faa43c62059d95..64b7e1fd3be75483362bb4701e64eb832e188a00 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1931,8 +1931,7 @@ _AC_INIT_PREPARE_FDS
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.
-trap '
-  exit_status=$?
+trap 'exit_status=$?
   test "$ac_signal" != 0 &&
     echo "configure: caught signal $ac_signal" >&AC_FD_LOG
   echo "configure: exit $exit_status" >&AC_FD_LOG