diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-11-15 13:40:53 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-11-15 13:46:54 -0700 |
| commit | bb69c5018be23daa67a28fa83cb692f41d34c89e (patch) | |
| tree | bc340cef950ad4d83a494a9977f31a09726d9fdb | |
| parent | 53fea9c7e6d4993088016a16be56098fd819cebc (diff) | |
| download | binutils-gdb-bb69c5018be23daa67a28fa83cb692f41d34c89e.tar.gz | |
Minor updates to readline configury
Christian's recent patches to gnulib made me realize that readline
should be changed to use AC_CONFIG_MACRO_DIRS (ACLOCAL_AMFLAGS is
deprecated) and that it can put the automake options into
configure.ac. I also added no-define to the automake options. This
doesn't matter much (we don't generate a config.h here), but gnulib
does it, and it does make configure slightly smaller.
readline/ChangeLog
2019-11-15 Tom Tromey <tromey@adacore.com>
* configure, Makefile.in: Rebuild.
* configure.ac: Use AC_CONFIG_MACRO_DIRS. Pass options to
AM_INIT_AUTOMAKE.
* Makefile.am (AUTOMAKE_OPTIONS, ACLOCAL_AMFLAGS): Remove.
Change-Id: If421599cc9dd9c4c3c37b9b439ab2c22c01742ed
| -rw-r--r-- | readline/ChangeLog | 7 | ||||
| -rw-r--r-- | readline/Makefile.am | 2 | ||||
| -rw-r--r-- | readline/Makefile.in | 2 | ||||
| -rwxr-xr-x | readline/configure | 10 | ||||
| -rw-r--r-- | readline/configure.ac | 3 |
5 files changed, 10 insertions, 14 deletions
diff --git a/readline/ChangeLog b/readline/ChangeLog index 936dc3133a3..d13b1e80dd1 100644 --- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,10 @@ +2019-11-15 Tom Tromey <tromey@adacore.com> + + * configure, Makefile.in: Rebuild. + * configure.ac: Use AC_CONFIG_MACRO_DIRS. Pass options to + AM_INIT_AUTOMAKE. + * Makefile.am (AUTOMAKE_OPTIONS, ACLOCAL_AMFLAGS): Remove. + 2019-10-23 Tom Tromey <tom@tromey.com> Move old contents to readline/ subdirectory. diff --git a/readline/Makefile.am b/readline/Makefile.am index 50b10b244cd..67e4adc0188 100644 --- a/readline/Makefile.am +++ b/readline/Makefile.am @@ -15,6 +15,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -AUTOMAKE_OPTIONS = no-dist foreign SUBDIRS = readline -ACLOCAL_AMFLAGS = -I . -I ../config diff --git a/readline/Makefile.in b/readline/Makefile.in index 1c68a53bdb9..9c2071e77db 100644 --- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -245,9 +245,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = no-dist foreign SUBDIRS = readline -ACLOCAL_AMFLAGS = -I . -I ../config all: all-recursive .SUFFIXES: diff --git a/readline/configure b/readline/configure index 672c6a4b8d8..f049a1bfdca 100755 --- a/readline/configure +++ b/readline/configure @@ -1744,6 +1744,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + am__api_version='1.15' # Find a good install program. We prefer a C program (faster), @@ -2233,15 +2234,6 @@ fi VERSION='UNUSED-VERSION' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} diff --git a/readline/configure.ac b/readline/configure.ac index d4ded1158f1..fdc330421cb 100644 --- a/readline/configure.ac +++ b/readline/configure.ac @@ -21,7 +21,8 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([readline], [UNUSED-VERSION]) AC_CONFIG_SRCDIR([readline/readline.c]) AC_CONFIG_AUX_DIR(..) -AM_INIT_AUTOMAKE +AC_CONFIG_MACRO_DIRS([../config]) +AM_INIT_AUTOMAKE([no-define no-dist foreign]) AM_MAINTAINER_MODE AC_CONFIG_SUBDIRS([readline]) |