summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2016-12-02 02:42:26 +0100
committerBruno Haible <bruno@clisp.org>2016-12-02 03:57:37 +0100
commit76524497421bcb79f863504b024ac5423cd7e0f1 (patch)
tree5344efa32e94f78d131b972f3c526525bc637bfc
parent006826b478397719da2a3b1d1c1afb9573c2f8c8 (diff)
downloadlibunistring-76524497421bcb79f863504b024ac5423cd7e0f1.tar.gz
Allow use of automake-1.15.
-rw-r--r--ChangeLog6
-rwxr-xr-xautogen.sh6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c78ed7a..a88bfac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-02 Bruno Haible <bruno@clisp.org>
+
+ Allow use of automake-1.15.
+ * autogen.sh: Update comments. Make sure to get new versions of files
+ brought in by automake.
+
2016-11-23 Bruno Haible <bruno@clisp.org>
Update installation instructions for Windows.
diff --git a/autogen.sh b/autogen.sh
index f558615..b7c925e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
# also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
# with new versions of autoconf or automake.
#
-# This script requires autoconf-2.63..2.69 and automake-1.11..1.12 in the PATH.
+# This script requires autoconf-2.63..2.69 and automake-1.11..1.15 in the PATH.
# It also requires either
# - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
# in a gnulib checkout, or
@@ -12,7 +12,7 @@
# It also requires
# - the gperf program.
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -459,4 +459,6 @@ fi
build-aux/fixaclocal aclocal -I m4 -I gnulib-m4
autoconf
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