From patchwork Fri Nov 15 21:17:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35960 Received: (qmail 7834 invoked by alias); 15 Nov 2019 21:17:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 7820 invoked by uid 89); 15 Nov 2019 21:17:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 15 Nov 2019 21:17:12 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 3A88A200EF; Fri, 15 Nov 2019 16:17:10 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id 0A65D2032F; Fri, 15 Nov 2019 16:17:07 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id CA4B020AF6; Fri, 15 Nov 2019 16:17:06 -0500 (EST) X-Gerrit-PatchSet: 1 Date: Fri, 15 Nov 2019 16:17:06 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Cc: Simon Marchi Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Minor updates to readline configury X-Gerrit-Change-Id: If421599cc9dd9c4c3c37b9b439ab2c22c01742ed X-Gerrit-Change-Number: 658 X-Gerrit-ChangeURL: X-Gerrit-Commit: bb69c5018be23daa67a28fa83cb692f41d34c89e In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, simon.marchi@polymtl.ca, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-76-gf8b6da0ab5 Message-Id: <20191115211706.CA4B020AF6@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/658 ...................................................................... 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 * 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 --- M readline/ChangeLog M readline/Makefile.am M readline/Makefile.in M readline/configure M readline/configure.ac 5 files changed, 10 insertions(+), 14 deletions(-) Approvals: Simon Marchi: Looks good to me, approved diff --git a/readline/ChangeLog b/readline/ChangeLog index 936dc31..d13b1e8 100644 --- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,10 @@ +2019-11-15 Tom Tromey + + * 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 Move old contents to readline/ subdirectory. diff --git a/readline/Makefile.am b/readline/Makefile.am index 50b10b2..67e4adc 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 . -AUTOMAKE_OPTIONS = no-dist foreign SUBDIRS = readline -ACLOCAL_AMFLAGS = -I . -I ../config diff --git a/readline/Makefile.in b/readline/Makefile.in index 1c68a53..9c2071e 100644 --- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -245,9 +245,7 @@ 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 672c6a4..f049a1b 100755 --- a/readline/configure +++ b/readline/configure @@ -1744,6 +1744,7 @@ 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 @@ 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 d4ded11..fdc3304 100644 --- a/readline/configure.ac +++ b/readline/configure.ac @@ -21,7 +21,8 @@ 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])