[SCM] GNU M4 source repository branch, branch-1_4, updated. v1.4.10b-9-gc702fdb

[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 M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=c702fdb4cb9ed26f3d75dc46240bfecdb9d6c1bd

The branch, branch-1_4 has been updated
       via  c702fdb4cb9ed26f3d75dc46240bfecdb9d6c1bd (commit)
       via  fa7ece650ed440b3c36bd25d971bfdc6e9fc7153 (commit)
      from  ff87075d2c0465d5426c8004680b033f13ad893e (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 c702fdb4cb9ed26f3d75dc46240bfecdb9d6c1bd
Author: Eric Blake <address@hidden>
Date:   Mon Mar 10 07:14:05 2008 -0600

    Allow 'make installcheck' with './configure --program-prefix'.
    
    * checks/Makefile.in (program_transform_name): New macro.
    (installcheck): Use it to transform name of m4 before testing.
    * checks/check-them (m4): Add -m option, to allow testing m4 by a
    different name.
    
    Signed-off-by: Eric Blake <address@hidden>

commit fa7ece650ed440b3c36bd25d971bfdc6e9fc7153
Author: Eric Blake <address@hidden>
Date:   Mon Mar 10 06:45:58 2008 -0600

    More maintainer fixes.
    
    * GNUmakefile (_created_version_file): Delete, now that VPATH
    builds include GNUmakefile.
    * configure.ac (AC_INIT): Base version on .tarball-version, not
    .version.
    Reported by Ralf Wildenhues, fix by Jim Meyering in coreutils.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog          |   17 +++++++++++++++--
 GNUmakefile        |    9 ---------
 checks/Makefile.in |    4 +++-
 checks/check-them  |   39 ++++++++++++++++++++++-----------------
 configure.ac       |    2 +-
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa9745a..0888256 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-03-10  Eric Blake  <address@hidden>
+
+       Allow 'make installcheck' with './configure --program-prefix'.
+       * checks/Makefile.in (program_transform_name): New macro.
+       (installcheck): Use it to transform name of m4 before testing.
+       * checks/check-them (m4): Add -m option, to allow testing m4 by a
+       different name.
+
+       More maintainer fixes.
+       * GNUmakefile (_created_version_file): Delete, now that VPATH
+       builds include GNUmakefile.
+       * configure.ac (AC_INIT): Base version on .tarball-version, not
+       .version.
+       Reported by Ralf Wildenhues, fix by Jim Meyering in coreutils.
+
 2008-03-06  Eric Blake  <address@hidden>
 
        Fix nested builtin(`shift',$@) regression from 2008-02-22.
@@ -4861,8 +4876,6 @@ Mon Jan 22 21:08:52 1990  Rene' Seindal (seindal at 
diku.dk)
 
        -----
 
-       $Revision$ $Date$
-
        Local Variables:
        coding: utf-8
        End:
diff --git a/GNUmakefile b/GNUmakefile
index 1477e08..ac70f63 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -56,19 +56,10 @@ ifeq (0,$(MAKELEVEL))
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))
       _dummy := $(shell (cd $(srcdir) && rm -rf autom4te.cache && autoreconf))
-      _created_version_file = 1
     endif
   endif
 endif
 
-ifneq ($(_curr-ver),$(VERSION))
-  _dummy := $(shell echo $(_curr-ver) > .version)
-endif
-
-ifneq ($(_created_version_file),1)
-  _dummy := $(shell test -f .version || echo $(VERSION) > .version)
-endif
-
 include $(srcdir)/Makefile.cfg
 include $(srcdir)/Makefile.maint
 
diff --git a/checks/Makefile.in b/checks/Makefile.in
index d06da72..0e1091e 100644
--- a/checks/Makefile.in
+++ b/checks/Makefile.in
@@ -30,6 +30,7 @@ prefix = @prefix@
 srcdir = @srcdir@
 VPATH = @srcdir@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+program_transform_name = @program_transform_name@
 
 # Should be GNU awk, for the get-them script.
 AWK = @AWK@
@@ -59,7 +60,8 @@ check: $(srcdir)/stamp-checks
 
 installcheck: $(srcdir)/stamp-checks
        PATH='$(bindir)'"$(PATH_SEPARATOR)"$$PATH; export PATH; \
-       $(srcdir)/check-them -I $(srcdir)/../examples $(CHECKS)
+       $(srcdir)/check-them -I $(srcdir)/../examples \
+       -m "`echo m4 | sed '$(program_transform_name)'`" $(CHECKS)
 
 tags:
 
diff --git a/checks/check-them b/checks/check-them
index 9fca39b..0a697f5 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -2,9 +2,6 @@
 # Check GNU m4 against examples from the manual source.
 # Copyright (C) 1992, 2006, 2007, 2008 Free Software Foundation, Inc.
 
-# Sanity check what we are testing
-m4 --version
-
 # Clean up temp files on exit
 pwd=`pwd`
 tmp=m4-tmp.$$
@@ -29,13 +26,27 @@ skipped=
 strip_needed=false
 diffopts=-c
 
+# Find out where the examples live.
+examples=.
+if test "x$1" = x-I ; then
+  examples="$2"
+  shift; shift
+fi
+
+# Find out how to run m4.
+m4=m4
+if test "x$1" = x-m ; then
+  m4="$2"
+  shift; shift
+fi
+
 # Find out how the executable prints argv[0]
-m4=`m4 --help | sed -e 's/Usage: \(.*\) \[OPTION.*/\1/' \
-    -e 's/\\\\/\\\\\\\\/g' -e 1q`
+m4name=`"$m4" --help | sed -e 's/Usage: \(.*\) \[OPTION.*/\1/' \
+  -e 's/\\\\/\\\\\\\\/g' -e 1q`
 
 # Find out if we should strip \r in the output
-m4 --version > $out
-m4 --version | tr -d '\015' > $xout
+"$m4" --version | tee $out
+"$m4" --version | tr -d '\015' > $xout
 if cmp -s $out $xout; then
   :
 else
@@ -43,13 +54,6 @@ else
   strip_needed=:
 fi
 
-# Find out where the examples live.
-examples=.
-if test "x$1" = x-I ; then
-  examples="$2"
-  shift; shift
-fi
-
 # Find out if diff supports useful options.
 if diff -u /dev/null /dev/null 2>/dev/null ; then
   diffopts="-u"
@@ -68,7 +72,7 @@ do
   echo "Checking $file"
   options=`sed -ne '3s/^dnl @ extra options: //p;3q' "$file"`
   sed -e '/^dnl @/d' -e '/^\^D$/q' "$file" \
-    | LC_MESSAGES=C M4PATH=$examples m4 -d $options - >$out 2>$err
+    | LC_MESSAGES=C M4PATH=$examples "$m4" -d $options - >$out 2>$err
   stat=$?
 
   xstat=`sed -ne '2s/^dnl @ expected status: //p;2q' "$file"`
@@ -96,10 +100,11 @@ do
 
   xerrfile=`sed -n 's/^dnl @ expected error: //p' "$file"`
   if test -z "$xerrfile" ; then
-    sed '/^dnl @error{}/!d; s///; '"s|^m4:|$m4:|; s|\.\./examples|$examples|" \
+    sed '/^dnl @error{}/!d
+         s///; '"s|^m4:|$m4name:|; s|\.\./examples|$examples|" \
       "$file" > $xerr
   else
-    sed "s|^m4:|$m4:|; s|\.\./examples|$examples|" \
+    sed "s|^m4:|$m4name:|; s|\.\./examples|$examples|" \
       "$examples/$xerrfile" > $xerr
   fi
 
diff --git a/configure.ac b/configure.ac
index a8d9200..aa1f32e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.60])
-AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .version]),
+AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]),
   address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 


hooks/post-receive
--
GNU M4 source repository