Skip to content

Commit 678afa4

Browse files
committed
Switch to automake 1.16.
1 parent f87976e commit 678afa4

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2018-05-04 Bruno Haible <bruno@clisp.org>
2+
3+
Switch to automake 1.16.
4+
* autogen.sh: Update comment.
5+
* Makefile.devel (AUTOMAKE, ACLOCAL): Switch to version 1.16.
6+
* libcharset/Makefile.devel (ACLOCAL): Likewise.
7+
* preload/Makefile.devel (ACLOCAL): Likewise.
8+
19
2018-03-27 Bruno Haible <bruno@clisp.org>
210

311
Doc tweaks.

Makefile.devel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ SHELL = /bin/sh
66
MAKE = make
77
AUTOCONF = autoconf-2.69
88
AUTOHEADER = autoheader-2.69
9-
AUTOMAKE = automake-1.15
10-
ACLOCAL = aclocal-1.15
9+
AUTOMAKE = automake-1.16
10+
ACLOCAL = aclocal-1.16
1111
GPERF = gperf
1212
CC = gcc -Wall
1313
CFLAGS = -O

autogen.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
55
# with new versions of autoconf or automake.
66
#
7-
# This script requires autoconf-2.63..2.69 and automake-1.11..1.15 in the PATH.
7+
# This script requires autoconf-2.63..2.69 and automake-1.11..1.16 in the PATH.
88
# It also requires either
99
# - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
1010
# in a gnulib checkout, or
1111
# - the git program in the PATH and an internet connection.
1212
# It also requires
1313
# - the gperf program.
1414

15-
# Copyright (C) 2003-2012, 2016 Free Software Foundation, Inc.
15+
# Copyright (C) 2003-2012, 2016, 2018 Free Software Foundation, Inc.
1616
#
1717
# This program is free software: you can redistribute it and/or modify
1818
# it under the terms of the GNU General Public License as published by

libcharset/Makefile.devel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SHELL = /bin/sh
55
MAKE = make
66
AUTOCONF = autoconf-2.69
77
AUTOHEADER = autoheader-2.69
8-
ACLOCAL = aclocal-1.15
8+
ACLOCAL = aclocal-1.16
99
CP = cp
1010
RM = rm -f
1111

preload/Makefile.devel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
SHELL = /bin/sh
55
MAKE = make
66
AUTOCONF = autoconf-2.69
7-
ACLOCAL = aclocal-1.15
7+
ACLOCAL = aclocal-1.16
88
CP = cp
99
RM = rm -f
1010

0 commit comments

Comments
 (0)