From 17ac3c2c47b9710bc6d2045fc4fa0c73b6791727 Mon Sep 17 00:00:00 2001 From: Michael Darling Date: Thu, 16 Jul 2015 22:34:47 -0400 Subject: [PATCH] [8/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 --- gold/ChangeLog | 5 +++++ gold/configure | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 309b4753..1c518f2 100644 --- a/gold/ChangeLog +++ b/gold/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 * compressed_output.cc (Output_compressed_section::set_final_data_size): diff --git a/gold/configure b/gold/configure index a005a75..eac9669 100755 --- a/gold/configure +++ b/gold/configure @@ -9164,14 +9164,14 @@ $as_echo X"$file" | 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