summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-01-28 11:44:22 +0100
committerBruno Haible <bruno@clisp.org>2019-01-28 11:44:22 +0100
commit88da35931723a83a4eeb5e5781f57b6d1c7a3b85 (patch)
tree3e0347d6cfbe6f10e228b57660c1d62451e81865
parent18fa5e50bb54af40680750781c723e2b323336f9 (diff)
downloadlibunistring-88da35931723a83a4eeb5e5781f57b6d1c7a3b85.tar.gz
Accommodate a shell that is not in /bin/sh.
-rw-r--r--ChangeLog5
-rwxr-xr-xautogen.sh2
-rw-r--r--build-aux/.gitignore1
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0593b4d..de891ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-28 Bruno Haible <bruno@clisp.org>
+
+ Accommodate a shell that is not in /bin/sh.
+ * autogen.sh: Patch build-aux/test-driver with a patch from gnulib.
+
2018-10-23 Bruno Haible <bruno@clisp.org>
Support for per-thread locales on systems with HAVE_NAMELESS_LOCALES.
diff --git a/autogen.sh b/autogen.sh
index 3792b35..7d284bc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -458,6 +458,7 @@ if test $skip_gnulib = false; then
&& mv lib/unicase.in.h.tmp lib/unicase.in.h
$GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess
$GNULIB_TOOL --copy-file build-aux/config.sub; chmod a+x build-aux/config.sub
+ $GNULIB_TOOL --copy-file build-aux/test-driver.diff
# If we got no texinfo.tex so far, take the snapshot from gnulib.
if test ! -f build-aux/texinfo.tex; then
$GNULIB_TOOL --copy-file build-aux/texinfo.tex build-aux/texinfo.tex
@@ -471,5 +472,6 @@ autoheader && touch config.h.in
# Make sure we get new versions of files brought in by automake.
(cd build-aux && rm -f ar-lib compile depcomp install-sh mdate-sh missing test-driver)
automake --add-missing --copy
+patch build-aux/test-driver < build-aux/test-driver.diff
# Get rid of autom4te.cache directory.
rm -rf autom4te.cache
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index bd2f56d..7998cc8 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -13,5 +13,6 @@
# Other files brought in by autogen.sh:
/config.guess
/config.sub
+/test-driver.diff
/texinfo.tex