2004-01-09 Kelley Cook <kcook@gcc.gnu.org>

	* configure.in: Rename file to ...
	* configure.ac: ... this.  Add in AC_PREREQ(2.57)
	* config.h.in: Regenerate.
	* aclocal.m4: Regenerate.
	* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75621 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 898d733..c813f36 100644 (file)
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-09  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * configure.in: Rename file to ...
+       * configure.ac: ... this.  Add in AC_PREREQ(2.57)
+       * config.h.in: Regenerate.
+       * aclocal.m4: Regenerate.
+       * Makefile.in: Regenerate.
+
 2004-01-07  Andreas Tobler  <a.tobler@schweiz.ch>
 
        * jartool.c (make_manifest): Fix off-by-one bug when creating

diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in
index 6268072..2e295a2 100644 (file)
--- a/fastjar/Makefile.in
+++ b/fastjar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -223,10 +223,11 @@ TEXINFOS = fastjar.texi
 
 NROFF = nroff
 MANS = $(man_MANS)
-DIST_COMMON = README $(fastjar_TEXINFOS) ../install-sh ../missing \
-       ../mkinstalldirs AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-       Makefile.in NEWS acinclude.m4 aclocal.m4 config.h.in configure \
-       configure.in install-defs.sh.in
+DIST_COMMON = README $(fastjar_TEXINFOS) $(srcdir)/Makefile.in \
+       $(srcdir)/configure ../install-sh ../missing ../mkinstalldirs \
+       AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \
+       aclocal.m4 config.h.in configure configure.ac \
+       install-defs.sh.in
 SOURCES = $(grepjar_SOURCES) $(jar_SOURCES)
 
 all: config.h
@@ -237,7 +238,7 @@ all: config.h
 
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -245,10 +246,10 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.s
 
 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac acinclude.m4
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
@@ -261,7 +262,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
        cd $(top_builddir) && $(SHELL) ./config.status config.h
 
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOHEADER)
        touch $(srcdir)/config.h.in
 
@@ -339,7 +340,7 @@ DVIPS = dvips
 uninstall-info-am:
        $(PRE_UNINSTALL)
        @if (install-info --version && \
-            install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -615,7 +616,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_STRIP_FLAG=-s \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -623,7 +624,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -634,6 +635,7 @@ clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+       -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
        distclean-tags
 
@@ -669,7 +671,7 @@ install-info-am: $(INFO_DEPS)
        done
        @$(POST_INSTALL)
        @if (install-info --version && \
-            install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
+            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -684,6 +686,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
+       -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
        maintainer-clean-generic
 

diff --git a/fastjar/aclocal.m4 b/fastjar/aclocal.m4
index cde8394..d94a708 100644 (file)
--- a/fastjar/aclocal.m4
+++ b/fastjar/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -187,7 +187,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.7.6])])
+        [AM_AUTOMAKE_VERSION([1.7.9])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 

diff --git a/fastjar/config.h.in b/fastjar/config.h.in
index b6f06b3..e10bcca 100644 (file)
--- a/fastjar/config.h.in
+++ b/fastjar/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
 #undef BYTEORDER

diff --git a/fastjar/configure.in b/fastjar/configure.ac
similarity index 99%
rename from fastjar/configure.in
rename to fastjar/configure.ac
index f9e9223..9363034 100644 (file)
--- a/fastjar/configure.in
+++ b/fastjar/configure.ac
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.57)
 AC_INIT(jartool.h)
 AM_INIT_AUTOMAKE(fastjar, 0.92-gcc)
 AM_CONFIG_HEADER(config.h)