FYI: 84-gary-gnu-version-standards.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Appied to HEAD.
- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQE/y2TVFRMICSmD1gYRAlUCAJ9H4zL6zAOhm5S04JgVu6N5f7TTPACaApod
9TmrB4G5URi189u014lijSI=
=o/9R
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * config/mkstamp: Updated from CVS libtool.
        * configure.ac: Generate a gnu coding standards compliant version
        number, and use it for the banner.
        * Makefile.am (stamp-vcl): New rules to force m4 to be regenerated
        mhen the TIMESTAMP changes in ChangeLog, but the file modification
        time doesn't (e.g. in cvs commit).  Otherwise dist tarballs will
        contain the previous version number.
        * src/main.c: Make --version output conform to the GNU standard.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- Makefile.am 7 Oct 2003 14:10:07 -0000 1.16
+++ Makefile.am 1 Dec 2003 15:51:33 -0000
@@ -29,6 +29,21 @@ MAINTAINERCLEANFILES = ABOUT-NLS COPYING
                          config-h.in configure stamp-h.in \
                          po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
 
+# Make sure config.status is regenerated when the version timestamp changes
+MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
+CONFIG_STATUS_DEPENDENCIES = stamp-vcl
+stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
+vcl.tmp:
+       @dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \
+       set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
+       echo "$$1" > vcl.tmp; \
+       cmp -s vcl.tmp $$dir/stamp-vcl \
+## If mkstamp does not match $(srcdir)/stamp-vcl, we still put the new one
+## in the current dir, incase $(srcdir) is not writable.  The dir selection
+## at the top of this rule takes care of prefering the right one on
+## subsequent runs.
+         || (echo "Updating stamp-vcl"; cp vcl.tmp ./stamp-vcl)
+       address@hidden -f vcl.tmp
 
 ##                                                                      ##
 ##                   --- RULES FOR THE MAINTAINER ---                   ##
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.31
diff -u -p -u -r1.31 configure.ac
--- configure.ac 1 Dec 2003 15:00:44 -0000 1.31
+++ configure.ac 1 Dec 2003 15:51:33 -0000
@@ -38,7 +38,8 @@ TIMESTAMP=
 case AC_PACKAGE_VERSION in
   *[[acegikmoqsuwy]])
     TIMESTAMP=`$CONFIG_SHELL config/mkstamp < $srcdir/ChangeLog`
-    AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION$TIMESTAMP])
+    test -z "$TIMESTAMP" || TIMESTAMP=" (Build:$TIMESTAMP)"
+    AS_BOX([Configuring AC_PACKAGE_TARNAME][$TIMESTAMP AC_PACKAGE_VERSION])
     echo
     ;;
 esac
Index: config/mkstamp
===================================================================
RCS file: /cvsroot/m4/m4/config/mkstamp,v
retrieving revision 1.1
diff -u -p -u -r1.1 mkstamp
--- config/mkstamp 30 Sep 2001 14:23:27 -0000 1.1
+++ config/mkstamp 1 Dec 2003 15:51:34 -0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # mkstamp - extract data from Revision and Date RCS tags in a file
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2003 Free Software Foundation, Inc.
 # Alexandre Oliva <address@hidden>
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -24,14 +24,14 @@
 # the same distribution terms that you use for the rest of that program.
 
 # This script expects to find a line containing both Revision and Date
-# tags, and it edits this line so that it looks line ` ($rev $date)'
+# tags, and it edits this line so that it looks like ` $rev $date'
 
 # Command-line arguments are passed down to sed; additional -e cmd
 # arguments are acceptable.  If no input filename is specified in the
 # command line, sed will read from stdin.
 
 exec sed -e '
-       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% (\1 \2)%
+       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% \1 \2%
        t end
        d
        : end' ${1+"$@"}
Index: src/main.c
===================================================================
RCS file: /cvsroot/m4/m4/src/main.c,v
retrieving revision 1.56
diff -u -p -u -r1.56 main.c
--- src/main.c 8 Oct 2003 14:46:15 -0000 1.56
+++ src/main.c 1 Dec 2003 15:51:34 -0000
@@ -374,8 +374,8 @@ main (int argc, char *const *argv, char 
 
   if (show_version)
     {
-      version_etc (stdout, NULL, "GNU " PACKAGE, VERSION TIMESTAMP,
-                  "Rene' Seindal", "Gary V. Vaughan", NULL);
+      version_etc (stdout, NULL, "GNU " PACKAGE TIMESTAMP,
+                  VERSION, "Rene' Seindal", "Gary V. Vaughan", NULL);
       exit (EXIT_SUCCESS);
     }