diff options
author | Jim Meyering <meyering@redhat.com> | 2011-11-13 21:17:31 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-11-13 21:18:36 +0100 |
commit | e34092a7d59dd2b452ad27b172c37966f7e16cc2 (patch) | |
tree | 6b725dd9391442dad808940a3393289721b130ca | |
parent | f09c9629813a71310b70ed401051ae533a69763c (diff) | |
download | grep-e34092a7d59dd2b452ad27b172c37966f7e16cc2.tar.gz |
maint: update bootstrap and init.sh from gnulib
* tests/init.sh: Update from gnulib.
* bootstrap: Likewise.
-rwxr-xr-x | bootstrap | 17 | ||||
-rw-r--r-- | tests/init.sh | 4 |
2 files changed, 5 insertions, 16 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-06-22.06; # UTC +scriptversion=2011-08-11.17; # UTC # Bootstrap this package from checked-out sources. @@ -800,20 +800,7 @@ slurp() { echo "$me: $dir/$file overrides $1/$dir/$file" else copied=$copied$sep$file; sep=$nl - if test $file = gettext.m4; then - echo "$me: patching m4/gettext.m4 to remove need for intl/* ..." - rm -f $dir/$file - sed ' - /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\ - AC_DEFUN([AM_INTL_SUBDIR], []) - /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\ - AC_DEFUN([gt_INTL_SUBDIR_CORE], []) - $a\ - AC_DEFUN([gl_LOCK_EARLY], []) - ' $1/$dir/$file >$dir/$file - else - cp_mark_as_generated $1/$dir/$file $dir/$file - fi + cp_mark_as_generated $1/$dir/$file $dir/$file fi || exit done diff --git a/tests/init.sh b/tests/init.sh index 460937de..373d9d4f 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -221,8 +221,10 @@ export MALLOC_PERTURB_ # a partition, or to undo any other global state changes. cleanup_ () { :; } -if ( diff --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then +if ( diff -u "$0" "$0" < /dev/null ) > /dev/null 2>&1; then compare () { diff -u "$@"; } +elif ( diff -c "$0" "$0" < /dev/null ) > /dev/null 2>&1; then + compare () { diff -c "$@"; } elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then compare () { cmp -s "$@"; } else |