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

7 files changed, 23 insertions, 19 deletions

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 819207684b6..2708b063799 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 7d1c323beae..b39583e75af 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 743d95135fb..d3189576271 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 0f8f226efbd..853c30bd09d 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 7fb298d49be..849cb57514e 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 28055d2ae6f..889aad0fd2f 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 aa87b421519..284ea2b8b87 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