577 lines
19 KiB
Diff
577 lines
19 KiB
Diff
From 92154e8dfb35c70f6792c4efed9cd97b4c84cbcb Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@redhat.com>
|
|
Date: Tue, 28 Aug 2012 19:50:48 +0200
|
|
Subject: [PATCH 09/89] build: update gnulib, bootstrap and init.sh
|
|
|
|
---
|
|
bootstrap | 267 ++++++++++++++++++++++++++++++++++++++--------------------
|
|
gnulib | 2 +-
|
|
tests/init.sh | 13 ++-
|
|
3 files changed, 185 insertions(+), 97 deletions(-)
|
|
|
|
diff --git a/bootstrap b/bootstrap
|
|
index 31eb651..e3e270b 100755
|
|
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -1,6 +1,6 @@
|
|
#! /bin/sh
|
|
# Print a version string.
|
|
-scriptversion=2012-02-11.09; # UTC
|
|
+scriptversion=2012-07-19.14; # UTC
|
|
|
|
# Bootstrap this package from checked-out sources.
|
|
|
|
@@ -36,6 +36,10 @@ nl='
|
|
LC_ALL=C
|
|
export LC_ALL
|
|
|
|
+# Ensure that CDPATH is not set. Otherwise, the output from cd
|
|
+# would cause trouble in at least one use below.
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
+
|
|
local_gl_dir=gl
|
|
|
|
me=$0
|
|
@@ -73,6 +77,33 @@ Running without arguments will suffice in most cases.
|
|
EOF
|
|
}
|
|
|
|
+# warnf_ FORMAT-STRING ARG1...
|
|
+warnf_ ()
|
|
+{
|
|
+ warnf_format_=$1
|
|
+ shift
|
|
+ nl='
|
|
+'
|
|
+ case $* in
|
|
+ *$nl*) me_=$(printf "$me"|tr "$nl|" '??')
|
|
+ printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;;
|
|
+ *) printf "$me: $warnf_format_" "$@" ;;
|
|
+ esac >&2
|
|
+}
|
|
+
|
|
+# warn_ WORD1...
|
|
+warn_ ()
|
|
+{
|
|
+ # If IFS does not start with ' ', set it and emit the warning in a subshell.
|
|
+ case $IFS in
|
|
+ ' '*) warnf_ '%s\n' "$*";;
|
|
+ *) (IFS=' '; warn_ "$@");;
|
|
+ esac
|
|
+}
|
|
+
|
|
+# die WORD1...
|
|
+die() { warn_ "$@"; exit 1; }
|
|
+
|
|
# Configuration.
|
|
|
|
# Name of the Makefile.am
|
|
@@ -126,7 +157,8 @@ extract_package_name='
|
|
p
|
|
}
|
|
'
|
|
-package=`sed -n "$extract_package_name" configure.ac` || exit
|
|
+package=$(sed -n "$extract_package_name" configure.ac) \
|
|
+ || die 'cannot find package name in configure.ac'
|
|
gnulib_name=lib$package
|
|
|
|
build_aux=build-aux
|
|
@@ -182,6 +214,8 @@ use_git=true
|
|
# otherwise find the first of the NAMES that can be run (i.e.,
|
|
# supports --version). If found, set ENVVAR to the program name,
|
|
# die otherwise.
|
|
+#
|
|
+# FIXME: code duplication, see also gnu-web-doc-update.
|
|
find_tool ()
|
|
{
|
|
find_tool_envvar=$1
|
|
@@ -199,19 +233,15 @@ find_tool ()
|
|
else
|
|
find_tool_error_prefix="\$$find_tool_envvar: "
|
|
fi
|
|
- if test x"$find_tool_res" = x; then
|
|
- echo >&2 "$me: one of these is required: $find_tool_names"
|
|
- exit 1
|
|
- fi
|
|
- ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
|
|
- echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
|
|
- exit 1
|
|
- }
|
|
+ test x"$find_tool_res" != x \
|
|
+ || die "one of these is required: $find_tool_names"
|
|
+ ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
|
|
+ || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
|
|
eval "$find_tool_envvar=\$find_tool_res"
|
|
eval "export $find_tool_envvar"
|
|
}
|
|
|
|
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
|
|
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
|
|
find_tool SHA1SUM sha1sum gsha1sum shasum
|
|
|
|
# Override the default configuration, if necessary.
|
|
@@ -226,7 +256,6 @@ esac
|
|
test -z "${gnulib_extra_files}" && \
|
|
gnulib_extra_files="
|
|
$build_aux/install-sh
|
|
- $build_aux/missing
|
|
$build_aux/mdate-sh
|
|
$build_aux/texinfo.tex
|
|
$build_aux/depcomp
|
|
@@ -252,7 +281,7 @@ do
|
|
usage
|
|
exit;;
|
|
--gnulib-srcdir=*)
|
|
- GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;
|
|
+ GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
|
|
--skip-po)
|
|
SKIP_PO=t;;
|
|
--force)
|
|
@@ -266,21 +295,15 @@ do
|
|
--no-git)
|
|
use_git=false;;
|
|
*)
|
|
- echo >&2 "$0: $option: unknown option"
|
|
- exit 1;;
|
|
+ die "$option: unknown option";;
|
|
esac
|
|
done
|
|
|
|
-if $use_git || test -d "$GNULIB_SRCDIR"; then
|
|
- :
|
|
-else
|
|
- echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
|
|
- exit 1
|
|
-fi
|
|
+$use_git || test -d "$GNULIB_SRCDIR" \
|
|
+ || die "Error: --no-git requires --gnulib-srcdir"
|
|
|
|
if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
|
|
- echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
|
|
- exit 1
|
|
+ die "Bootstrapping from a non-checked-out distribution is risky."
|
|
fi
|
|
|
|
# Ensure that lines starting with ! sort last, per gitignore conventions
|
|
@@ -303,10 +326,10 @@ insert_sorted_if_absent() {
|
|
file=$1
|
|
str=$2
|
|
test -f $file || touch $file
|
|
- echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \
|
|
+ echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
|
|
|| { echo "$str" | sort_patterns - $file > $file.bak \
|
|
&& mv $file.bak $file; } \
|
|
- || exit 1
|
|
+ || die "insert_sorted_if_absent $file $str: failed"
|
|
}
|
|
|
|
# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
|
|
@@ -319,7 +342,7 @@ insert_vc_ignore() {
|
|
# A .gitignore entry that does not start with '/' applies
|
|
# recursively to subdirectories, so prepend '/' to every
|
|
# .gitignore entry.
|
|
- pattern=`echo "$pattern" | sed s,^,/,`;;
|
|
+ pattern=$(echo "$pattern" | sed s,^,/,);;
|
|
esac
|
|
insert_sorted_if_absent "$vc_ignore_file" "$pattern"
|
|
}
|
|
@@ -330,11 +353,8 @@ grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
|
|
>/dev/null && found_aux_dir=yes
|
|
grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
|
|
>/dev/null && found_aux_dir=yes
|
|
-if test $found_aux_dir = no; then
|
|
- echo "$0: expected line not found in configure.ac. Add the following:" >&2
|
|
- echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
|
|
- exit 1
|
|
-fi
|
|
+test $found_aux_dir = yes \
|
|
+ || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
|
|
|
|
# If $build_aux doesn't exist, create it now, otherwise some bits
|
|
# below will malfunction. If creating it, also mark it as ignored.
|
|
@@ -423,31 +443,48 @@ check_versions() {
|
|
$use_git || continue
|
|
fi
|
|
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
|
|
- appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'`
|
|
+ appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_')
|
|
test "$appvar" = TAR && appvar=AMTAR
|
|
case $appvar in
|
|
GZIP) ;; # Do not use $GZIP: it contains gzip options.
|
|
*) eval "app=\${$appvar-$app}" ;;
|
|
esac
|
|
+
|
|
+ # Handle the still-experimental Automake-NG programs specially.
|
|
+ # They remain named as the mainstream Automake programs ("automake",
|
|
+ # and "aclocal") to avoid gratuitous incompatibilities with
|
|
+ # pre-existing usages (by, say, autoreconf, or custom autogen.sh
|
|
+ # scripts), but correctly identify themselves (as being part of
|
|
+ # "GNU automake-ng") when asked their version.
|
|
+ case $app in
|
|
+ automake-ng|aclocal-ng)
|
|
+ app=${app%-ng}
|
|
+ ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
|
|
+ warn_ "Error: '$app' not found or not from Automake-NG"
|
|
+ ret=1
|
|
+ continue
|
|
+ } ;;
|
|
+ esac
|
|
if [ "$req_ver" = "-" ]; then
|
|
# Merely require app to exist; not all prereq apps are well-behaved
|
|
# so we have to rely on $? rather than get_version.
|
|
$app --version >/dev/null 2>&1
|
|
if [ 126 -le $? ]; then
|
|
- echo "$me: Error: '$app' not found" >&2
|
|
+ warn_ "Error: '$app' not found"
|
|
ret=1
|
|
fi
|
|
else
|
|
# Require app to produce a new enough version string.
|
|
inst_ver=$(get_version $app)
|
|
if [ ! "$inst_ver" ]; then
|
|
- echo "$me: Error: '$app' not found" >&2
|
|
+ warn_ "Error: '$app' not found"
|
|
ret=1
|
|
else
|
|
latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
|
|
if [ ! "$latest_ver" = "$inst_ver" ]; then
|
|
- echo "$me: Error: '$app' version == $inst_ver is too old" >&2
|
|
- echo " '$app' version >= $req_ver is required" >&2
|
|
+ warnf_ '%s\n' \
|
|
+ "Error: '$app' version == $inst_ver is too old" \
|
|
+ " '$app' version >= $req_ver is required"
|
|
ret=1
|
|
fi
|
|
fi
|
|
@@ -492,10 +529,8 @@ esac
|
|
|
|
# When we can deduce that gnulib-tool will require patch,
|
|
# and when patch is not already listed as a prerequisite, add it, too.
|
|
-if test ! -d "$local_gl_dir" \
|
|
- || find "$local_gl_dir" -name '*.diff' -exec false {} +; then
|
|
- :
|
|
-else
|
|
+if test -d "$local_gl_dir" \
|
|
+ && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then
|
|
case $buildreq in
|
|
*patch*) ;;
|
|
*) buildreq="patch -
|
|
@@ -506,11 +541,10 @@ fi
|
|
if ! printf "$buildreq" | check_versions; then
|
|
echo >&2
|
|
if test -f README-prereq; then
|
|
- echo "$0: See README-prereq for how to get the prerequisite programs" >&2
|
|
+ die "See README-prereq for how to get the prerequisite programs"
|
|
else
|
|
- echo "$0: Please install the prerequisite programs" >&2
|
|
+ die "Please install the prerequisite programs"
|
|
fi
|
|
- exit 1
|
|
fi
|
|
|
|
echo "$0: Bootstrapping from checked-out $package sources..."
|
|
@@ -539,7 +573,7 @@ git_modules_config () {
|
|
test -f .gitmodules && git config --file .gitmodules "$@"
|
|
}
|
|
|
|
-gnulib_path=`git_modules_config submodule.gnulib.path`
|
|
+gnulib_path=$(git_modules_config submodule.gnulib.path)
|
|
test -z "$gnulib_path" && gnulib_path=gnulib
|
|
|
|
# Get gnulib files.
|
|
@@ -612,10 +646,10 @@ download_po_files() {
|
|
subdir=$1
|
|
domain=$2
|
|
echo "$me: getting translations into $subdir for $domain..."
|
|
- cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
|
|
+ cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
|
|
eval "$cmd" && return
|
|
# Fallback to HTTP.
|
|
- cmd=`printf "$po_download_command_format2" "$subdir" "$domain"`
|
|
+ cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
|
|
eval "$cmd"
|
|
}
|
|
|
|
@@ -638,7 +672,7 @@ update_po_files() {
|
|
&& ls "$ref_po_dir"/*.po 2>/dev/null |
|
|
sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
|
|
|
|
- langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
|
|
+ langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g')
|
|
test "$langs" = '*' && langs=x
|
|
for po in $langs; do
|
|
case $po in x) continue;; esac
|
|
@@ -675,18 +709,18 @@ symlink_to_dir()
|
|
|
|
# If the destination directory doesn't exist, create it.
|
|
# This is required at least for "lib/uniwidth/cjk.h".
|
|
- dst_dir=`dirname "$dst"`
|
|
+ dst_dir=$(dirname "$dst")
|
|
if ! test -d "$dst_dir"; then
|
|
mkdir -p "$dst_dir"
|
|
|
|
# If we've just created a directory like lib/uniwidth,
|
|
# tell version control system(s) it's ignorable.
|
|
# FIXME: for now, this does only one level
|
|
- parent=`dirname "$dst_dir"`
|
|
+ parent=$(dirname "$dst_dir")
|
|
for dot_ig in x $vc_ignore; do
|
|
test $dot_ig = x && continue
|
|
ig=$parent/$dot_ig
|
|
- insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
|
|
+ insert_vc_ignore $ig "${dst_dir##*/}"
|
|
done
|
|
fi
|
|
|
|
@@ -710,10 +744,10 @@ symlink_to_dir()
|
|
# so that broken tools aren't confused into skipping needed builds. See
|
|
# <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
|
|
test -h "$dst" &&
|
|
- src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
|
|
- dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
|
|
+ src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
|
|
+ dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
|
|
test "$src_i" = "$dst_i" &&
|
|
- both_ls=`ls -dt "$src" "$dst"` &&
|
|
+ both_ls=$(ls -dt "$src" "$dst") &&
|
|
test "X$both_ls" = "X$dst$nl$src" || {
|
|
dot_dots=
|
|
case $src in
|
|
@@ -721,11 +755,10 @@ symlink_to_dir()
|
|
*)
|
|
case /$dst/ in
|
|
*//* | */../* | */./* | /*/*/*/*/*/)
|
|
- echo >&2 "$me: invalid symlink calculation: $src -> $dst"
|
|
- exit 1;;
|
|
- /*/*/*/*/) dot_dots=../../../;;
|
|
- /*/*/*/) dot_dots=../../;;
|
|
- /*/*/) dot_dots=../;;
|
|
+ die "invalid symlink calculation: $src -> $dst";;
|
|
+ /*/*/*/*/) dot_dots=../../../;;
|
|
+ /*/*/*/) dot_dots=../../;;
|
|
+ /*/*/) dot_dots=../;;
|
|
esac;;
|
|
esac
|
|
|
|
@@ -736,6 +769,22 @@ symlink_to_dir()
|
|
}
|
|
}
|
|
|
|
+version_controlled_file() {
|
|
+ parent=$1
|
|
+ file=$2
|
|
+ if test -d .git; then
|
|
+ git rm -n "$file" > /dev/null 2>&1
|
|
+ elif test -d .svn; then
|
|
+ svn log -r HEAD "$file" > /dev/null 2>&1
|
|
+ elif test -d CVS; then
|
|
+ grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
|
|
+ grep '^/[^/]*/[0-9]' > /dev/null
|
|
+ else
|
|
+ warn_ "no version control for $file?"
|
|
+ false
|
|
+ fi
|
|
+}
|
|
+
|
|
# NOTE: we have to be careful to run both autopoint and libtoolize
|
|
# before gnulib-tool, since gnulib-tool is likely to provide newer
|
|
# versions of files "installed" by these two programs.
|
|
@@ -748,37 +797,54 @@ with_gettext=yes
|
|
grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
|
|
with_gettext=no
|
|
|
|
-if test $with_gettext = yes; then
|
|
- # Released autopoint has the tendency to install macros that have been
|
|
- # obsoleted in current gnulib, so run this before gnulib-tool.
|
|
- echo "$0: $AUTOPOINT --force"
|
|
- $AUTOPOINT --force || exit
|
|
-fi
|
|
+if test $with_gettext = yes || test $use_libtool = 1; then
|
|
|
|
-# 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 test $use_libtool = 1; then
|
|
- echo "running: $LIBTOOLIZE --copy --install"
|
|
- $LIBTOOLIZE --copy --install
|
|
-fi
|
|
+ tempbase=.bootstrap$$
|
|
+ trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
|
|
|
|
-version_controlled_file() {
|
|
- dir=$1
|
|
- file=$2
|
|
- found=no
|
|
- if test -d CVS; then
|
|
- grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
|
|
- grep '^/[^/]*/[0-9]' > /dev/null && found=yes
|
|
- elif test -d .git; then
|
|
- git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
|
|
- elif test -d .svn; then
|
|
- svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
|
|
- else
|
|
- echo "$me: no version control for $dir/$file?" >&2
|
|
+ > $tempbase.0 > $tempbase.1 &&
|
|
+ find . ! -type d -print | sort > $tempbase.0 || exit
|
|
+
|
|
+ if test $with_gettext = yes; then
|
|
+ # Released autopoint has the tendency to install macros that have been
|
|
+ # obsoleted in current gnulib, so run this before gnulib-tool.
|
|
+ echo "$0: $AUTOPOINT --force"
|
|
+ $AUTOPOINT --force || exit
|
|
fi
|
|
- test $found = yes
|
|
-}
|
|
+
|
|
+ # 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.
|
|
+ # libtoolize 1.9b added the --install option; but we support back
|
|
+ # to libtoolize 1.5.22, where the install action was default.
|
|
+ if test $use_libtool = 1; then
|
|
+ install=
|
|
+ case $($LIBTOOLIZE --help) in
|
|
+ *--install*) install=--install ;;
|
|
+ esac
|
|
+ echo "running: $LIBTOOLIZE $install --copy"
|
|
+ $LIBTOOLIZE $install --copy
|
|
+ fi
|
|
+
|
|
+ find . ! -type d -print | sort >$tempbase.1
|
|
+ old_IFS=$IFS
|
|
+ IFS=$nl
|
|
+ for file in $(comm -13 $tempbase.0 $tempbase.1); do
|
|
+ IFS=$old_IFS
|
|
+ parent=${file%/*}
|
|
+ version_controlled_file "$parent" "$file" || {
|
|
+ for dot_ig in x $vc_ignore; do
|
|
+ test $dot_ig = x && continue
|
|
+ ig=$parent/$dot_ig
|
|
+ insert_vc_ignore "$ig" "${file##*/}"
|
|
+ done
|
|
+ }
|
|
+ done
|
|
+ IFS=$old_IFS
|
|
+
|
|
+ rm -f $tempbase.0 $tempbase.1
|
|
+ trap - 1 2 13 15
|
|
+fi
|
|
|
|
# Import from gnulib.
|
|
|
|
@@ -804,11 +870,12 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
|
|
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
|
|
|
|
for file in $gnulib_files; do
|
|
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
|
|
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
|
|
+ || die "failed to symlink $file"
|
|
done
|
|
|
|
bootstrap_post_import_hook \
|
|
- || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
|
|
+ || die "bootstrap_post_import_hook failed"
|
|
|
|
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
|
|
# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
|
|
@@ -836,16 +903,17 @@ echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
|
|
"$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
|
|
AUTOPOINT=true LIBTOOLIZE=true \
|
|
$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
|
|
- || exit 1
|
|
+ || die "autoreconf failed"
|
|
|
|
# Get some extra files from gnulib, overriding existing files.
|
|
for file in $gnulib_extra_files; do
|
|
case $file in
|
|
*/INSTALL) dst=INSTALL;;
|
|
- build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
|
|
+ build-aux/*) dst=$build_aux/${file#build-aux/};;
|
|
*) dst=$file;;
|
|
esac
|
|
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
|
|
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
|
|
+ || die "failed to symlink $file"
|
|
done
|
|
|
|
if test $with_gettext = yes; then
|
|
@@ -861,7 +929,19 @@ if test $with_gettext = yes; then
|
|
a\
|
|
'"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
|
|
}
|
|
- ' po/Makevars.template >po/Makevars || exit 1
|
|
+ ' po/Makevars.template >po/Makevars \
|
|
+ || die 'cannot generate po/Makevars'
|
|
+
|
|
+ # If the 'gettext' module is in use, grab the latest Makefile.in.in.
|
|
+ # If only the 'gettext-h' module is in use, assume autopoint already
|
|
+ # put the correct version of this file into place.
|
|
+ case $gnulib_modules in
|
|
+ *gettext-h*) ;;
|
|
+ *gettext*)
|
|
+ cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
|
|
+ || die "cannot create po/Makefile.in.in"
|
|
+ ;;
|
|
+ esac
|
|
|
|
if test -d runtime-po; then
|
|
# Similarly for runtime-po/Makevars, but not quite the same.
|
|
@@ -875,7 +955,8 @@ if test $with_gettext = yes; then
|
|
a\
|
|
'"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
|
|
}
|
|
- ' po/Makevars.template >runtime-po/Makevars || exit 1
|
|
+ ' po/Makevars.template >runtime-po/Makevars \
|
|
+ || die 'cannot generate runtime-po/Makevars'
|
|
|
|
# Copy identical files from po to runtime-po.
|
|
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
|
|
diff --git a/gnulib b/gnulib
|
|
index 50bb21e..e1abd50 160000
|
|
--- a/gnulib
|
|
+++ b/gnulib
|
|
@@ -1 +1 @@
|
|
-Subproject commit 50bb21eab7dfc87bbfcbc75f0232407110cdd296
|
|
+Subproject commit e1abd50b01d6bd61bd0c996ca17378cd569c0aa1
|
|
diff --git a/tests/init.sh b/tests/init.sh
|
|
index ae86714..5f6e638 100644
|
|
--- a/tests/init.sh
|
|
+++ b/tests/init.sh
|
|
@@ -207,6 +207,14 @@ else
|
|
fi
|
|
fi
|
|
|
|
+# If this is bash, turn off all aliases.
|
|
+test -n "$BASH_VERSION" && unalias -a
|
|
+
|
|
+# Note that when supporting $EXEEXT (transparently mapping from PROG_NAME to
|
|
+# PROG_NAME.exe), we want to support hyphen-containing names like test-acos.
|
|
+# That is part of the shell-selection test above. Why use aliases rather
|
|
+# than functions? Because support for hyphen-containing aliases is more
|
|
+# widespread than that for hyphen-containing function names.
|
|
test -n "$EXEEXT" && shopt -s expand_aliases
|
|
|
|
# Enable glibc's malloc-perturbing option.
|
|
@@ -403,8 +411,7 @@ path_prepend_ ()
|
|
case $path_dir_ in
|
|
'') fail_ "invalid path dir: '$1'";;
|
|
/*) abs_path_dir_=$path_dir_;;
|
|
- *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \
|
|
- || fail_ "invalid path dir: $path_dir_";;
|
|
+ *) abs_path_dir_=$initial_cwd_/$path_dir_;;
|
|
esac
|
|
case $abs_path_dir_ in
|
|
*:*) fail_ "invalid path dir: '$abs_path_dir_'";;
|
|
@@ -440,7 +447,7 @@ setup_ ()
|
|
pfx_=`testdir_prefix_`
|
|
test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
|
|
|| fail_ "failed to create temporary directory in $initial_cwd_"
|
|
- cd "$test_dir_"
|
|
+ cd "$test_dir_" || fail_ "failed to cd to temporary directory"
|
|
|
|
# As autoconf-generated configure scripts do, ensure that IFS
|
|
# is defined initially, so that saving and restoring $IFS works.
|
|
--
|
|
1.8.5.3
|
|
|