public inbox for gdb-testers@sourceware.org help / color / mirror / Atom feed
From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Subject: [binutils-gdb] Minor updates to readline configury Date: Fri, 15 Nov 2019 23:15:00 -0000 [thread overview] Message-ID: <bb69c5018be23daa67a28fa83cb692f41d34c89e@gdb-build> (raw) *** TEST RESULTS FOR COMMIT bb69c5018be23daa67a28fa83cb692f41d34c89e *** commit bb69c5018be23daa67a28fa83cb692f41d34c89e Author: Tom Tromey <tromey@adacore.com> AuthorDate: Fri Nov 15 13:40:53 2019 -0700 Commit: Tom Tromey <tromey@adacore.com> CommitDate: Fri Nov 15 13:46:54 2019 -0700 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 diff --git a/readline/ChangeLog b/readline/ChangeLog index 936dc3133a..d13b1e80dd 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 50b10b244c..67e4adc018 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 1c68a53bdb..9c2071e77d 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 672c6a4b8d..f049a1bfdc 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 d4ded1158f..fdc330421c 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])
next reply other threads:[~2019-11-15 23:15 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-15 23:15 gdb-buildbot [this message] 2019-11-15 23:15 ` Failures on Ubuntu-Aarch64-native-gdbserver-m64, branch master gdb-buildbot 2019-11-26 8:47 ` Failures on Fedora-i686, " gdb-buildbot 2019-11-26 9:01 ` Failures on Fedora-x86_64-cc-with-index, " gdb-buildbot 2019-11-26 9:10 ` Failures on Fedora-x86_64-m32, " gdb-buildbot 2019-11-26 9:11 ` Failures on Fedora-x86_64-m64, " gdb-buildbot 2019-11-26 10:18 ` Failures on Fedora-x86_64-native-extended-gdbserver-m64, " gdb-buildbot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=bb69c5018be23daa67a28fa83cb692f41d34c89e@gdb-build \ --to=gdb-buildbot@sergiodj.net \ --cc=gdb-testers@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).