[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-103
From: |
Eric Blake |
Subject: |
[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-103-g7d77c79 |
Date: |
Thu, 26 Feb 2009 21:29:37 +0000 |
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=7d77c79ea2e7a98834ee3113c8485feae43f4acf
The branch, branch-1.6 has been updated
via 7d77c79ea2e7a98834ee3113c8485feae43f4acf (commit)
via 7d9e93668603b72f6c61c6c3ce4f4bf388dc76a4 (commit)
from d7aec39c918085b5d9ad90fd5f02b55492ff6f15 (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 7d77c79ea2e7a98834ee3113c8485feae43f4acf
Author: Eric Blake <address@hidden>
Date: Thu Feb 26 14:27:34 2009 -0700
Make bootstrap easier on Solaris.
* bootstrap: Add GNULIB_SRCDIR. Useful when a wrapper script
gnulib-tool exists earlier on the path to work around /bin/sh
failure in parsing $GNULIB_SRCDIR/gnulib-tool.
Signed-off-by: Eric Blake <address@hidden>
(cherry picked from commit 90a0154d6ef1effe64c199eb61a06430199aaa91)
commit 7d9e93668603b72f6c61c6c3ce4f4bf388dc76a4
Author: Eric Blake <address@hidden>
Date: Thu Feb 26 14:24:29 2009 -0700
Fix distcheck.
* doc/m4.texinfo (Using frozen files): Clean up in.m4f.
Reported by Ralf Wildenhues.
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++++++
bootstrap | 24 ++++++++++++++----------
doc/m4.texinfo | 16 ++++++++++------
3 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3e58472..375eaa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-02-26 Eric Blake <address@hidden>
+
+ Make bootstrap easier on Solaris.
+ * bootstrap: Add GNULIB_SRCDIR. Useful when a wrapper script
+ gnulib-tool exists earlier on the path to work around /bin/sh
+ failure in parsing $GNULIB_SRCDIR/gnulib-tool.
+
+ Fix distcheck.
+ * doc/m4.texinfo (Using frozen files): Clean up in.m4f.
+ Reported by Ralf Wildenhues.
+
2009-02-19 Eric Blake <address@hidden>
Speed up translit when from argument is short.
diff --git a/bootstrap b/bootstrap
index 3b7b926..80f6a53 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,10 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2008-09-16
+# bootstrap (GNU M4) version 2009-02-26
# Written by Gary V. Vaughan <address@hidden>
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
# This file is part of GNU M4.
#
@@ -28,7 +29,7 @@
# You can also set the following variables to help $progname
# locate the right tools:
-# AUTORECONF, GNULIB_TOOL, M4, RM, SED
+# AUTORECONF, GNULIB_SRCDIR, GNULIB_TOOL, M4, RM, SED
# This script bootstraps a git or CVS checkout of GNU M4 by correctly
# calling out to parts of the GNU Build Platform. Currently this
@@ -253,14 +254,17 @@ fi
## Find the gnulib module tree. ##
## ---------------------------- ##
-case $GNULIB_TOOL in
+if test -n "$GNULIB_SRCDIR" && test -d "$GNULIB_SRCDIR" ; then
+ gnulibdir=$GNULIB_SRCDIR
+else
+ case $GNULIB_TOOL in
/* ) gnulibdir=$GNULIB_TOOL ;; # absolute
*/* ) gnulibdir=`pwd`/$GNULIB_TOOL ;; # relative
* ) gnulibdir=`which "$GNULIB_TOOL"` ;; # PATH search
-esac
+ esac
-# Follow symlinks
-while test -h "$gnulibdir"; do
+ # Follow symlinks
+ while test -h "$gnulibdir"; do
# Resolve symbolic link.
sedexpr1='s, -> ,#%%#,'
@@ -273,9 +277,9 @@ while test -h "$gnulibdir"; do
* ) gnulibdir=`echo "$gnulibdir" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
esac
-done
-
-gnulibdir=`echo "$gnulibdir" | $SED "$dirname"`
+ done
+ gnulibdir=`echo "$gnulibdir" | $SED "$dirname"`
+fi
## ---------------------- ##
## Import Gnulib modules. ##
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 6b0620c..47549e8 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -7926,10 +7926,11 @@ changequote(`[', `]')dnl
syscmd([echo 'changequote([,])pushdef([divnum],[hi])dnl' \
| ]__program__[ -F in.m4f \
&& echo 'divnum popdef([divnum])divnum' \
- | ]__program__[ -R in.m4f \
- && rm in.m4f])status sysval
+ | ]__program__[ -R in.m4f])status sysval
@result{}hi 0
@result{}status 0
+syscmd([rm -f in.m4f])sysval
address@hidden
@end example
@c Detect inability to freeze.
@@ -7955,10 +7956,12 @@ changequote(`[', `]')dnl
syscmd([printf 'define(-\0-,\0-\0)changequote([,\0])changecom(--\0)dnl
divert(1)undivert(null.out)' | ]__program__[ -F in.m4f \
&& printf 'errprint([divnum\0] #-- len(indir(-\0-)))' \
- | ]__program__[ -R in.m4f \
- && rm in.m4f])errprint([ ]sysval[
+ | ]__program__[ -R in.m4f])errprint([ ]sysval[
])dnl
@error{}divnum #-- 3 0
+syscmd([rm -f in.m4f])errprint(sysval[
+])dnl
address@hidden
@end example
@c Do we reject unexpected NUL bytes?
@@ -7969,10 +7972,11 @@ ifdef(`__unix__', ,
')m4exit(`77')')dnl
changequote(`[', `]')dnl
syscmd([printf '#bogus\nV1\nF3,4\nlenlen\0\n' > in.m4f \
- && ]__program__[ -R in.m4f \
- && rm in.m4f])sysval
+ && ]__program__[ -R in.m4f])sysval
@error{}m4:in.m4f:4: ill-formed frozen file, invalid builtin `len\0'
encountered
@result{}1
+syscmd([rm -f in.m4f])sysval
address@hidden
@end example
@end ignore
hooks/post-receive
--
GNU M4 source repository
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-103-g7d77c79,
Eric Blake <=