[SCM] GNU Autoconf source repository branch, master, updated. v2.63-85-g30249d9

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=30249d93c1b4255390286a4713a65eca7327c13e

The branch, master has been updated
       via  30249d93c1b4255390286a4713a65eca7327c13e (commit)
       via  5042ddd81f94e67d95813d5c68cbdbdbf2324e11 (commit)
      from  ca44a30bdd14b07a37515bcfaa5ed85cd3188360 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 30249d93c1b4255390286a4713a65eca7327c13e
Author: Paolo Bonzini <address@hidden>
Date:   Mon Oct 20 15:35:42 2008 +0200

    Use a shell function for _AC_LINK_IFELSE.
    
    * lib/autoconf/general.m4 (_AC_LINK_IFELSE_BODY): New macro.
    (_AC_LINK_IFELSE): Use a shell function.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 5042ddd81f94e67d95813d5c68cbdbdbf2324e11
Author: Eric Blake <address@hidden>
Date:   Wed Oct 22 10:50:26 2008 -0600

    Fix autoconf logging commands.
    
    * lib/autoconf/general.m4 (AC_MSG_RESULT_UNQUOTED, _AC_EVAL)
    (_AC_EVAL_STDERR, AC_RUN_LOG): Respect as_lineno.
    (_AC_DO_ECHO): Likewise, and use fewer dnl.
    (_AC_RUN_LOG_STDERR): Avoid subshell for logging.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   15 ++++++++++
 lib/autoconf/general.m4 |   70 +++++++++++++++++++++++++++++------------------
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f150c5f..bdc3244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-10-22  Paolo Bonzini  <address@hidden>
+       and Eric Blake  <address@hidden>
+
+       Use a shell function for _AC_LINK_IFELSE.
+       * lib/autoconf/general.m4 (_AC_LINK_IFELSE_BODY): New macro.
+       (_AC_LINK_IFELSE): Use a shell function.
+
+2008-10-22  Eric Blake  <address@hidden>
+
+       Fix autoconf logging commands.
+       * lib/autoconf/general.m4 (AC_MSG_RESULT_UNQUOTED, _AC_EVAL)
+       (_AC_EVAL_STDERR, AC_RUN_LOG): Respect as_lineno.
+       (_AC_DO_ECHO): Likewise, and use fewer dnl.
+       (_AC_RUN_LOG_STDERR): Avoid subshell for logging.
+
 2008-10-22  Eric Blake  <address@hidden>
 
        Fix testsuite failure.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 95734ec..04866c2 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2207,7 +2207,7 @@ AU_DEFUN([AC_CHECKING],
 # ----------------------------------
 # No escaping, so it performed also backtick substitution.
 AU_DEFUN([AC_MSG_RESULT_UNQUOTED],
-[_AS_ECHO_UNQUOTED([$as_me:$LINENO: result: $1], AS_MESSAGE_LOG_FD)
+[_AS_ECHO_UNQUOTED([$as_me:${as_lineno-$LINENO}: result: $1], 
AS_MESSAGE_LOG_FD)
 _AS_ECHO_UNQUOTED([$1])[]dnl
 ])
 
@@ -2245,7 +2245,7 @@ AC_DEFUN([_AC_RUN_LOG],
 # Note that when tracing, most shells will leave the traces in stderr
 # starting with "+": that's what this macro tries to address.
 AC_DEFUN([_AC_RUN_LOG_STDERR],
-[{ ($2) >&AS_MESSAGE_LOG_FD
+[{ { $2; } >&AS_MESSAGE_LOG_FD
   ($1) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
@@ -2259,7 +2259,7 @@ AC_DEFUN([_AC_RUN_LOG_STDERR],
 # Echo COMMAND.  This is designed to be used just before evaluating COMMAND.
 AC_DEFUN([_AC_DO_ECHO],
 [m4_if([$1], [$ac_try], [], [ac_try="$1"
-])dnl
+])]dnl
 dnl If the string contains '\"', '`', or '\\', then just echo it rather
 dnl than expanding it.  This is a hack, but it is safer, while also
 dnl typically expanding simple substrings like '$CC', which is what we want.
@@ -2273,11 +2273,11 @@ dnl `AC_CHECK_FUNC(foo, , AC_CHECK_LIB(a, foo, , 
AC_CHECK_LIB(b, foo)))'.
 dnl We normally wouldn't bother with this kind of workaround for invalid code
 dnl but this change was put in just before Autoconf 2.60 and we wanted to
 dnl minimize the integration hassle.
-[case "(($ac_try" in
+[[case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""]
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""]
 AS_ECHO(["$ac_try_echo"])])
 
 # _AC_DO(COMMAND)
@@ -2322,7 +2322,7 @@ AC_DEFUN([_AC_DO_TOKENS],
 # It is present only for backward compatibility with previous Autoconf 
versions.
 AC_DEFUN([_AC_EVAL],
 [_AC_RUN_LOG([eval $1],
-            [eval echo "$as_me:$LINENO: \"$1\""])])
+            [eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$1\""])])
 
 
 # _AC_EVAL_STDERR(COMMAND)
@@ -2332,7 +2332,7 @@ AC_DEFUN([_AC_EVAL],
 # It is present only for backward compatibility with previous Autoconf 
versions.
 AC_DEFUN([_AC_EVAL_STDERR],
 [_AC_RUN_LOG_STDERR([eval $1],
-                   [eval echo "$as_me:$LINENO: \"$1\""])])
+                   [eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$1\""])])
 
 
 # AC_TRY_EVAL(VARIABLE)
@@ -2368,7 +2368,7 @@ AC_DEFUN([AC_TRY_COMMAND],
 # -------------------
 AC_DEFUN([AC_RUN_LOG],
 [_AC_RUN_LOG([$1],
-            [AS_ECHO(["$as_me:$LINENO: AS_ESCAPE([$1])"])])])
+            [AS_ECHO(["$as_me:${as_lineno-$LINENO}: AS_ESCAPE([$1])"])])])
 
 
 
@@ -2524,6 +2524,33 @@ AU_DEFUN([AC_TRY_COMPILE],
 ## --------------------- ##
 
 
+# _AC_LINK_IFELSE_BODY
+# --------------------
+# Shell function body for _AC_LINK_IFELSE.
+m4_define([_AC_LINK_IFELSE_BODY],
+[  AS_LINENO_PUSH([$[]1])
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  AS_IF([_AC_DO_STDERR($ac_link) && {
+        test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        AS_TEST_X([conftest$ac_exeext])
+       }],
+      [ac_retval=0],
+      [_AC_MSG_LOG_CONFTEST
+       ac_retval=1])
+  # Delete also the IPA/IPO (Inter Procedural Analysis/Optimization)
+  # information created by the PGI compiler (conftest_ipa8_conftest.oo),
+  # as it would interfere with the next link command.
+  rm -rf conftest.dSYM
+  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  AS_LINENO_POP
+  return $ac_retval
+])# _AC_LINK_IFELSE_BODY
+
+
 # _AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
 # -------------------------------------------------------------
 # Try to link PROGRAM.
@@ -2535,25 +2562,14 @@ AU_DEFUN([AC_TRY_COMPILE],
 # reported by Chris Johns in
 # <http://lists.gnu.org/archive/html/autoconf/2007-03/msg00085.html>.
 #
-m4_define([_AC_LINK_IFELSE],
-[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
-rm -f conftest.$ac_objext conftest$ac_exeext
-AS_IF([_AC_DO_STDERR($ac_link) && {
-        test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        AS_TEST_X([conftest$ac_exeext])
-       }],
-      [$2],
-      [_AC_MSG_LOG_CONFTEST
-       $3])
-dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization)
-dnl information created by the PGI compiler (conftest_ipa8_conftest.oo),
-dnl as it would interfere with the next link command.
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl
+AC_DEFUN([_AC_LINK_IFELSE],
+[AC_REQUIRE_SHELL_FN([ac_func_]_AC_LANG_ABBREV[_try_link],
+  [AS_FUNCTION_DESCRIBE([ac_func_]_AC_LANG_ABBREV[_try_link], [LINENO],
+    [Try to link conftest.$ac_ext, and return whether this succeeded.])],
+  [$0_BODY])]dnl
+[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
+[AS_IF([ac_func_[]_AC_LANG_ABBREV[]_try_link "$LINENO"], [$2], [$3])
+m4_ifvaln([$1], [rm -f conftest.$ac_ext])dnl
 ])# _AC_LINK_IFELSE
 
 


hooks/post-receive
--
GNU Autoconf source repository