[SCM] GNU Autoconf source repository branch, master, updated. v2.61a-265-gfeef9e7

[Ralf Wildenhues]

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=feef9e7e7e1c9380ca04fb119b9ff2ed8bfb4ee3

The branch, master has been updated
       via  feef9e7e7e1c9380ca04fb119b9ff2ed8bfb4ee3 (commit)
       via  83bd220b0c0b1deb03aaf87bff5332205facb715 (commit)
      from  dc6058abe0ba3b07cc5f524dc4d95064b4eb12cf (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 feef9e7e7e1c9380ca04fb119b9ff2ed8bfb4ee3
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Nov 9 07:51:19 2007 +0100

    New config files output variable `top_build_prefix'.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Substitute
    `top_build_prefix'.
    * doc/autoconf.texi (Preset Output Variables): Document it.
    * NEWS: Update.
    Report by Bob Friesenhahn.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 83bd220b0c0b1deb03aaf87bff5332205facb715
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Nov 9 07:49:29 2007 +0100

    Avoid expr for arithmetic evaluation if the shell accepts $((...)).
    
    * lib/autotest/general.m4 (AT_INIT) <at_func_arith>: New
    function, to parametrize arithmetic with expr vs. the shell.
    Use it where possible.
    Suggestion by Benoit Sigoure.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog               |   15 +++++++++++++++
 NEWS                    |    2 ++
 doc/autoconf.texi       |   10 ++++++++++
 lib/autoconf/status.m4  |    1 +
 lib/autotest/general.m4 |   45 ++++++++++++++++++++++++++++++++++++---------
 5 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7646e64..9e6cb21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-09  Ralf Wildenhues  <address@hidden>
+
+       New config files output variable `top_build_prefix'.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Substitute
+       `top_build_prefix'.
+       * doc/autoconf.texi (Preset Output Variables): Document it.
+       * NEWS: Update.
+       Report by Bob Friesenhahn.
+
+       Avoid expr for arithmetic evaluation if the shell accepts $((...)).
+       * lib/autotest/general.m4 (AT_INIT) <at_func_arith>: New
+       function, to parametrize arithmetic with expr vs. the shell.
+       Use it where possible.
+       Suggestion by Benoit Sigoure.
+
 2007-11-03  Benoit Sigoure  <address@hidden>
 
        Adjust the documentation of autotest WRT atlocal.
diff --git a/NEWS b/NEWS
index 77cd6f5..854c54a 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ GNU Autoconf NEWS - User visible changes.
      Further, for config headers, the total size of values is not limited by
      the POSIX length limit of text lines any more, only each single line.
 
+** New config variable `top_build_prefix'.
+
 ** Autoconf is now licensed under the General Public License version 3
    or later (GPLv3+).  As with earlier versions, the license includes
    an exception clause so that you may release a configure script
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 9025359..421056e 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2436,6 +2436,16 @@ The relative name of the top level of the current build 
tree.  In the
 top-level directory, this is the same as @code{builddir}.
 @end defvar
 
address@hidden top_build_prefix
address@hidden top_build_prefix
+The relative name of the top level of the current build tree with final
+slash if nonemtpy.  This is the same as @code{top_builddir}, except that
+it contains of zero of more runs of @code{../}, so it should not be
+appended with a slash for concatenation.  This helps for @command{make}
+implementations that otherwise do not treat @file{./file} and @file{file}
+as equal in the toplevel build directory.
address@hidden defvar
+
 @defvar abs_top_builddir
 @ovindex abs_top_builddir
 Absolute name of @code{top_builddir}.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 350d370..4412df0 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -622,6 +622,7 @@ dnl configure_input is a somewhat special, so we don't call 
AC_SUBST_TRACE.
 s&@configure_input@&$configure_input&;t t
 dnl During the transition period, this is a special case:
 s&@top_builddir@&$ac_top_builddir_sub&;t t[]AC_SUBST_TRACE([top_builddir])
+s&@top_build_prefix@&$ac_top_build_prefix&;t 
t[]AC_SUBST_TRACE([top_build_prefix])
 m4_foreach([_AC_Var], [srcdir, abs_srcdir, top_srcdir, abs_top_srcdir,
                        builddir, abs_builddir,
                        abs_top_builddir]AC_PROVIDE_IFELSE([AC_PROG_INSTALL], 
[[, INSTALL]])AC_PROVIDE_IFELSE([AC_PROG_MKDIR_P], [[, MKDIR_P]]),
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 29834f1..4d92e6d 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -337,6 +337,24 @@ at_func_create_debugging_script ()
   chmod +x $at_group_dir/run
 }
 
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+  [#] With "address@hidden", bash does not split positional parameters:
+  eval 'at_func_arith ()
+  {
+    at_func_arith_result=$(( $[*] ))
+  }'
+else
+  at_func_arith ()
+  {
+    at_func_arith_result=`expr "address@hidden"`
+  }
+fi
+
 ## ---------------------- ##
 ## End of shell functions ##
 ## ---------------------- ##
@@ -905,7 +923,8 @@ do
 _ATEOF
     AS_ECHO(["$at_setup_line"]) >"$at_check_line_file"
   fi
-  at_group_count=`expr 1 + $at_group_count`
+  at_func_arith 1 + $at_group_count
+  at_group_count=$at_func_arith_result
   $at_verbose AS_ECHO_N(["$at_group. $at_setup_line: "])
   AS_ECHO_N(["$at_group. $at_setup_line: "]) >> "$at_group_log"
   case $at_xfail:$at_status in
@@ -982,11 +1001,16 @@ at_stop_time=`date +%s 2>/dev/null`
 AS_ECHO(["$as_me: ending at: $at_stop_date"]) >&AS_MESSAGE_LOG_FD
 case $at_start_time,$at_stop_time in
   [[0-9]*,[0-9]*])
-    at_duration_s=`expr $at_stop_time - $at_start_time`
-    at_duration_m=`expr $at_duration_s / 60`
-    at_duration_h=`expr $at_duration_m / 60`
-    at_duration_s=`expr $at_duration_s % 60`
-    at_duration_m=`expr $at_duration_m % 60`
+    at_func_arith $at_stop_time - $at_start_time
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_s / 60
+    at_duration_m=$at_func_arith_result
+    at_func_arith $at_duration_m / 60
+    at_duration_h=$at_func_arith_result
+    at_func_arith $at_duration_s % 60
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_m % 60
+    at_duration_m=$at_func_arith_result
     at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
     AS_ECHO(["$as_me: test suite duration: $at_duration"]) >&AS_MESSAGE_LOG_FD
     ;;
@@ -998,9 +1022,12 @@ set X $at_fail_list; shift; address@hidden:@]
 set X $at_xpass_list; shift; address@hidden:@]
 set X $at_xfail_list; shift; address@hidden:@]
 
-at_run_count=`expr $at_group_count - $at_skip_count`
-at_unexpected_count=`expr $at_xpass_count + $at_fail_count`
-at_total_fail_count=`expr $at_xfail_count + $at_fail_count`
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
 
 echo
 AS_BOX([Test results.])


hooks/post-receive
--
GNU Autoconf source repository