From 6b1786aa65f71d94362d38ada4bf96b6841a59cb Mon Sep 17 00:00:00 2001
From: Jeff Law <law@gcc.gnu.org>
Date: Fri, 24 Jul 2015 12:20:44 -0600
Subject: [PATCH] re PR other/66259 (Combined gcc and binutils build from
git-master fails, with gas/as-new not existing)
PR other/66259
* config-ml.in: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
boehm-gc/
PR other/66259
* Makefile.direct: Reflects renaming of configure.in to configure.ac
* Makefile.dist: Likewise
* version.h: Likewise
* doc/README: Likewise
config/
PR other/66259
* gettext.m4: Reflects renaming of configure.in to configure.ac
* po.m4: Likewise
* stdint.m4: Likewise
* tcl.m4: Likewise
gcc/
PR other/66259
* acinclude.m4: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
* doc/install.texi: Likewise
* doc/tm.texi: Likewise
* doc/tm.texi.in: Likewise
gcc/ada/
PR other/66259
* prj-nmsc.adb: Reflects renaming of configure.in to configure.ac
* gcc-interface/Makefile.in: Likewise
intl/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
libjava/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
libjava/classpath
PR other/66259
* INSTALL: Reflects renaming of configure.in to configure.ac
* ltconfig: Likewise
* missing: Likewise
* m4/ac_prog_javac.m4: Likewise
* m4/ac_prog/javac_works.m4: Likewise
* resource/META-INF/mimetypes.default: Likewise
libjava/libltdl
PR other/66259
* THREADS: Reflects renaming of configure.in to configure.ac
liboffloadmic/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
From-SVN: r226183
---
ChangeLog | 7 +++++++
boehm-gc/ChangeLog | 8 ++++++++
boehm-gc/Makefile.direct | 2 +-
boehm-gc/Makefile.dist | 2 +-
boehm-gc/doc/README | 2 +-
boehm-gc/version.h | 4 ++--
config-ml.in | 6 +++---
config/ChangeLog | 8 ++++++++
config/gettext.m4 | 4 ++--
config/po.m4 | 4 ++--
config/stdint.m4 | 2 +-
config/tcl.m4 | 4 ++--
configure | 8 ++++----
configure.ac | 8 ++++----
gcc/ChangeLog | 10 ++++++++++
gcc/acinclude.m4 | 2 +-
gcc/ada/ChangeLog | 6 ++++++
gcc/ada/gcc-interface/Makefile.in | 2 +-
gcc/ada/prj-nmsc.adb | 2 +-
gcc/configure | 14 +++++++-------
gcc/configure.ac | 12 ++++++------
gcc/doc/install.texi | 2 +-
gcc/doc/tm.texi | 2 +-
gcc/doc/tm.texi.in | 2 +-
intl/ChangeLog | 5 +++++
intl/configure | 4 ++--
libjava/ChangeLog | 5 +++++
libjava/classpath/ChangeLog | 10 ++++++++++
libjava/classpath/INSTALL | 7 +++----
libjava/classpath/ltconfig | 2 +-
libjava/classpath/m4/ac_prog_javac.m4 | 4 ++--
libjava/classpath/m4/ac_prog_javac_works.m4 | 2 +-
libjava/classpath/missing | 15 +++++----------
.../classpath/resource/META-INF/mimetypes.default | 2 +-
libjava/configure | 2 +-
libjava/libltdl/ChangeLog | 5 +++++
libjava/libltdl/missing | 15 +++++----------
libobjc/THREADS | 2 +-
liboffloadmic/ChangeLog | 5 +++++
liboffloadmic/configure | 2 +-
40 files changed, 134 insertions(+), 76 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1acacbdf2631..82dac08bacd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * config-ml.in: Reflects renaming of configure.in to configure.ac
+ * configure: Likewise
+ * configure.ac: Likewise
+
2015-07-23 Bernd Schmidt <bernds_cb1@t-online.de>
* MAINTAINERS: Update my email address.
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 8c8906b6ab80..4a7ca3909938 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * Makefile.direct: Reflects renaming of configure.in to configure.ac
+ * Makefile.dist: Likewise
+ * version.h: Likewise
+ * doc/README: Likewise
+
2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
* Makefile.in: Regenerated with automake-1.11.6.
diff --git a/boehm-gc/Makefile.direct b/boehm-gc/Makefile.direct
index 1f03b511c3b2..8b4dff1fb73f 100644
--- a/boehm-gc/Makefile.direct
+++ b/boehm-gc/Makefile.direct
@@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
tests/leak_test.c tests/thread_leak_test.c tests/middle.c
-GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
+GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
libtool.m4 install-sh configure.host Makefile.in \
aclocal.m4 config.sub config.guess \
include/Makefile.am include/Makefile.in \
diff --git a/boehm-gc/Makefile.dist b/boehm-gc/Makefile.dist
index 20fa40a9a08c..7105f9353d42 100644
--- a/boehm-gc/Makefile.dist
+++ b/boehm-gc/Makefile.dist
@@ -326,7 +326,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
tests/leak_test.c tests/thread_leak_test.c tests/middle.c
-GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
+GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
libtool.m4 install-sh configure.host Makefile.in \
aclocal.m4 config.sub config.guess \
include/Makefile.am include/Makefile.in \
diff --git a/boehm-gc/doc/README b/boehm-gc/doc/README
index a19cb3021b0a..eaba6e509d36 100644
--- a/boehm-gc/doc/README
+++ b/boehm-gc/doc/README
@@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
The file linux_threads.c is also
Copyright (c) 1998 by Fergus Henderson. All rights reserved.
-The files Makefile.am, and configure.in are
+The files Makefile.am, and configure.ac are
Copyright (c) 2001 by Red Hat Inc. All rights reserved.
Several files supporting GNU-style builds are copyrighted by the Free
diff --git a/boehm-gc/version.h b/boehm-gc/version.h
index e1fe24bd0abe..9fcbb7b651fb 100644
--- a/boehm-gc/version.h
+++ b/boehm-gc/version.h
@@ -1,4 +1,4 @@
-/* The version here should match that in configure/configure.in */
+/* The version here should match that in configure/configure.ac */
/* Eventually this one may become unnecessary. For now we need */
/* it to keep the old-style build process working. */
#define GC_TMP_VERSION_MAJOR 6
@@ -14,7 +14,7 @@
GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
-# error Inconsistent version info. Check README, version.h, and configure.in.
+# error Inconsistent version info. Check README, version.h, and configure.ac.
# endif
#else
# define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR
diff --git a/config-ml.in b/config-ml.in
index 927bad66dc09..5e519942b393 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/config/ChangeLog b/config/ChangeLog
index 311378e2e77a..68bafda0cb36 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-24 Micahel Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * gettext.m4: Reflects renaming of configure.in to configure.ac
+ * po.m4: Likewise
+ * stdint.m4: Likewise
+ * tcl.m4: Likewise
+
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
* zlib.m4: Sync with binutils-gdb.
diff --git a/config/gettext.m4 b/config/gettext.m4
index 16070b40a99c..45fa6b4ab76e 100644
--- a/config/gettext.m4
+++ b/config/gettext.m4
@@ -81,7 +81,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then
dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
dnl the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
@@ -303,7 +303,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATOBJEXT)
- dnl For backward compatibility. Some configure.ins may be using this.
+ dnl For backward compatibility. Some configure.acs may be using this.
nls_cv_header_intl=
nls_cv_header_libgt=
diff --git a/config/po.m4 b/config/po.m4
index 2edd5a7d3b47..6ceef420f10a 100644
--- a/config/po.m4
+++ b/config/po.m4
@@ -117,14 +117,14 @@ AC_DEFUN([AM_PO_SUBDIRS],
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
diff --git a/config/stdint.m4 b/config/stdint.m4
index 61898a75fae2..59f435954407 100644
--- a/config/stdint.m4
+++ b/config/stdint.m4
@@ -39,7 +39,7 @@ dnl If your installed header files require the stdint-types you will want to
dnl create an installable file mylib-int.h that all your other installable
dnl header may include. So, for a library package named "mylib", just use
dnl GCC_HEADER_STDINT(mylib-int.h)
-dnl in configure.in and install that header file in Makefile.am along with
+dnl in configure.ac and install that header file in Makefile.am along with
dnl the other headers (mylib.h). The mylib-specific headers can simply
dnl use "#include <mylib-int.h>" to obtain the stdint-types.
dnl
diff --git a/config/tcl.m4 b/config/tcl.m4
index 59a0c7e0a593..4542a4b23d72 100644
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -2136,7 +2136,7 @@ dnl # preprocessing tests use only CPPFLAGS.
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(LIB_FILE))'
fi
-dnl Not at all clear what this was doing in Tcl's configure.in
+dnl Not at all clear what this was doing in Tcl's configure.ac
dnl or why it was needed was needed. In any event, this sort of
dnl things needs to be done in the big loop above.
dnl REMOVE THIS BLOCK LATER! (mdejong)
@@ -3235,7 +3235,7 @@ AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgrnam_r, [
# created. Accumulates.
#
# Requires presence of SC_OUTPUT_COMMANDS_PRE at the end
-# of configure.in (right before AC_OUTPUT).
+# of configure.ac (right before AC_OUTPUT).
#
#--------------------------------------------------------------------
diff --git a/configure b/configure
index 5ba9489d1e91..6d7152eac67b 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 2ff9be008cd0..fbc49ce5b803 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/gcc/ChangeLog b/gcc/ChangeLog
index 5a859634702d..0bf256ac1855 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * acinclude.m4: Reflects renaming of configure.in to configure.ac
+ * configure: Likewise
+ * configure.ac: Likewise
+ * doc/install.texi: Likewise
+ * doc/tm.texi: Likewise
+ * doc/tm.texi.in: Likewise
+
2015-07-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* alias.c (nonoverlapping_memrefs_p): Use std::swap instead of
diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4
index 94da88e4177f..0bcd844fac62 100644
--- a/gcc/acinclude.m4
+++ b/gcc/acinclude.m4
@@ -390,7 +390,7 @@ AC_DEFUN([_gcc_COMPUTE_GAS_VERSION],
[gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
for f in $gcc_cv_as_bfd_srcdir/configure \
$gcc_cv_as_gas_srcdir/configure \
- $gcc_cv_as_gas_srcdir/configure.in \
+ $gcc_cv_as_gas_srcdir/configure.ac \
$gcc_cv_as_gas_srcdir/Makefile.in ; do
gcc_cv_gas_version=`sed -n -e 's/^[[ ]]*VERSION=[[^0-9A-Za-z_]]*\([[0-9]]*\.[[0-9]]*.*\)/VERSION=\1/p' < $f`
if test x$gcc_cv_gas_version != x; then
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 73ec8dee67d6..60a7e692d370 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-24 Micahel Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * prj-nmsc.adb: Reflects renaming of configure.in to configure.ac
+ * gcc-interface/Makefile.in: Likewise
+
2015-07-12 Aldy Hernandez <aldyh@redhat.com>
* gcc-interface/utils.c: Fix double word typos.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 6e24fa5c67c7..1d03f865f6cd 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -148,7 +148,7 @@ GCC_CFLAGS = $(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS)
# We don't use cross-make. Instead we use the tools from the build tree,
# if they are available.
-# program_transform_name and objdir are set by configure.in.
+# program_transform_name and objdir are set by configure.ac.
program_transform_name =
objdir = .
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index c7a5d3c92c8e..6c9db4603396 100644
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -580,7 +580,7 @@ package body Prj.Nmsc is
Canonical_Case_File_Name (Suf);
-- The file name must end with the suffix (which is not an extension)
- -- For instance a suffix "configure.in" must match a file with the
+ -- For instance a suffix "configure.ac" must match a file with the
-- same name. To avoid dummy cases, though, a suffix starting with
-- '.' requires a file that is at least one character longer ('.cpp'
-- should not match a file with the same name).
diff --git a/gcc/configure b/gcc/configure
index 08bce32dc88b..dac5b0747590 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -21681,7 +21681,7 @@ else
if test -x "$DEFAULT_ASSEMBLER"; then
gcc_cv_as="$DEFAULT_ASSEMBLER"
-elif test -f $gcc_cv_as_gas_srcdir/configure.in \
+elif test -f $gcc_cv_as_gas_srcdir/configure.ac \
&& test -f ../gas/Makefile \
&& test x$build = x$host; then
gcc_cv_as=../gas/as-new$build_exeext
@@ -21754,7 +21754,7 @@ $as_echo "newly built gas" >&6; }
gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
for f in $gcc_cv_as_bfd_srcdir/configure \
$gcc_cv_as_gas_srcdir/configure \
- $gcc_cv_as_gas_srcdir/configure.in \
+ $gcc_cv_as_gas_srcdir/configure.ac \
$gcc_cv_as_gas_srcdir/Makefile.in ; do
gcc_cv_gas_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f`
if test x$gcc_cv_gas_version != x; then
@@ -21844,7 +21844,7 @@ elif test $install_gold_as_default = yes \
&& test -f ../gold/Makefile \
&& test x$build = x$host; then
gcc_cv_ld=../gold/ld-new$build_exeext
-elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
+elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \
&& test -f ../ld/Makefile \
&& test x$build = x$host; then
gcc_cv_ld=../ld/ld-new$build_exeext
@@ -21960,7 +21960,7 @@ $as_echo "newly built ld" >&6; }
elif test "$ld_is_gold" = yes; then
in_tree_ld_is_elf=yes
fi
- for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
+ for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac $gcc_cv_ld_gld_srcdir/Makefile.in
do
gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f`
if test x$gcc_cv_gld_version != x; then
@@ -21993,7 +21993,7 @@ if test "${gcc_cv_nm+set}" = set; then :
else
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -f $gcc_cv_binutils_srcdir/configure.ac \
&& test -f ../binutils/Makefile \
&& test x$build = x$host; then
gcc_cv_nm=../binutils/nm-new$build_exeext
@@ -22072,7 +22072,7 @@ if test "${gcc_cv_objdump+set}" = set; then :
else
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -f $gcc_cv_binutils_srcdir/configure.ac \
&& test -f ../binutils/Makefile \
&& test x$build = x$host; then
# Single tree build which includes binutils.
@@ -22144,7 +22144,7 @@ if test "${gcc_cv_readelf+set}" = set; then :
else
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -f $gcc_cv_binutils_srcdir/configure.ac \
&& test -f ../binutils/Makefile \
&& test x$build = x$host; then
# Single tree build which includes binutils.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 326bb5988b2d..3359f10c87eb 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2091,7 +2091,7 @@ m4_pattern_allow([AS_FOR_TARGET])dnl
AS_VAR_SET_IF(gcc_cv_as,, [
if test -x "$DEFAULT_ASSEMBLER"; then
gcc_cv_as="$DEFAULT_ASSEMBLER"
-elif test -f $gcc_cv_as_gas_srcdir/configure.in \
+elif test -f $gcc_cv_as_gas_srcdir/configure.ac \
&& test -f ../gas/Makefile \
&& test x$build = x$host; then
gcc_cv_as=../gas/as-new$build_exeext
@@ -2180,7 +2180,7 @@ elif test $install_gold_as_default = yes \
&& test -f ../gold/Makefile \
&& test x$build = x$host; then
gcc_cv_ld=../gold/ld-new$build_exeext
-elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
+elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \
&& test -f ../ld/Makefile \
&& test x$build = x$host; then
gcc_cv_ld=../ld/ld-new$build_exeext
@@ -2244,7 +2244,7 @@ if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext \
elif test "$ld_is_gold" = yes; then
in_tree_ld_is_elf=yes
fi
- for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
+ for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac $gcc_cv_ld_gld_srcdir/Makefile.in
do
changequote(,)dnl
gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f`
@@ -2277,7 +2277,7 @@ AC_SUBST(ORIGINAL_LD_GOLD_FOR_TARGET)
# Figure out what nm we will be using.
gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils
AS_VAR_SET_IF(gcc_cv_nm,, [
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -f $gcc_cv_binutils_srcdir/configure.ac \
&& test -f ../binutils/Makefile \
&& test x$build = x$host; then
gcc_cv_nm=../binutils/nm-new$build_exeext
@@ -2309,7 +2309,7 @@ esac
# Figure out what objdump we will be using.
AS_VAR_SET_IF(gcc_cv_objdump,, [
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -f $gcc_cv_binutils_srcdir/configure.ac \
&& test -f ../binutils/Makefile \
&& test x$build = x$host; then
# Single tree build which includes binutils.
@@ -2334,7 +2334,7 @@ fi
# Figure out what readelf we will be using.
AS_VAR_SET_IF(gcc_cv_readelf,, [
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -f $gcc_cv_binutils_srcdir/configure.ac \
&& test -f ../binutils/Makefile \
&& test x$build = x$host; then
# Single tree build which includes binutils.
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 212008ab6a9d..772ff19c9d35 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -2108,7 +2108,7 @@ machine. In general, if the Java front end is enabled, the GCJ
libraries will be enabled too, unless they're known to not work on
the target platform. If GCJ is enabled but @samp{libgcj} isn't built, you
may need to port it; in this case, before modifying the top-level
-@file{configure.in} so that @samp{libgcj} is enabled by default on this platform,
+@file{configure.ac} so that @samp{libgcj} is enabled by default on this platform,
you may use @option{--enable-libgcj} to override the default.
@end table
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index b911b7d4e260..f95646c4798b 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -412,7 +412,7 @@ If defined, this macro is an additional prefix to try after
@code{STANDARD_EXEC_PREFIX}. @code{MD_EXEC_PREFIX} is not searched
when the compiler is built as a cross
compiler. If you define @code{MD_EXEC_PREFIX}, then be sure to add it
-to the list of directories used to find the assembler in @file{configure.in}.
+to the list of directories used to find the assembler in @file{configure.ac}.
@end defmac
@defmac STANDARD_STARTFILE_PREFIX
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index 47550cc98610..2383fb97a96c 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -410,7 +410,7 @@ If defined, this macro is an additional prefix to try after
@code{STANDARD_EXEC_PREFIX}. @code{MD_EXEC_PREFIX} is not searched
when the compiler is built as a cross
compiler. If you define @code{MD_EXEC_PREFIX}, then be sure to add it
-to the list of directories used to find the assembler in @file{configure.in}.
+to the list of directories used to find the assembler in @file{configure.ac}.
@end defmac
@defmac STANDARD_STARTFILE_PREFIX
diff --git a/intl/ChangeLog b/intl/ChangeLog
index eec6b8ecba18..ce24e28d0ca2 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-24 Micahel Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * configure: Reflects renaming of configure.in to configure.ac
+
2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
* aclocal.m4: Regenerated with automake-1.11.6.
diff --git a/intl/configure b/intl/configure
index 34da38bed7d2..f58226d96195 100755
--- a/intl/configure
+++ b/intl/configure
@@ -7851,14 +7851,14 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
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
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 02b7ce75a65c..0d7519559e36 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * configure: Reflects renaming of configure.in to configure.ac
+
2015-05-28 Andreas Tobler <andreast@gcc.gnu.org>
* configure.host: Add bits for FreeBSD amd64 and i386.
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 819207684b60..2708b063799e 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,13 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * INSTALL: Reflects renaming of configure.in to configure.ac
+ * ltconfig: Likewise
+ * missing: Likewise
+ * m4/ac_prog_javac.m4: Likewise
+ * m4/ac_prog/javac_works.m4: Likewise
+ * resource/META-INF/mimetypes.default: Likewise
+
2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
* Makefile.in: Regenerated with automake-1.11.6.
diff --git a/libjava/classpath/INSTALL b/libjava/classpath/INSTALL
index 7d1c323beae7..b39583e75af2 100644
--- a/libjava/classpath/INSTALL
+++ b/libjava/classpath/INSTALL
@@ -43,10 +43,9 @@ be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+ The file `configure.ac' is used to create `configure' by a program
+called `autoconf'. You need `configure.ac' if you want to change it or
+regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
diff --git a/libjava/classpath/ltconfig b/libjava/classpath/ltconfig
index 743d95135fb8..d3189576271d 100755
--- a/libjava/classpath/ltconfig
+++ b/libjava/classpath/ltconfig
@@ -1588,7 +1588,7 @@ fi
echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
-# configure.in, otherwise build static only libraries.
+# configure.ac, otherwise build static only libraries.
case $host_os in
cygwin* | mingw* | pw32* | os2*)
if test x$can_build_shared = xyes; then
diff --git a/libjava/classpath/m4/ac_prog_javac.m4 b/libjava/classpath/m4/ac_prog_javac.m4
index 0f8f226efbd7..853c30bd09dd 100644
--- a/libjava/classpath/m4/ac_prog_javac.m4
+++ b/libjava/classpath/m4/ac_prog_javac.m4
@@ -7,7 +7,7 @@ dnl ones.
dnl
dnl If you want to force a specific compiler:
dnl
-dnl - at the configure.in level, set JAVAC=yourcompiler before calling
+dnl - at the configure.ac level, set JAVAC=yourcompiler before calling
dnl AC_PROG_JAVAC
dnl
dnl - at the configure level, setenv JAVAC
@@ -25,7 +25,7 @@ dnl programs. It is VERY IMPORTANT that you download the whole set,
dnl some macros depend on other. Unfortunately, the autoconf archive
dnl does not support the concept of set of macros, so I had to break it
dnl for submission. The general documentation, as well as the sample
-dnl configure.in, is included in the AC_PROG_JAVA macro.
+dnl configure.ac, is included in the AC_PROG_JAVA macro.
dnl
dnl @category Java
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
diff --git a/libjava/classpath/m4/ac_prog_javac_works.m4 b/libjava/classpath/m4/ac_prog_javac_works.m4
index 7fb298d49be5..849cb57514e1 100644
--- a/libjava/classpath/m4/ac_prog_javac_works.m4
+++ b/libjava/classpath/m4/ac_prog_javac_works.m4
@@ -7,7 +7,7 @@ dnl programs. It is VERY IMPORTANT that you download the whole set,
dnl some macros depend on other. Unfortunately, the autoconf archive
dnl does not support the concept of set of macros, so I had to break it
dnl for submission. The general documentation, as well as the sample
-dnl configure.in, is included in the AC_PROG_JAVA macro.
+dnl configure.ac, is included in the AC_PROG_JAVA macro.
dnl
dnl @category Java
dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
diff --git a/libjava/classpath/missing b/libjava/classpath/missing
index 28055d2ae6f2..889aad0fd2fc 100755
--- a/libjava/classpath/missing
+++ b/libjava/classpath/missing
@@ -36,11 +36,6 @@ sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
msg="missing on your system"
@@ -150,7 +145,7 @@ case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ you modified \`acinclude.m4' or \`configure.ac'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -159,7 +154,7 @@ WARNING: \`$1' is $msg. You should only need it if
autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
+ you modified \`configure.ac'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -168,10 +163,10 @@ WARNING: \`$1' is $msg. You should only need it if
autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ you modified \`acconfig.h' or \`configure.ac'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.ac`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -187,7 +182,7 @@ WARNING: \`$1' is $msg. You should only need it if
automake*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`configure.ac'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
diff --git a/libjava/classpath/resource/META-INF/mimetypes.default b/libjava/classpath/resource/META-INF/mimetypes.default
index aa87b4215193..284ea2b8b87a 100644
--- a/libjava/classpath/resource/META-INF/mimetypes.default
+++ b/libjava/classpath/resource/META-INF/mimetypes.default
@@ -2,7 +2,7 @@
# A simple, old format, mime.types file
#
#
-# It would be cool to have this auto-generated by configure.in
+# It would be cool to have this auto-generated by configure.ac
# depending on some dependancy somehow
#
text/html html htm
diff --git a/libjava/configure b/libjava/configure
index 141b213c4201..64aa64bca31f 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -28275,7 +28275,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
ac_sub_configure=$ac_srcdir/configure.gnu
elif test -f "$ac_srcdir/configure"; then
ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
+ elif test -f "$ac_srcdir/configure.ac"; then
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog
index c2285c032c30..534814586c8c 100644
--- a/libjava/libltdl/ChangeLog
+++ b/libjava/libltdl/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-24 Michael Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * THREADS: Reflects renaming of configure.in to configure.ac
+
2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
* Makefile.in: Regenerated with automake-1.11.6.
diff --git a/libjava/libltdl/missing b/libjava/libltdl/missing
index 64b5f901dd55..0454cb0a8b77 100755
--- a/libjava/libltdl/missing
+++ b/libjava/libltdl/missing
@@ -36,11 +36,6 @@ run=:
# In the cases where this matters, `missing' is being run in the
# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
msg="missing on your system"
@@ -139,7 +134,7 @@ case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ you modified \`acinclude.m4' or \`configure.ac'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -148,7 +143,7 @@ WARNING: \`$1' is $msg. You should only need it if
autoconf)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
+ you modified \`configure.ac'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -157,10 +152,10 @@ WARNING: \`$1' is $msg. You should only need it if
autoheader)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ you modified \`acconfig.h' or \`configure.ac'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.ac`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -176,7 +171,7 @@ WARNING: \`$1' is $msg. You should only need it if
automake*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`configure.ac'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
diff --git a/libobjc/THREADS b/libobjc/THREADS
index 5004b2cbcfe8..4e068c41dd6a 100644
--- a/libobjc/THREADS
+++ b/libobjc/THREADS
@@ -108,7 +108,7 @@ this thread backend is able to automatically switch to non-multi-threaded
mode if the threading library is not linked in.
If you want to compile libobjc standalone, then you would need to modify
-the configure.in and makefiles for it and you need to import the
+the configure.ac and makefiles for it and you need to import the
gthread code from GCC.
******************************************************************************
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog
index a641dd39db89..edce5cd57cad 100644
--- a/liboffloadmic/ChangeLog
+++ b/liboffloadmic/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-24 Micahel Darling <darlingm@gmail.com>
+
+ PR other/66259
+ * configure: Reflects renaming of configure.in to configure.ac
+
2015-07-17 Nathan Sidwell <nathan@acm.org>
Ilya Verbin <iverbin@gmail.com>
diff --git a/liboffloadmic/configure b/liboffloadmic/configure
index f862db5748e8..bcec118fb748 100644
--- a/liboffloadmic/configure
+++ b/liboffloadmic/configure
@@ -17076,7 +17076,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
ac_sub_configure=$ac_srcdir/configure.gnu
elif test -f "$ac_srcdir/configure"; then
ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
+ elif test -f "$ac_srcdir/configure.ac"; then
# This should be Cygnus configure.
ac_sub_configure=$ac_aux_dir/configure
else
--
GitLab