Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.205' '-r1.206' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/07/02 13:06:36	1.205
+++ ChangeLog	2004/07/19 07:41:34	1.206
@@ -9,6 +9,14 @@
 
  ChangeLog
 
+ Changes between 2.0.0 and 2.0.1 (02-Jul-2004 to xx-XXX-2004):
+
+   *) Added M4 language output to "shtool version".
+      [James Rowe <Jay@jnrowe.ukfsn.org>]
+
+   *) Fixed AC_PROG_SHTOOL definition in shtool.m4.
+      [James Rowe <Jay@jnrowe.ukfsn.org>]
+
  Changes between 2.0b4 and 2.0.0 (08-May-2004 to 02-Jul-2004):
 
    *) Add -w/--warning option to "shtool subst" command which
Index: ossp-pkg/shtool/THANKS
RCS File: /v/ossp/cvs/ossp-pkg/shtool/THANKS,v
rcsdiff -q -kk '-r1.32' '-r1.33' -u '/v/ossp/cvs/ossp-pkg/shtool/THANKS,v' 2>/dev/null
--- THANKS	2004/02/12 16:06:26	1.32
+++ THANKS	2004/07/19 07:41:34	1.33
@@ -30,6 +30,7 @@
   o Liones                   <liones@myrealbox.com>
   o Thomas Lotterer          <thomas@lotterer.net>
   o Markus F.X.J. Oberhumer  <markus.oberhumer@jk.uni-linz.ac.at>
+  o James Rowe               <Jay@jnrowe.ukfsn.org>
   o Benjamin Saller          <case@appliedtheory.com>
   o Michael Schloh           <michael@schloh.com>
   o Christoph Schug          <chris@schug.net>
Index: ossp-pkg/shtool/sh.version
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.version,v
rcsdiff -q -kk '-r1.36' '-r1.37' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.version,v' 2>/dev/null
--- sh.version	2004/02/12 16:06:27	1.36
+++ sh.version	2004/07/19 07:41:34	1.37
@@ -260,6 +260,22 @@
             echo >>$file "#endif /* _${filestr}_AS_HEADER_ */"
             echo >>$file ""
             ;;
+        m4 )
+            echo >>$file "##"
+            echo >>$file "##  ${file} -- Version Information for ${name} (syntax: M4)"
+            echo >>$file "##  [automatically generated and maintained by GNU shtool]"
+            echo >>$file "##"
+            echo >>$file ""
+            echo >>$file "m4_define([v_hex],   [${vHex}])"
+            echo >>$file "m4_define([v_short], [${vShort}])"
+            echo >>$file "m4_define([v_long],  [${vLong}])"
+            echo >>$file "m4_define([v_tex],   [${vTeX}])"
+            echo >>$file "m4_define([v_gnu],   [${vGNU}])"
+            echo >>$file "m4_define([v_web],   [${vWeb}])"
+            echo >>$file "m4_define([v_sccs],  [${vSCCS}])"
+            echo >>$file "m4_define([v_rcs],   [${vRCS}])"
+            echo >>$file ""
+            ;;
         perl )
             echo >>$file "##"
             echo >>$file "##  ${file} -- Version Information for ${name} (syntax: Perl)"
@@ -355,8 +371,8 @@
 =item B<-l>, B<--language> I<lang>
 
 Choose format of version file I<file>. I<lang>="C<txt>", ANSI C
-(I<lang>="c"), Perl (I<lang>="perl") or Python (I<lang>="python").
-Default is C<txt>.
+(I<lang>="c"), M4 (I<lang>="m4"), Perl (I<lang>="perl") or Python 
+(I<lang>="python"). Default is C<txt>.
 
 =item B<-n>, B<--name> I<name>
 
Index: ossp-pkg/shtool/shtool.m4
RCS File: /v/ossp/cvs/ossp-pkg/shtool/shtool.m4,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/shtool/shtool.m4,v' 2>/dev/null
--- shtool.m4	2004/01/01 16:54:20	1.6
+++ shtool.m4	2004/07/19 07:41:34	1.7
@@ -22,7 +22,7 @@
 ##  the standard macro for finding GNU shtool:
 ##  AC_PROG_SHTOOL
 ##
-AC_DEFUN(AC_PROG_SHTOOL,[dnl
+AC_DEFUN([AC_PROG_SHTOOL],[dnl
 AC_PREREQ(2.13)dnl
 AC_MSG_CHECKING([for GNU shtool])
 AC_CACHE_VAL(ac_cv_shtool,[dnl