config:

	* gcc-version.m4: Delete.
fastjar:
	* Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi.
	(BASEVER, DEVPHASE): New variables.
	(POD2MAN): Adjust setting of --release option.
	(fastjar.1, grepjar.1, gcc-vers.texi): New rules.
	* Makefile.in: Regenerate.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
	* aclocal.m4, configure: Regenerate.
gcc:
	* BASE-VER, DATESTAMP, DEV-PHASE: New files.
	* Makefile.in (gcc_version, gcc_version_trigger, ): Delete.
	(BASEVER, DEVPHASE, DATESTAMP, BASEVER_c, DEVPHASE_c, DATESTAMP_c)
	(BASEVER_s, DEVPHASE_s, DATESTAMP_s): New variables.
	(version): Define using $(BASEVER_c).
	(Makefile, config.status, build/gcov-iov.o): No longer depends on
	version.c.
	(version.o): Depend on version files; add custom generation command.
	(prefix.o): Define BASEVER on command line.
	(s-iov): Depend on version files; adjust command.
	(TEXI_CPP_FILES, TEX_IGCC_FILES, TEXI_GCCINT_FILES, TEXI_CPPINT_FILES):
	Add gcc-vers.texi.
	(gcc-vers.texi): New rule.
	(doc/%.info, doc/%.dvi): Add -I . to command line.
	(doc/gccinstall.dvi): Likewise.
	(PACKAGE): Delete.  All uses replaced with "gcc".
	* aclocal.m4: Do not include gcc-version.m4.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
	Do not AC_SUBST nor AC_DEFINE PACKAGE or VERSION.
	Set is_release based on contents of DEV-PHASE.
	Set gcc_version based on contents of BASE-VER.
	Define WIN32_REGISTRY_KEY only if the user overrode the default.
	* config.in, configure: Regenerate.
	* gccbug.in: Determine version of GCC in use at runtime.
	* gcov-iov.c: Get version number and development phase from
	command line, not by including version.c.
	* intl.c: Replace all uses of PACKAGE with "gcc".
	* libada-mk.in: Delete unused "gcc_version" variable.
	* prefix.c: Default WIN32_REGISTRY_KEY to BASEVER.
	* version.c: (VERSUFFIX): New hook for redistributors; adjust
	commentary to match.
	(version_string): Put together from pieces.
	* config/alpha/x-vms: Do not use $(gcc_version).
	* config/i386/t-nwld: Likewise.
	* doc/include/gcc-common.texi: Include gcc-vers.texi for
	version-GCC and DEVELOPMENT.
gcc/ada:
	* Make-lang.in (doc/gnat_ugn_unw.info, doc/gnat_rm.info)
	(doc/gnat_ugn_unw.dvi, doc/gnat_rm.dvi): Add gcc-vers.texi
	to dependencies.
gcc/fortran:
	* Make-lang.in (GFORTRAN_TEXI): Add gcc-vers.texi.
gcc/java:
	* Make-lang.in (TEXI_JAVA_FILES): Add gcc-vers.texi.
gcc/treelang:
	* Make-lang.in (TEXI_TREELANG_FILES): Add gcc-vers.texi.
libstdc++-v3:
	* include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc
	subdirectory.  Generate #define of __GLIBCXX__ from contents of
	that file.
	* include/Makefile.in: Regenerate.
	* include/bits/c++config: Do not define __GLIBCXX__.
maintainer-scripts:
	* README: Update.
	* gcc_release: Update gcc/DEV-PHASE if that file exists, instead
	of gcc/version.c.
	* update_version: Handle updating gcc/DATESTAMP.
	* update_web_docs: Generate gcc-vers.texi first.


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

6 files changed, 80 insertions, 68 deletions

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index a429a6369cb..2adedb2af45 100644
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-15  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi.
+	(BASEVER, DEVPHASE): New variables.
+	(POD2MAN): Adjust setting of --release option.
+	(fastjar.1, grepjar.1, gcc-vers.texi): New rules.
+	* Makefile.in: Regenerate.
+	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
+	* aclocal.m4, configure: Regenerate.
+
 2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
 
 	* configure.ac: Use TL_AC_GCC_VERSION to set gcc_version.
@@ -56,47 +66,47 @@
 
 	* Makefile.in: Regenerate.
 	* fastjar.texi: Update for '-u'.
-	
+
 2004-07-06  Casey Marshall <csm@gnu.org>
 
 	PR 7854
 	* Makefile.am
 	(jar_SOURCES): added shift.c, shift.h.
-        (jar_CPPFLAGS): define WITH_SHIFT_DOWN.
-
-        * compress.c
-        Added FSF copyright.
-        (write_data): new function.
-        (compress_file): call write_data.
-
-        * jartool.c
-        Updated copyright year.
-        (progname): new variable.
-        (end_of_entries): new variable.
-        (main): open and read file when updating.
-        (find_entry): new function.
-        (looks_like_dir): new function.
-        (read_entries): new function.
-        (make_manifest): added parameter `updating'.
-        Call `add_file_to_jar' with `updating'.
-        (add_to_jar_with_dir): added parameter `updating'.
-        Call `add_to_jar' with `updating'.
-        (add_to_jar): added parameter `updating'.
-        Call `add_file_to_jar' with `updating'.
-        Don't add directories if they already exist.
-        (add_file_to_jar): added parameter `updating'.
-        Update entries if they already exist.
-
-        * jartool.h
-        Added #ifndef __FASTJAR_JARTOOL_H__.
-        (struct zipentry): added `flags'.
-
-        * shift.c: new file.
-
-        * shift.h: new file.
-
-        * zipfile.h
-        (CEN_FLAGS): new constant.
+	(jar_CPPFLAGS): define WITH_SHIFT_DOWN.
+
+	* compress.c
+	Added FSF copyright.
+	(write_data): new function.
+	(compress_file): call write_data.
+
+	* jartool.c
+	Updated copyright year.
+	(progname): new variable.
+	(end_of_entries): new variable.
+	(main): open and read file when updating.
+	(find_entry): new function.
+	(looks_like_dir): new function.
+	(read_entries): new function.
+	(make_manifest): added parameter `updating'.
+	Call `add_file_to_jar' with `updating'.
+	(add_to_jar_with_dir): added parameter `updating'.
+	Call `add_to_jar' with `updating'.
+	(add_to_jar): added parameter `updating'.
+	Call `add_file_to_jar' with `updating'.
+	Don't add directories if they already exist.
+	(add_file_to_jar): added parameter `updating'.
+	Update entries if they already exist.
+
+	* jartool.h
+	Added #ifndef __FASTJAR_JARTOOL_H__.
+	(struct zipentry): added `flags'.
+
+	* shift.c: new file.
+
+	* shift.h: new file.
+
+	* zipfile.h
+	(CEN_FLAGS): new constant.
 
 2004-07-05  Kelley Cook  <kcook@gcc.gnu.org>
 
diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am
index fa90753fdea..6e105b5ba59 100644
--- a/fastjar/Makefile.am
+++ b/fastjar/Makefile.am
@@ -63,12 +63,16 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
 info_TEXINFOS = fastjar.texi
 fastjar_TEXINFOS = \
 	../gcc/doc/include/gcc-common.texi \
-	../gcc/doc/include/gpl.texi
+	../gcc/doc/include/gpl.texi \
+	gcc-vers.texi
 man_MANS = fastjar.1 grepjar.1
 EXTRA_DIST = $(man_MANS)
 
+BASEVER = $(srcdir)/../gcc/BASE-VER
+DEVPHASE = $(srcdir)/../gcc/DEV-PHASE
+
 TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
-POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
+POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))"
 
 .pod.1:
 	-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
@@ -83,6 +87,17 @@ fastjar.pod: $(srcdir)/fastjar.texi
 grepjar.pod: $(srcdir)/fastjar.texi
 	-$(TEXI2POD) -D grepjar $< > $@
 
+fastjar.1 grepjar.1: $(BASEVER)
+
+# gcc-vers.texi is generated from the version files.
+gcc-vers.texi: $(BASEVER) $(DEVPHASE)
+	(echo "@set version-GCC $(shell cat $(BASEVER))"; \
+	 if [ "$(shell cat $(DEVPHASE))" = "experimental" ]; \
+	 then echo "@set DEVELOPMENT"; \
+	 else echo "@clear DEVELOPMENT"; \
+	 fi) > $@T
+	mv -f $@T $@
+
 # GCC LOCAL CHANGE
 # The following commands allow us to release tarballs with the man pages
 # and info documentation prebuilt.  This feature is enabled via 
diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in
index 309e5ea70e9..49716a1d5fb 100644
--- a/fastjar/Makefile.in
+++ b/fastjar/Makefile.in
@@ -49,7 +49,6 @@ DIST_COMMON = README $(am__configure_deps) $(fastjar_TEXINFOS) \
 	COPYING ChangeLog INSTALL NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
-	$(top_srcdir)/../config/gcc-version.m4 \
 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -175,9 +174,6 @@ build_alias = @build_alias@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 fastjar_warn_cflags = @fastjar_warn_cflags@
-gcc_version = @gcc_version@
-gcc_version_full = @gcc_version_full@
-gcc_version_trigger = @gcc_version_trigger@
 host_alias = @host_alias@
 includedir = @includedir@
 infodir = @infodir@
@@ -253,12 +249,15 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
 info_TEXINFOS = fastjar.texi
 fastjar_TEXINFOS = \
 	../gcc/doc/include/gcc-common.texi \
-	../gcc/doc/include/gpl.texi
+	../gcc/doc/include/gpl.texi \
+	gcc-vers.texi
 
 man_MANS = fastjar.1 grepjar.1
 EXTRA_DIST = $(man_MANS)
+BASEVER = $(srcdir)/../gcc/BASE-VER
+DEVPHASE = $(srcdir)/../gcc/DEV-PHASE
 TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
-POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
+POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))"
 @GENINSRC_FALSE@STAMP_GENINSRC = 
 
 # GCC LOCAL CHANGE
@@ -924,6 +923,17 @@ fastjar.pod: $(srcdir)/fastjar.texi
 grepjar.pod: $(srcdir)/fastjar.texi
 	-$(TEXI2POD) -D grepjar $< > $@
 
+fastjar.1 grepjar.1: $(BASEVER)
+
+# gcc-vers.texi is generated from the version files.
+gcc-vers.texi: $(BASEVER) $(DEVPHASE)
+	(echo "@set version-GCC $(shell cat $(BASEVER))"; \
+	 if [ "$(shell cat $(DEVPHASE))" = "experimental" ]; \
+	 then echo "@set DEVELOPMENT"; \
+	 else echo "@clear DEVELOPMENT"; \
+	 fi) > $@T
+	mv -f $@T $@
+
 all-local: $(STAMP_GENINSRC) 
 
 stamp-geninsrc: fastjar.1 grepjar.1 fastjar.info
diff --git a/fastjar/aclocal.m4 b/fastjar/aclocal.m4
index 5710bf10775..f8ccf0d9654 100644
--- a/fastjar/aclocal.m4
+++ b/fastjar/aclocal.m4
@@ -1083,5 +1083,4 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([../config/accross.m4])
-m4_include([../config/gcc-version.m4])
 m4_include([acinclude.m4])
diff --git a/fastjar/configure b/fastjar/configure
index 765bee8caca..9ab4cf0184c 100755
--- a/fastjar/configure
+++ b/fastjar/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RM CP CHMOD MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags CPP EGREP ZLIBS ZDEPS ZINCS GENINSRC_TRUE GENINSRC_FALSE gcc_version_trigger gcc_version_full gcc_version LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RM CP CHMOD MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags CPP EGREP ZLIBS ZDEPS ZINCS GENINSRC_TRUE GENINSRC_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -5226,23 +5226,6 @@ else
 fi
 
 
-
-if test "${with_gcc_version_trigger+set}" = set; then
-  gcc_version_trigger=$with_gcc_version_trigger
-else
-  gcc_version_trigger=$srcdir/../gcc/version.c
-fi
-if test -f "${gcc_version_trigger}"; then
-  gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
-else
-  gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
-fi
-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
-
-
-
-
-
                     ac_config_files="$ac_config_files Makefile install-defs.sh"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5948,9 +5931,6 @@ s,@ZDEPS@,$ZDEPS,;t t
 s,@ZINCS@,$ZINCS,;t t
 s,@GENINSRC_TRUE@,$GENINSRC_TRUE,;t t
 s,@GENINSRC_FALSE@,$GENINSRC_FALSE,;t t
-s,@gcc_version_trigger@,$gcc_version_trigger,;t t
-s,@gcc_version_full@,$gcc_version_full,;t t
-s,@gcc_version@,$gcc_version,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/fastjar/configure.ac b/fastjar/configure.ac
index 935c49dfeb6..bdb556d40cb 100644
--- a/fastjar/configure.ac
+++ b/fastjar/configure.ac
@@ -89,6 +89,4 @@ AC_MSG_CHECKING([whether to place generated files in the source directory])
 AC_MSG_RESULT($generated_files_in_srcdir)
 AM_CONDITIONAL(GENINSRC, test x$generated_files_in_srcdir = xyes)
 
-TL_AC_GCC_VERSION([$srcdir/..])
-
 AC_OUTPUT(Makefile install-defs.sh)