* autoscan.pl (parse_args): Add support for -m <macrodir>.

diff --git a/ChangeLog b/ChangeLog
index 4c94ca85a407a864678bd62df3e9b3d019ed3591..2cd7917eba77a97fd51fe62f19fd06b217ec60a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-02  Russ Allbery  <rra@stanford.edu>
+
+       * autoscan.pl (parse_args): Add support for -m <macrodir>.
+
 2000-03-02  Akim Demaille  <akim@epita.fr>
 
        The whole family supports -V = --version.

diff --git a/THANKS b/THANKS
index f1b5168bb3a9e8b9539e8ba343c5166b0ed56986..9ce7503c01b957a9a7b9f20840e30fa66b9fd0d8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -89,6 +89,7 @@ Ralf S. Engelschall   rse@engelschall.com
 Richard Stallman       rms@gnu.org
 Robert S. Maier                rsm@math.arizona.edu
 Roland McGrath         roland@gnu.org
+Russ Allbery           rra@stanford.edu
 Ryuji Abe              raeva@t3.rim.or.jp
 Scott Bambrough                scottb@corelcomputer.com
 Scott Stanton          stanton@scriptics.com

diff --git a/autoscan.in b/autoscan.in
index d67d25b02668d17407faebb5c9369f3a39802759..f40e0c9cb7d09173d3ae3959fe79c347e606a59d 100644 (file)
--- a/autoscan.in
+++ b/autoscan.in
@@ -49,7 +49,7 @@ is a preliminary `configure.in' for that package.
 
   -h, --help            print this help, then exit
   -V, --version         print version number, then exit
-      --macrodir=DIR    directory storing data files
+  -m, --macrodir=DIR    directory storing data files
   -v, --verbose         verbosely report processing
 
 Report bugs to <bug-autoconf@gnu.org>.
@@ -64,9 +64,13 @@ This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOD
 
+    local $need_datadir = 0;
+
     foreach $_ (@ARGV) {
        if (/^--m[a-z]*=(.*)/) {
            $datadir = $1;
+       } elsif (/^-m$/) {
+          $need_datadir = 1;
        } elsif (/^--h/ || /^-h$/) {
            print "$usage";
            exit 0;
@@ -76,14 +80,21 @@ EOD
            print "$version";
            exit 0;
        } elsif (/^[^-]/) {
-           die "$usage" if defined($srcdir);
-           # Top level directory of the package being autoscanned.
-           $srcdir = $_;
+           if ($need_datadir) {
+               $datadir = $_;
+               $need_datadir = 0;
+           } else {
+               die "$usage" if defined($srcdir);
+               # Top level directory of the package being autoscanned.
+               $srcdir = $_;
+           }
        } else {
            die "$usage";
        }
     }
 
+    die $usage if $need_datadir;
+
     $srcdir="." if !defined($srcdir);
 
     print "srcdir=$srcdir\n" if $verbose;

diff --git a/autoscan.pl b/autoscan.pl
index d67d25b02668d17407faebb5c9369f3a39802759..f40e0c9cb7d09173d3ae3959fe79c347e606a59d 100644 (file)
--- a/autoscan.pl
+++ b/autoscan.pl
@@ -49,7 +49,7 @@ is a preliminary `configure.in' for that package.
 
   -h, --help            print this help, then exit
   -V, --version         print version number, then exit
-      --macrodir=DIR    directory storing data files
+  -m, --macrodir=DIR    directory storing data files
   -v, --verbose         verbosely report processing
 
 Report bugs to <bug-autoconf@gnu.org>.
@@ -64,9 +64,13 @@ This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOD
 
+    local $need_datadir = 0;
+
     foreach $_ (@ARGV) {
        if (/^--m[a-z]*=(.*)/) {
            $datadir = $1;
+       } elsif (/^-m$/) {
+          $need_datadir = 1;
        } elsif (/^--h/ || /^-h$/) {
            print "$usage";
            exit 0;
@@ -76,14 +80,21 @@ EOD
            print "$version";
            exit 0;
        } elsif (/^[^-]/) {
-           die "$usage" if defined($srcdir);
-           # Top level directory of the package being autoscanned.
-           $srcdir = $_;
+           if ($need_datadir) {
+               $datadir = $_;
+               $need_datadir = 0;
+           } else {
+               die "$usage" if defined($srcdir);
+               # Top level directory of the package being autoscanned.
+               $srcdir = $_;
+           }
        } else {
            die "$usage";
        }
     }
 
+    die $usage if $need_datadir;
+
     $srcdir="." if !defined($srcdir);
 
     print "srcdir=$srcdir\n" if $verbose;

diff --git a/bin/autoscan.in b/bin/autoscan.in
index d67d25b02668d17407faebb5c9369f3a39802759..f40e0c9cb7d09173d3ae3959fe79c347e606a59d 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -49,7 +49,7 @@ is a preliminary `configure.in' for that package.
 
   -h, --help            print this help, then exit
   -V, --version         print version number, then exit
-      --macrodir=DIR    directory storing data files
+  -m, --macrodir=DIR    directory storing data files
   -v, --verbose         verbosely report processing
 
 Report bugs to <bug-autoconf@gnu.org>.
@@ -64,9 +64,13 @@ This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOD
 
+    local $need_datadir = 0;
+
     foreach $_ (@ARGV) {
        if (/^--m[a-z]*=(.*)/) {
            $datadir = $1;
+       } elsif (/^-m$/) {
+          $need_datadir = 1;
        } elsif (/^--h/ || /^-h$/) {
            print "$usage";
            exit 0;
@@ -76,14 +80,21 @@ EOD
            print "$version";
            exit 0;
        } elsif (/^[^-]/) {
-           die "$usage" if defined($srcdir);
-           # Top level directory of the package being autoscanned.
-           $srcdir = $_;
+           if ($need_datadir) {
+               $datadir = $_;
+               $need_datadir = 0;
+           } else {
+               die "$usage" if defined($srcdir);
+               # Top level directory of the package being autoscanned.
+               $srcdir = $_;
+           }
        } else {
            die "$usage";
        }
     }
 
+    die $usage if $need_datadir;
+
     $srcdir="." if !defined($srcdir);
 
     print "srcdir=$srcdir\n" if $verbose;

diff --git a/configure b/configure
index c458a8ff1b160db78fff947780ae2e1514c353f2..02967cd5293476fde380eb11cf7cca8d6a339778 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using Autoconf version 2.14a
-# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
+# Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -33,6 +34,9 @@ ac_includes_default="\
 #  include <strings.h>
 # endif
 #endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
@@ -172,7 +176,7 @@ Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help              print this message
-      --version           print the version of autoconf that created configure
+  -V, --version           print the version of autoconf that created configure
   -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE
   -n, --no-create         do not create output files
@@ -375,7 +379,7 @@ Some influent environment variables:$ac_arg_var_help"
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
-  -version | --version | --versio | --versi | --vers)
+  -version | --version | --versio | --versi | --vers | -V)
     echo "configure generated by autoconf version 2.14a"
     exit 0 ;;
 
@@ -564,7 +568,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 ac_exeext=
 ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
     ECHO_N= ECHO_C='
 ' ECHO_T='     '
@@ -610,7 +614,7 @@ ac_configure="$SHELL $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 $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6
-echo "configure:614: checking for a BSD compatible install" 1>&5
+echo "configure:618: checking for a BSD compatible install" 1>&5
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
@@ -667,7 +671,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6
-echo "configure:671: checking whether build environment is sane" 1>&5
+echo "configure:675: checking whether build environment is sane" 1>&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -724,7 +728,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6
-echo "configure:728: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
+echo "configure:732: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
@@ -767,7 +771,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ECHO_N "checking for working aclocal... $ECHO_C" 1>&6
-echo "configure:771: checking for working aclocal" 1>&5
+echo "configure:775: checking for working aclocal" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -780,7 +784,7 @@ else
 fi
 
 echo $ECHO_N "checking for working autoconf... $ECHO_C" 1>&6
-echo "configure:784: checking for working autoconf" 1>&5
+echo "configure:788: checking for working autoconf" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -793,7 +797,7 @@ else
 fi
 
 echo $ECHO_N "checking for working automake... $ECHO_C" 1>&6
-echo "configure:797: checking for working automake" 1>&5
+echo "configure:801: checking for working automake" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -806,7 +810,7 @@ else
 fi
 
 echo $ECHO_N "checking for working autoheader... $ECHO_C" 1>&6
-echo "configure:810: checking for working autoheader" 1>&5
+echo "configure:814: checking for working autoheader" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -819,7 +823,7 @@ else
 fi
 
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" 1>&6
-echo "configure:823: checking for working makeinfo" 1>&5
+echo "configure:827: checking for working makeinfo" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -838,7 +842,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:842: checking for $ac_word" 1>&5
+echo "configure:846: checking for $ac_word" 1>&5
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -872,7 +876,7 @@ done
 test -n "$M4" || M4="m4"
 
 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" 1>&6
-echo "configure:876: checking whether m4 supports frozen files" 1>&5
+echo "configure:880: checking whether m4 supports frozen files" 1>&5
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -893,7 +897,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:897: checking for $ac_word" 1>&5
+echo "configure:901: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -923,7 +927,7 @@ test -n "$AWK" && break
 done
 
 echo $ECHO_N "checking for working help2man... $ECHO_C" 1>&6
-echo "configure:927: checking for working help2man" 1>&5
+echo "configure:931: checking for working help2man" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -938,7 +942,7 @@ fi
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:942: checking for $ac_word" 1>&5
+echo "configure:946: checking for $ac_word" 1>&5
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -986,7 +990,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6
-echo "configure:990: checking for a BSD compatible install" 1>&5
+echo "configure:994: checking for a BSD compatible install" 1>&5
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6

diff --git a/man/autoscan.1 b/man/autoscan.1
index 2b4ce029565af6b56a8c833c6ecb9f431d21b066..cbe58404f4ddbb3a90e5c650114184e36a7738ff 100644 (file)
--- a/man/autoscan.1
+++ b/man/autoscan.1
@@ -17,7 +17,7 @@ print this help, then exit
 \fB\-V\fR, \fB\-\-version\fR
 print version number, then exit
 .TP
-\fB\-\-macrodir\fR=\fIDIR\fR
+\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR
 directory storing data files
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR