diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rwxr-xr-x | libjava/configure | 4 | ||||
| -rw-r--r-- | libjava/configure.ac (renamed from libjava/configure.in) | 2 | ||||
| -rw-r--r-- | libjava/gcj/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 2 | ||||
| -rw-r--r-- | libjava/testsuite/Makefile.in | 2 |
8 files changed, 15 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 102a19c..d0cba5f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 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. * aclocal.m4, configure: Regenerated. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index bec9cdd..2c918b0 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 81a73da..19b8d8d 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 index 59e5cd3..e33884e 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 b189378..a8dfb7b 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 3ef1555..04fd0c6 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 fa21fff..bb52dbc 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 f386269..5f96799 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 \ |