diff options
author | Jim Meyering <meyering@redhat.com> | 2012-02-18 14:29:41 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-02-18 15:48:44 +0100 |
commit | 4fd8e74e4d3fe136fe0c4db83d5d249500e54744 (patch) | |
tree | 0272f5b640e837ba28f71ccee3f0e3fdeeba9bd5 | |
parent | 763c1cf287d2b264eb5c988e52ffd32ded594e42 (diff) | |
download | parted-4fd8e74e4d3fe136fe0c4db83d5d249500e54744.tar.gz |
build,test: update gnulib, bootstrap and init.sh
* bootstrap: Update.
* tests/init.sh: Update.
* gnulib: Update.
* doc/po4a.mk: Updating gnulib pulls in newer syntax-check rules,
including one that rejects @lower_case@ variables in Makefiles.
Fix the sole violation: s/@mandir@/$(mandir)/
-rwxr-xr-x | bootstrap | 26 | ||||
-rw-r--r-- | doc/po4a.mk | 2 | ||||
m--------- | gnulib | 0 | ||||
-rw-r--r-- | tests/init.sh | 5 |
4 files changed, 24 insertions, 9 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-01-06.07; # UTC +scriptversion=2012-02-11.09; # UTC # Bootstrap this package from checked-out sources. @@ -87,9 +87,9 @@ gnulib_files= : ${AUTOPOINT=autopoint} : ${AUTORECONF=autoreconf} -# A function to be called to edit gnulib.mk right after it's created. +# A function to be called right after gnulib-tool is run. # Override it via your own definition in bootstrap.conf. -gnulib_mk_hook() { :; } +bootstrap_post_import_hook() { :; } # A function to be called after everything else in this script. # Override it via your own definition in bootstrap.conf. @@ -604,7 +604,7 @@ if $bootstrap_sync; then fi gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -<$gnulib_tool || exit +<$gnulib_tool || exit $? # Get translations. @@ -758,7 +758,7 @@ fi # Autoreconf runs aclocal before libtoolize, which causes spurious # warnings if the initial aclocal is confused by the libtoolized # (or worse out-of-date) macro directory. -if grep '^[ ]*LT_INIT' configure.ac >/dev/null; then +if test $use_libtool = 1; then echo "running: $LIBTOOLIZE --copy --install" $LIBTOOLIZE --copy --install fi @@ -807,6 +807,9 @@ for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file || exit done +bootstrap_post_import_hook \ + || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; } + # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual @@ -819,11 +822,20 @@ find "$m4_base" "$source_base" \ -depth \( -name '*.m4' -o -name '*.[ch]' \) \ -type l -xtype l -delete > /dev/null 2>&1 +# Some systems (RHEL 5) are using ancient autotools, for which the +# --no-recursive option had not been invented. Detect that lack and +# omit the option when it's not supported. FIXME in 2017: remove this +# hack when RHEL 5 autotools are updated, or when they become irrelevant. +no_recursive= +case $($AUTORECONF --help) in + *--no-recursive*) no_recursive=--no-recursive;; +esac + # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ - "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS" + "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" AUTOPOINT=true LIBTOOLIZE=true \ - $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \ + $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ || exit 1 # Get some extra files from gnulib, overriding existing files. diff --git a/doc/po4a.mk b/doc/po4a.mk index 1123c91..b378121 100644 --- a/doc/po4a.mk +++ b/doc/po4a.mk @@ -23,7 +23,7 @@ # threshold is 80%), it won't be distributed, and the build won't fail. # -mandir = @mandir@/$(lang) +mandir = $(mandir)/$(lang) # Inform automake that we want to install some man pages in section 1, 5 # and 8. diff --git a/gnulib b/gnulib -Subproject 89c006fbb40a0455ad309155be38277490c0b94 +Subproject 50bb21eab7dfc87bbfcbc75f0232407110cdd29 diff --git a/tests/init.sh b/tests/init.sh index 5985552..ae86714 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -255,7 +255,10 @@ compare_dev_null_ () return 2 } -if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then +if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \ + && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then + # diff accepts the -u option and does not (like AIX 7 'diff') produce an + # extra space on column 1 of every content line. if test -z "$diff_out_"; then compare_ () { diff -u "$@"; } else |