diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 102a19c8131ae54e8585d40dfd9ea3ba615d87a3..d0cba5f08e35c0516bb89914dba6b99a832708e7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-20 Michael Koch <konqueror@gmx.de>
+
+ * configure.in: Renamed to configure.ac.
+ * configure.ac: New file.
+ * configure, Makefile.in, gcj/Makefile.in, include/Makefile.in
+ include/config.h.in, testsuite/Makefile.in: Regenerated.
+
2004-08-20 Michael Koch <konqueror@gmx.de>
* configure.in: Rewrote some obsolete stuff for autoconf 2.59.
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index bec9cddf0d97bba2323720473be901f690d2a3af..2c918b0f73f5dabecd5a1ff94c51a0f7549f680c 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/accross.m4 \
$(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/no-executables.m4 \
- $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/libjava/configure b/libjava/configure
index 81a73da8f9b02ead81beaff3e8f77640ee22e20f..19b8d8d554b6102374d3bc917c910d331a77c913 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -13289,8 +13289,8 @@ if test ! -f gnu/classpath/Configuration.java; then
# but we add /dev/null to the input list so that grep will print the
# filename of Configuration.java in case it finds any matches.
if grep @ gnu/classpath/Configuration.java /dev/null; then
- { { echo "$as_me:$LINENO: error: configure.in is missing the substitutions above" >&5
-echo "$as_me: error: configure.in is missing the substitutions above" >&2;}
+ { { echo "$as_me:$LINENO: error: configure.ac is missing the substitutions above" >&5
+echo "$as_me: error: configure.ac is missing the substitutions above" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
diff --git a/libjava/configure.in b/libjava/configure.ac
similarity index 99%
rename from libjava/configure.in
rename to libjava/configure.ac
index 59e5cd3c0cc17a848d007f49bc2d897c4c4e89a0..e33884ed32cecc27f984870d4f3027baafcb6338 100644
--- a/libjava/configure.in
+++ b/libjava/configure.ac
@@ -1105,7 +1105,7 @@ if test ! -f gnu/classpath/Configuration.java; then
# but we add /dev/null to the input list so that grep will print the
# filename of Configuration.java in case it finds any matches.
if grep @ gnu/classpath/Configuration.java /dev/null; then
- AC_MSG_ERROR([configure.in is missing the substitutions above])
+ AC_MSG_ERROR([configure.ac is missing the substitutions above])
fi
fi
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index b189378183f506f52534ed45dddd375b000d91de..a8dfb7bb22b8e05540d05cb973656de6ac1dc66e 100644
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/accross.m4 \
$(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/no-executables.m4 \
- $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
CONFIG_HEADER = $(top_builddir)/include/config.h libgcj-config.h
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index 3ef1555c6b5d1b19db69a396b5fc71f9f41ba820..04fd0c6eb1ce9c5d52cda298db2eb56fc4b7969b 100644
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/accross.m4 \
$(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/no-executables.m4 \
- $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h
diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in
index fa21fffe00c6e88f60ff9c5e3d1abec934c2ae17..bb52dbcba360674708409f360d9882362a1c59ef 100644
--- a/libjava/include/config.h.in
+++ b/libjava/include/config.h.in
@@ -1,4 +1,4 @@
-/* include/config.h.in. Generated from configure.in by autoheader. */
+/* include/config.h.in. Generated from configure.ac by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index f386269e3e10361e79a9803941a48e40a58b9678..5f9679922f13f10a6bcd567e7f5cd9d669b4ba7b 100644
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/../config/accross.m4 \
$(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/no-executables.m4 \
- $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
CONFIG_HEADER = $(top_builddir)/include/config.h \