From b2b6c881c4019d9bc0445d6d1502ec5fd2f1395d Mon Sep 17 00:00:00 2001 From: Michael Darling Date: Thu, 16 Jul 2015 22:37:07 -0400 Subject: [PATCH] [11/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 --- ld/ChangeLog | 5 +++++ ld/configure | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 3dd0a6f..c166a83 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2015-07-16 Michael Darling + + PR binutils/18450 + * configure: Reflects renaming of configure.in to configure.ac + 2015-07-14 H.J. Lu * emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Make diff --git a/ld/configure b/ld/configure index 8b3dd7b..1249852 100755 --- a/ld/configure +++ b/ld/configure @@ -19835,14 +19835,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