MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor updates to readline configury

Browse Source 
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
This commit is contained in:
Tom Tromey 2019-11-15 13:40:53 -07:00
parent 53fea9c7e6
commit bb69c5018b
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
readline/ChangeLog
View File

@ -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> 2019-10-23 Tom Tromey <tom@tromey.com>
Move old contents to readline/ subdirectory. Move old contents to readline/ subdirectory.

2
readline/Makefile.am
View File

@ -15,6 +15,4 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
AUTOMAKE_OPTIONS = no-dist foreign
SUBDIRS = readline SUBDIRS = readline
ACLOCAL_AMFLAGS = -I . -I ../config

2
readline/Makefile.in
View File

@ -245,9 +245,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = no-dist foreign
SUBDIRS = readline SUBDIRS = readline
ACLOCAL_AMFLAGS = -I . -I ../config
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:

10
readline/configure vendored
View File

@ -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. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
am__api_version='1.15' am__api_version='1.15'
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
@ -2233,15 +2234,6 @@ fi
VERSION='UNUSED-VERSION' VERSION='UNUSED-VERSION'
cat >>confdefs.h <<_ACEOF
#define PACKAGE "$PACKAGE"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
_ACEOF
# Some tools Automake needs. # Some tools Automake needs.
ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}

3
readline/configure.ac
View File

@ -21,7 +21,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([readline], [UNUSED-VERSION]) AC_INIT([readline], [UNUSED-VERSION])
AC_CONFIG_SRCDIR([readline/readline.c]) AC_CONFIG_SRCDIR([readline/readline.c])
AC_CONFIG_AUX_DIR(..) AC_CONFIG_AUX_DIR(..)
AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIRS([../config])
AM_INIT_AUTOMAKE([no-define no-dist foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_CONFIG_SUBDIRS([readline]) AC_CONFIG_SUBDIRS([readline])