From 3caddfeeffe66b4864241fd90e0247b61fb83a0a Mon Sep 17 00:00:00 2001 From: Michael Darling Date: Thu, 16 Jul 2015 22:27:38 -0400 Subject: [PATCH] [3/14] Completes renaming of configure.in files to .ac Combined builds has been broken for about 10 months, because some binutils configure.in files were renamed to configure.ac, but gcc's references to them were not updated. Fixing gcc's references to them is much easier by renaming the few straggling configure.in files to configure.ac. gcc's configure.in files were entirely renamed to configure.ac some time ago. There are corresponding patches submitted to gcc, which updates all references to binutils-gdb configure.in files to configure.ac, which is what ultimately fixes combined builds. See PR binutils-gdb/binutils/18450 and gcc/other/66259. Signed-off by: Michael Darling --- binutils/ChangeLog | 6 ++++++ binutils/MAINTAINERS | 2 +- binutils/configure | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index a68a8ea..8ef0d5d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2015-07-16 Michael Darling + + PR binutils/18450 + * MAINTAINERS: Reflects renaming of configure.in to configure.ac + * configure: Likewise + 2015-07-16 Alan Modra PR binutils/18672 diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS index 37f4601..74882dd 100644 --- a/binutils/MAINTAINERS +++ b/binutils/MAINTAINERS @@ -22,7 +22,7 @@ top level config.guess and config.sub scripts should be sent to: config-patches@gnu.org and not to the binutils lists. Patches to the other top level -configure files (configure, configure.in, config-ml.in) should +configure files (configure, configure.ac, config-ml.in) should be sent to the binutils lists, and copied to the gcc and gdb lists as well (gcc-patches@gcc.gnu.org and gdb-patches@sourceware.org). diff --git a/binutils/configure b/binutils/configure index 5db82d7..c47d0f8 100755 --- a/binutils/configure +++ b/binutils/configure @@ -16908,14 +16908,14 @@ _LT_EOF if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.ac is obsolete" || echo "setting ALL_LINGUAS in configure.ac is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else - # The set of available languages was given in configure.in. + # The set of available languages was given in configure.ac. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi case "$ac_given_srcdir" in -- 2.4.4