* acgeneral.m4 (_AC_EVAL): New.

(AC_TRY_EVAL, AC_TRY_COMMAND): Use it.

diff --git a/ChangeLog b/ChangeLog
index 6e3bdf9b553de13dd8c83b5e6e180630803903bc..bd950f10534b17883b24bd07658dbbf3b996e673 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-15  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_EVAL): New.
+       (AC_TRY_EVAL, AC_TRY_COMMAND): Use it.
+
 2000-12-15  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_PREPROC_IFELSE, AC_PREPROC_IFELSE): New.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 0cccd20c2dc1e39a0cce0b3d9bd8c21e5097c151..12146c9e3b46aa50e936debd8724c81bd6496746 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2238,19 +2238,28 @@ AU_ALIAS([AC_VERBOSE], [AC_MSG_RESULT])
 ## ---------------------------- ##
 
 
+# _AC_EVAL(COMMAND)
+# -----------------
+# Eval COMMAND, save the exit status in ac_status, and log it.
+AC_DEFUN([_AC_EVAL],
+[{ (eval echo "$as_me:__oline__: \"$1\"") >&AS_MESSAGE_LOG_FD
+   (eval $1) 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD; }])
+
+
 # AC_TRY_EVAL(VARIABLE)
 # ---------------------
 # The purpose of this macro is to "configure:123: command line"
 # written into config.log for every test run.
 AC_DEFUN([AC_TRY_EVAL],
-[{ (eval echo $as_me:__oline__: \"[$]$1\") >&AS_MESSAGE_LOG_FD; dnl
-(eval [$]$1) 2>&AS_MESSAGE_LOG_FD; }])
+[_AC_EVAL([$]$1) && (exit $ac_status) ])
 
 
 # AC_TRY_COMMAND(COMMAND)
 # -----------------------
 AC_DEFUN([AC_TRY_COMMAND],
-[{ ac_try='$1'; AC_TRY_EVAL(ac_try); }])
+[_AC_EVAL([$1]) && (exit $ac_status) ])
 
 
 ## ------------------ ##

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 0cccd20c2dc1e39a0cce0b3d9bd8c21e5097c151..12146c9e3b46aa50e936debd8724c81bd6496746 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2238,19 +2238,28 @@ AU_ALIAS([AC_VERBOSE], [AC_MSG_RESULT])
 ## ---------------------------- ##
 
 
+# _AC_EVAL(COMMAND)
+# -----------------
+# Eval COMMAND, save the exit status in ac_status, and log it.
+AC_DEFUN([_AC_EVAL],
+[{ (eval echo "$as_me:__oline__: \"$1\"") >&AS_MESSAGE_LOG_FD
+   (eval $1) 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD; }])
+
+
 # AC_TRY_EVAL(VARIABLE)
 # ---------------------
 # The purpose of this macro is to "configure:123: command line"
 # written into config.log for every test run.
 AC_DEFUN([AC_TRY_EVAL],
-[{ (eval echo $as_me:__oline__: \"[$]$1\") >&AS_MESSAGE_LOG_FD; dnl
-(eval [$]$1) 2>&AS_MESSAGE_LOG_FD; }])
+[_AC_EVAL([$]$1) && (exit $ac_status) ])
 
 
 # AC_TRY_COMMAND(COMMAND)
 # -----------------------
 AC_DEFUN([AC_TRY_COMMAND],
-[{ ac_try='$1'; AC_TRY_EVAL(ac_try); }])
+[_AC_EVAL([$1]) && (exit $ac_status) ])
 
 
 ## ------------------ ##