gnu/help2man

diff --git a/ChangeLog b/ChangeLog
index 325f806..6290456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-Sun Apr 16 00:18:41 2000  Brendan O'Dea  <bod@diablo>
+Fri Jul  7 16:16:18 2000  Brendan O'Dea  <bod@compusol.com.au>
+
+	* README.sh: Add GNU prefix
+	* aclocal.m4: (add) autoconf support
+	* configure.in: Use AC_PROG_PERL from aclocal.m4 to find perl
+	  (checks for perl and perl5)
+
+	* help2man.PL: Add GNU prefix, bug reporting address
+	* help2man.aux: Remove ozemail URL
+	* help2man.texi: Add GNU prefix, bug reporting address. Remove
+	  ozemail URL
+
+Sun Apr 16 00:18:41 2000  Brendan O'Dea  <bod@compusol.com.au>
 
 	* Makefile.in: Add mkinstalldirs (as reqested by Dave Morrison,
 	  Patrick Tullmann and Mo DeJong)
diff --git a/NEWS b/NEWS
index 72448a8..4a150d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Version 1.022		July 7, 2000
+
+ * help2man is now officially a GNU program.  Add bug reporting
+   address and `GNU' prefix.
+
+ * configure now checks for `perl5' as well as `perl'.
+
+Version 1.021		April 16, 2000
+
+ * Create directories if required (Makefile).
+
 Version 1.020		December 30, 1999
 
  * Remove directory from command name(s) in synopsis.
diff --git a/README b/README
index f073364..89c597f 100644
--- a/README
+++ b/README
@@ -1,16 +1,16 @@
-                          README for help2man
-                             version 1.021
-                             April 16, 2000
+                        README for GNU help2man
+                             version 1.022
+                             July  7, 2000
 
 help2man is a script to create simple man pages from the --help and
 --version output of programs.
 
-  http://www.ozemail.com.au/~bod/help2man.tar.gz
-  ftp://ftp.gnu.org/gnu/help2man/help2man-1.021.tar.gz
+  http://www.gnu.org/software/help2man/
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.022.tar.gz
 
 Since most GNU documentation is now in info format, this provides a
 way to generate a placeholder man page pointing to that resource while
 still providing some useful information.
 
 -- 
-Brendan O'Dea <bod@compusol.com.au>      http://www.ozemail.com.au/~bod/
+Brendan O'Dea <bod@compusol.com.au>
diff --git a/THANKS b/THANKS
index 4aca99e..7389c3a 100644
--- a/THANKS
+++ b/THANKS
@@ -13,3 +13,4 @@ Fran
 Andreas Schwab			<schwab@ls5.informatik.uni-dortmund.de>
 Patrick Tullmann		<tullmann@cs.utah.edu>
 Okuji Yoshinori			<okuji@kuicr.kyoto-u.ac.jp>
+suzukis				<suzukis@cmpt.phys.tohoku.ac.jp>
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..bd34d99
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,36 @@
+dnl Local macros
+dnl $Id: aclocal.m4,v 1.1 2000/07/07 05:41:47 bod Exp $
+
+changequote()
+define(RIGHT_BRACKET, ])
+changequote([, ])
+
+dnl AC_PROG_PERL([MIN-VERSION])
+AC_DEFUN(AC_PROG_PERL,
+[# find perl binary
+AC_MSG_CHECKING([for perl])
+AC_CACHE_VAL(ac_cv_prog_PERL,
+[ifelse([$1],,,[echo "configure:__oline__: ...version $1 required" >&AC_FD_CC
+  ])# allow user to override
+  if test -n "$PERL"; then
+    ac_try="$PERL"
+  else
+    ac_try="perl perl5"
+  fi
+
+  for ac_prog in $ac_try; do
+    echo "configure:__oline__: trying $ac_prog" >&AC_FD_CC
+    if ($ac_prog -e 'printf "found version %g\n",$]RIGHT_BRACKET[dnl
+ifelse([$1],,,[;exit($]RIGHT_BRACKET[<$1)])') 1>&AC_FD_CC 2>&1; then
+      ac_cv_prog_PERL=$ac_prog
+      break
+    fi
+  done])dnl
+PERL="$ac_cv_prog_PERL"
+if test -n "$PERL"; then
+  AC_MSG_RESULT($PERL)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(PERL)dnl
+])dnl
diff --git a/configure b/configure
index cdbebe5..ba94ed2 100755
--- a/configure
+++ b/configure
@@ -521,49 +521,36 @@ else
 fi
 
 
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:528: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+# find perl binary
+echo $ac_n "checking for perl""... $ac_c" 1>&6
+echo "configure:527: checking for perl" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$PERL" in
-  /*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PERL="$ac_dir/$ac_word"
+  echo "configure:531: ...version 5.004 required" >&5
+  # allow user to override
+  if test -n "$PERL"; then
+    ac_try="$PERL"
+  else
+    ac_try="perl perl5"
+  fi
+
+  for ac_prog in $ac_try; do
+    echo "configure:540: trying $ac_prog" >&5
+    if ($ac_prog -e 'printf "found version %g\n",$];exit($]<5.004)') 1>&5 2>&1; then
+      ac_cv_prog_PERL=$ac_prog
       break
     fi
   done
-  IFS="$ac_save_ifs"
-  ;;
-esac
 fi
-PERL="$ac_cv_path_PERL"
+PERL="$ac_cv_prog_PERL"
 if test -n "$PERL"; then
   echo "$ac_t""$PERL" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-if test -z "$PERL"; then
-  { echo "configure: error: perl not found" 1>&2; exit 1; }
-fi
-echo $ac_n "checking perl version""... $ac_c" 1>&6
-echo "configure:564: checking perl version" >&5
-if $PERL -e 'printf "%g\n", $]; exit($] >= 5.004);'; then
-  { echo "configure: error: perl 5.004 required" 1>&2; exit 1; }
-fi
+test -z "$PERL" && { echo "configure: error: perl 5.004 required" 1>&2; exit 1; }
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -595,7 +582,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:599: checking for a BSD compatible install" >&5
+echo "configure:586: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -650,7 +637,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "makeinfo", so it can be a program name with args.
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:654: checking for $ac_word" >&5
+echo "configure:641: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -685,7 +672,7 @@ fi
 # Extract the first word of "install-info", so it can be a program name with args.
 set dummy install-info; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:689: checking for $ac_word" >&5
+echo "configure:676: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_INSTALL_INFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/configure.in b/configure.in
index afe0db9..3b01831 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.2 1999/11/01 10:50:04 bod Exp $
+dnl $Id: configure.in,v 1.3 2000/07/07 06:11:29 bod Exp $
 
 AC_INIT(help2man.PL)
-AC_PATH_PROG(PERL, perl)
-if test -z "$PERL"; then
-  AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING(perl version)
-if $PERL -e 'printf "%g\n", $]; exit($] >= 5.004);'; then
-  AC_MSG_ERROR([perl 5.004 required])
-fi
+AC_PROG_PERL(5.004)
+test -z "$PERL" && AC_MSG_ERROR([perl 5.004 required])
 AC_PROG_INSTALL
 AC_PATH_PROG(MAKEINFO, makeinfo)
 AC_PATH_PROG(INSTALL_INFO, install-info)
diff --git a/help2man.PL b/help2man.PL
index 91bb28d..37238ef 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use Config;
 use Getopt::Long;
 
 my ($program, $version)
-    = (qw$Id: help2man.PL,v 1.21 2000/04/15 14:18:41 bod Exp $)[1..2];
+    = (qw$Id: help2man.PL,v 1.22 2000/07/07 06:16:18 bod Exp $)[1..2];
 
 $program =~ s/\.PL(,v)?$//;
 $version =~ s/\.(\d+)/sprintf "-%03d", $1/e;
@@ -62,7 +62,7 @@ eval 'exec $Config{perlpath} -wS \$0 \${1+"\$@"}'
 print OUT <<'!NO!SUBS!';
 
 # Generate a short man page from --help and --version output.
-# Copyright © 1997, 98, 99 Free Software Foundation, Inc.
+# Copyright © 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -98,9 +98,9 @@ my \$this_version = '$version';
 # No substitutions for the remainder of the script:
 print OUT <<'!NO!SUBS!';
 my $version_info = <<EOT;
-$this_program $this_version
+GNU $this_program $this_version
 
-Copyright (C) 1997, 98, 99 Free Software Foundation, Inc.
+Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -122,6 +122,8 @@ Usage: $this_program [OPTION]... EXECUTABLE
      --version           print version number, then exit
 
 EXECUTABLE should accept `--help' and `--version' options.
+
+Report bugs to <bug-help2man\@gnu.org>.
 EOT
 
 my $section = 1;
diff --git a/help2man.aux b/help2man.aux
index c2d319f..b4f5dee 100644
--- a/help2man.aux
+++ b/help2man.aux
@@ -1,6 +1,6 @@
 Include file for help2man man page
 
-$Id: help2man.aux,v 1.4 1999/10/27 06:02:00 bod Exp $
+$Id: help2man.aux,v 1.5 2000/07/07 06:13:21 bod Exp $
 
 [name]
 help2man \- generate a simple manual page
@@ -68,4 +68,3 @@ the standard sections given above, or included at
 The latest version of this distribution is available on-line from:
 
     ftp://ftp.gnu.org/gnu/help2man/
-    http://www.ozemail.com.au/~bod/help2man.tar.gz
diff --git a/help2man.info b/help2man.info
index 5712578..e173232 100644
--- a/help2man.info
+++ b/help2man.info
@@ -6,10 +6,10 @@ START-INFO-DIR-ENTRY
 * help2man: (help2man).      Automatic manual page generation.
 END-INFO-DIR-ENTRY
 
-   This file documents the `help2man' command which produces simple
+   This file documents the GNU `help2man' command which produces simple
 manual pages from the `--help' and `--version' output of other commands.
 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
    Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -40,13 +40,14 @@ File: help2man.info,  Node: Top,  Next: Overview,  Up: (dir)
 * Invoking help2man::           How to run `help2man'.
 * Including text::              Including additional text in the output.
 * Makefile usage::              Using `help2man' with `make'.
-* Obtaining help2man::          How to obtain `help2man'.
+* Reports::                     Reporting bugs or suggestions.
+* Availability::                Obtaining `help2man'.
 
 
 File: help2man.info,  Node: Overview,  Next: Invoking help2man,  Prev: Top,  Up: Top
 
-Overview
-********
+Overview of `help2man'
+**********************
 
    `help2man' is a tool for automatically generating simple manual
 pages from program output.
@@ -65,8 +66,8 @@ something which resembles a manual page.
 
 File: help2man.info,  Node: Invoking help2man,  Next: Including text,  Prev: Overview,  Up: Top
 
-Invoking help2man
-*****************
+How to Run `help2man'.
+**********************
 
    The format for running the `help2man' program is:
 
@@ -115,8 +116,8 @@ Invoking help2man
 
 File: help2man.info,  Node: Including text,  Next: Makefile usage,  Prev: Invoking help2man,  Up: Top
 
-Including Text
-**************
+Including Additional Text in the Output
+***************************************
 
    Additional static text may be included in the generated manual page
 by using the `--include' and `--opt-include' options (*Note Invoking
@@ -162,10 +163,10 @@ the standard sections given above, or included at *other* (above) in
 the order they were encountered in the include file.
 
 
-File: help2man.info,  Node: Makefile usage,  Next: Obtaining help2man,  Prev: Including text,  Up: Top
+File: help2man.info,  Node: Makefile usage,  Next: Reports,  Prev: Including text,  Up: Top
 
-Makefile Usage
-**************
+Using `help2man' With `make'
+****************************
 
    A suggested use of `help2man' in Makefiles is to have the manual
 page depend not on the binary, but on the source file(s) in which the
@@ -191,25 +192,33 @@ included in the distribution without requiring the end-user to have
    for `autoconf' alone.
 
 
-File: help2man.info,  Node: Obtaining help2man,  Prev: Makefile usage,  Up: Top
+File: help2man.info,  Node: Reports,  Next: Availability,  Prev: Makefile usage,  Up: Top
 
-Obtaining help2man
-******************
+Reporting Bugs or Suggestions
+*****************************
 
-   The latest version of this distribution is available on-line from
-either:
+   If you find problems or have suggestions about this program or
+manual, please report them to <bug-help2man@gnu.org>.
+
+
+File: help2man.info,  Node: Availability,  Prev: Reports,  Up: Top
+
+Obtaining `help2man'
+********************
+
+   The latest version of this distribution is available on-line from:
 
      `ftp://ftp.gnu.org/gnu/help2man/'
-     `http://www.ozemail.com.au/~bod/help2man.tar.gz'
 
 
 
 Tag Table:
-Node: Top1090
-Node: Overview1595
-Node: Invoking help2man2273
-Node: Including text3467
-Node: Makefile usage4891
-Node: Obtaining help2man5792
+Node: Top1100
+Node: Overview1664
+Node: Invoking help2man2370
+Node: Including text3574
+Node: Makefile usage5048
+Node: Reports5966
+Node: Availability6241
 
 End Tag Table
diff --git a/help2man.texi b/help2man.texi
index 71046a1..4b745be 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -5,7 +5,7 @@
 @setchapternewpage odd
 @finalout
 @c %**end of header
-@c $Id: help2man.texi,v 1.3 1999/12/29 14:29:12 bod Exp $
+@c $Id: help2man.texi,v 1.4 2000/07/07 06:15:03 bod Exp $
 
 @dircategory GNU admin
 @direntry
@@ -13,11 +13,11 @@
 @end direntry
 
 @ifinfo
-This file documents the @code{help2man} command which produces simple
-manual pages from the @samp{--help} and @samp{--version} output of other
-commands.
+This file documents the GNU @code{help2man} command which produces
+simple manual pages from the @samp{--help} and @samp{--version} output
+of other commands.
 
-Copyright (C) 1999 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -48,7 +48,7 @@ by the Foundation.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999 Free Software Foundation, Inc.
+Copyright @copyright{} 1999, 2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -77,12 +77,13 @@ and @samp{--version} output of other commands.
 * Invoking help2man::           How to run @code{help2man}.
 * Including text::              Including additional text in the output.
 * Makefile usage::              Using @code{help2man} with @code{make}.
-* Obtaining help2man::          How to obtain @code{help2man}.
+* Reports::                     Reporting bugs or suggestions.
+* Availability::                Obtaining @code{help2man}.
 @end menu
 @end ifinfo
 
 @node Overview
-@chapter Overview
+@chapter Overview of @code{help2man}
 
 @code{help2man} is a tool for automatically generating simple manual
 pages from program output.
@@ -100,7 +101,7 @@ Given a program which produces reasonably standard @samp{--help} and
 into something which resembles a manual page.
 
 @node Invoking help2man
-@chapter Invoking help2man
+@chapter How to Run @code{help2man}.
 
 The format for running the @code{help2man} program is:
 
@@ -151,7 +152,7 @@ Show help or version information.
 @end table
 
 @node Including text
-@chapter Including Text
+@chapter Including Additional Text in the Output
 
 Additional static text may be included in the generated manual page by
 using the @samp{--include} and @samp{--opt-include} options
@@ -203,7 +204,7 @@ the standard sections given above, or included at @emph{other} (above)
 in the order they were encountered in the include file.
 
 @node Makefile usage
-@chapter Makefile Usage
+@chapter Using @code{help2man} With @code{make}
 
 A suggested use of @code{help2man} in Makefiles is to have the manual
 page depend not on the binary, but on the source file(s) in which the
@@ -237,15 +238,19 @@ AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
 
 for @code{autoconf} alone.
 
-@node Obtaining help2man
-@chapter Obtaining help2man
+@node Reports
+@chapter Reporting Bugs or Suggestions
 
-The latest version of this distribution is available on-line from
-either:
+If you find problems or have suggestions about this program or
+manual, please report them to @email{bug-help2man@@gnu.org}.
+
+@node Availability
+@chapter Obtaining @code{help2man}
+
+The latest version of this distribution is available on-line from:
 
 @example
 @url{ftp://ftp.gnu.org/gnu/help2man/}
-@url{http://www.ozemail.com.au/~bod/help2man.tar.gz}
 @end example
 
 @contents