[PATCH] [1/14] Completes renaming of configure.in files to .ac

[PATCH] [1/14] Completes renaming of configure.in files to .ac

[Michael Darling]

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

(I was requested by binutils to split my May 24 and Jul 16 patches
into separate files for each binutils-gdb main subdirectory.)

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 <darlingm@gmail.com>
---
 ChangeLog      | 8 ++++++++
 config-ml.in   | 6 +++---
 configure      | 8 ++++----
 configure.ac   | 8 ++++----
 src-release.sh | 2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

[-- Attachment #2: 0001-1-14-Completes-renaming-of-configure.in-files-to-con.patch --]
[-- Type: application/octet-stream, Size: 6714 bytes --]

From 129993c8e5907df3e3186108e44efabaa50927d7 Mon Sep 17 00:00:00 2001
From: Michael Darling <darlingm@gmail.com>
Date: Thu, 16 Jul 2015 22:29:10 -0400
Subject: [PATCH] [1/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 <darlingm@gmail.com>
---
 ChangeLog      | 8 ++++++++
 config-ml.in   | 6 +++---
 configure      | 8 ++++----
 configure.ac   | 8 ++++----
 src-release.sh | 2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ba2675..a2e116e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-16  Michael Darling  <darlingm@gmail.com>
+
+	PR binutils/18450
+	* configure: Reflects renaming of configure.in to configure.ac
+	* configure.ac: Likewise
+	* config-ml.in: Likewise
+	* src-release.sh: Likewise
+
 2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* Makefile.in: Regenerated.
diff --git a/config-ml.in b/config-ml.in
index 927bad6..5e51994 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -31,7 +31,7 @@
 # user select which libraries s/he really wants.
 #
 # Subdirectories wishing to use multilib should put the following lines
-# in the "post-target" section of configure.in.
+# in the "post-target" section of configure.ac.
 #
 # if [ "${srcdir}" = "." ] ; then
 #   if [ "${with_target_subdir}" != "." ] ; then
@@ -182,8 +182,8 @@ if [ "${enable_multilib}" = yes ]; then
 # ${with_multisubdir} tells us we're in the right branch, but we could be
 # in a subdir of that.
 # ??? The previous version could void this test by separating the process into
-# two files: one that only the library's toplevel configure.in ran (to
-# configure the multilib subdirs), and another that all configure.in's ran to
+# two files: one that only the library's toplevel configure.ac ran (to
+# configure the multilib subdirs), and another that all configure.ac's ran to
 # update the Makefile.  It seemed reasonable to collapse all multilib support
 # into one file, but it does leave us with having to perform this test.
 ml_toplevel_p=no
diff --git a/configure b/configure
index 5ba9489..6d7152e 100755
--- a/configure
+++ b/configure
@@ -6176,7 +6176,7 @@ if test -d ${srcdir}/gcc; then
   if test x"${enable_languages+set}" != xset; then
     if test x"${LANGUAGES+set}" = xset; then
       enable_languages="${LANGUAGES}"
-        echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
+        echo configure.ac: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
     else
       enable_languages=all
     fi
@@ -6184,7 +6184,7 @@ if test -d ${srcdir}/gcc; then
     if test x"${enable_languages}" = x ||
        test x"${enable_languages}" = xyes;
        then
-      echo configure.in: --enable-languages needs at least one language argument 1>&2
+      echo configure.ac: --enable-languages needs at least one language argument 1>&2
       exit 1
     fi
   fi
@@ -6194,7 +6194,7 @@ if test -d ${srcdir}/gcc; then
   # and make the substitution.
   case ,${enable_languages}, in
     *,f95,*)
-      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
+      echo configure.ac: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
       enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
       ;;
   esac
@@ -6816,7 +6816,7 @@ fi
 # have requested that this magic not happen.
 #
 # The command line options always override the explicit settings in
-# configure.in, and the settings in configure.in override this magic.
+# configure.ac, and the settings in configure.ac override this magic.
 #
 # If the default for a toolchain is to use GNU as and ld, and you don't
 # want to do that, then you should use the --without-gnu-as and
diff --git a/configure.ac b/configure.ac
index 2ff9be0..fbc49ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1866,7 +1866,7 @@ if test -d ${srcdir}/gcc; then
   if test x"${enable_languages+set}" != xset; then
     if test x"${LANGUAGES+set}" = xset; then
       enable_languages="${LANGUAGES}"
-        echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
+        echo configure.ac: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
     else
       enable_languages=all
     fi
@@ -1874,7 +1874,7 @@ if test -d ${srcdir}/gcc; then
     if test x"${enable_languages}" = x ||
        test x"${enable_languages}" = xyes;
        then
-      echo configure.in: --enable-languages needs at least one language argument 1>&2
+      echo configure.ac: --enable-languages needs at least one language argument 1>&2
       exit 1
     fi
   fi
@@ -1884,7 +1884,7 @@ if test -d ${srcdir}/gcc; then
   # and make the substitution.
   case ,${enable_languages}, in
     *,f95,*)
-      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
+      echo configure.ac: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
       enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
       ;;
   esac
@@ -2455,7 +2455,7 @@ fi
 # have requested that this magic not happen.
 # 
 # The command line options always override the explicit settings in 
-# configure.in, and the settings in configure.in override this magic.
+# configure.ac, and the settings in configure.ac override this magic.
 #
 # If the default for a toolchain is to use GNU as and ld, and you don't 
 # want to do that, then you should use the --without-gnu-as and
diff --git a/src-release.sh b/src-release.sh
index 40d0126..9668a1a 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -48,7 +48,7 @@ DEVO_SUPPORT="README Makefile.in configure configure.ac \
 	COPYING3 COPYING3.LIB"
 
 # Files in devo/etc used in any net release.
-ETC_SUPPORT="Makefile.in configure configure.in standards.texi \
+ETC_SUPPORT="Makefile.in configure configure.ac standards.texi \
 	make-stds.texi standards.info* configure.texi configure.info* \
 	ChangeLog configbuild.* configdev.* fdl.texi texi2pod.pl gnu-oids.texi"
 
-- 
2.4.4