more fixes due to automake 1.5

ChangeLog

@@ -1,3 +1,7 @@
+2001-10-22  Werner Koch  <wk@gnupg.org>
+
+	* configure.ac: Fixed for automake 1.5 
+
 2001-10-17  Werner Koch  <wk@gnupg.org>
 
 	* README: Removed note on local_ID.

INSTALL

@@ -107,6 +107,12 @@ Specific problems on some machines
         You may want to use the option "-msg-disable ptrmismatch1"
         to get rid of the sign/unsigned char mismatch warnings.
 
+  * SVR4.2 (ESIX V4.2 cc)
+
+        Due to problems with the ESIX as, you probably want to do
+            CFLAGS="-O -K pentium" ./configure --disable-asm
+        Reported by Reinhard Wobst.
+
 
 
 The Random Device

TODO

@@ -1,4 +1,6 @@
 
+  * pause scrolling help in --edit-key and elsewhere.
+
   * getkey does not return revoked/expired keys - therefore it is not
     possible to override it.
 

checks/ChangeLog

@@ -1,3 +1,8 @@
+2001-10-23  Werner Koch  <wk@gnupg.org>
+
+	* defs.inc, Makefile.am: Do not use $srcdir when invoking gpg.
+	Write the logfile to the current directory.
+
 2001-09-28  Werner Koch  <wk@gnupg.org>
 
 	* defs.inc: Write a log file for each test. 

checks/Makefile.am

@@ -64,7 +64,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
 
 ./gpg_dearmor:
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "$(srcdir)/../g10/gpg --no-options --no-greeting \
+	echo "../g10/gpg --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor
 

checks/defs.inc

@@ -98,9 +98,9 @@ pgmname=`basename $0`
 
 [ -z "$srcdir" ] && fatal "not called from make"
 
-GPG="${srcdir}/../g10/gpg --homedir . "
+GPG="../g10/gpg --homedir . "
 
-exec 2> ${0}.log
+exec 2> ${pgmname}.log
 
 :
 # end

cipher/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-22  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am: Need to use $(EXEEXT) where approriate.
+
 2001-09-09  Werner Koch  <wk@gnupg.org>
 
 	* rsa.c (rsa_get_info): s/usage/r_usage/ to avoid shadow warnings.

cipher/Makefile.am

@@ -85,7 +85,7 @@ libcipher_a_LIBADD =	   @STATIC_CIPHER_OBJS@
 # If I remember it correct, automake 1.4 has a feature to set
 # fooFLAGS depending on the program.  So we should check it out.
 
-tiger: $(srcdir)/tiger.c
+tiger$(EXEEXT): $(srcdir)/tiger.c
 	`echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o tiger $(srcdir)/tiger.c | \
 	    sed -e 's/-O[2-9s]*/-O/g' `
 
@@ -103,12 +103,12 @@ twofish: $(srcdir)/twofish.c
 #	 `echo $(COMPILE) -c $(srcdir)/twofish.c | sed -e 's/-O[0-9s]*/  /g' `
 
 
-rndunix: $(srcdir)/rndunix.c
+rndunix$(EXEEXT): $(srcdir)/rndunix.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndunix $(srcdir)/rndunix.c
 
-rndlinux: $(srcdir)/rndlinux.c
+rndlinux$(EXEEXT): $(srcdir)/rndlinux.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndlinux $(srcdir)/rndlinux.c
 
-rndegd: $(srcdir)/rndegd.c
+rndegd$(EXEEXT): $(srcdir)/rndegd.c
 	$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c
 

configure.ac

@@ -18,24 +18,26 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision$)dnl
+dnlAC_REVISION($Revision$)dnl
 
 AC_PREREQ(2.52)
 dnl A snapshot release has a letter appended. CVS files before a release
 dnl are suffixed with the string "-cvs", so "1.0.6a-cvs" is a cvs version
 dnl between 1.0.6 and 1.0.6a. 
-AC_INIT(gnupg,1.0.6b-cvs)
+AC_INIT(gnupg, 1.0.6b, bug-gnupg@gnu.org)
-AC_CONFIG_SRCDIR(g10/g10.c)
-AC_CONFIG_AUX_DIR(scripts)
-AC_CONFIG_HEADERS(config.h)
-AC_CANONICAL_TARGET()
-
 ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT sv tr"
 static_modules="sha1 md5 rmd160"
 static_random_module=""
 
-PACKAGE="$PACKAGE_NAME"
+PACKAGE=$PACKAGE_NAME
-VERSION="$PACKAGE_VERSION"
+VERSION=$PACKAGE_VERSION
+
+AC_CONFIG_AUX_DIR(scripts)
+AC_CONFIG_SRCDIR(g10/g10.c)
+AC_CANONICAL_TARGET()
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_CONFIG_HEADER(config.h)
+
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
@@ -162,7 +164,6 @@ case "${target}" in
        ;;
 esac
 
-AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
 AM_SANITY_CHECK
 missing_dir=`cd $ac_aux_dir && pwd`

doc/gpg.texi

@@ -319,10 +319,7 @@ not be expected to successfully import such a key.
 @item ---import @code{files}
 @itemx ---fast-import @code{files}
 Import/merge keys. This adds the given keys to the
-keyring.
+keyring. The fast version is currently just a synonym.
-The fast version does not update
-the trustdb; this can be done at any time with the
-command ---update-trustdb.
 
 There are a few other options which control how this command works.
 Most notable here is the ---merge-only option which does not insert new keys
@@ -355,6 +352,10 @@ when this is required and then does it implicitly; this command can be
 used to force such a check. The processing is identically to that of
 ---update-trustdb but it skips keys with a not yet defined "ownertrust".
 
+For use with cron jobs, this command can be used together with ---batch
+in which case the check is only done when it is due. To force a run
+even in batch mode add the option ---yes.
+
 @item ---import-ownertrust @code{files}
 Update the trustdb with the ownertrust values stored
 in @code{files} (or stdin if not given); existing
@@ -787,6 +788,9 @@ v4 signatures but PGP 5.x recognizes v4 signatures only
 on key material. This option forces v3 signatures for
 signatures on data.
 
+@item ---no-force-v3-sigs
+Reset the ---force-v3-sigs option.
+
 @item ---force-mdc
 Force the use of encryption with appended manipulation
 code. This is always used with the newer ciphers (those
@@ -997,12 +1001,6 @@ All words must match exactly (not case sensitive) but can appear in
 any order in the user ID. Words are any sequences of letters,
 digits, the underscore and all characters with bit 7 set.
 
-@item #34
-Using the Local ID. This is a very low level method and should
-only be used by applications which really need it. The hash character
-indicates this method. An application should not assume that this is
-only a number.
-
 @item Heine
 @itemx *Heine
 By case insensitive substring matching. This is the default mode but

g10/ChangeLog

@@ -1,5 +1,15 @@
+2001-10-23  Werner Koch  <wk@gnupg.org>
+
+	* keyedit.c (keyedit_menu): Changed helptext for showpref
+	command.  Suggested by Reinhard Wobst.
+
+	* keyring.c (keyring_search): When marking the offtbl ready, take
+	into account that we may have more than one keyring.
+
 2001-10-22  Werner Koch  <wk@gnupg.org>
 
+	* Makefile.am: Do not use OMIT_DEPENDENCIES
+
 	* build-packet.c (build_sig_subpkt): Default is now to put all
 	types of subpackets into the hashed area and only list those which
 	should go into the unhashed area.

g10/Makefile.am

@@ -20,7 +20,8 @@
 
 INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_DIST = OPTIONS  pubring.asc  options.skel
-OMIT_DEPENDENCIES = zlib.h zconf.h
+# it seems that we can't use this with automake 1.5
+#OMIT_DEPENDENCIES = zlib.h zconf.h
 LDFLAGS = @LDFLAGS@ @DYNLINK_LDFLAGS@
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 

g10/keyedit.c

@@ -597,8 +597,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 	{ N_("toggle")  , cmdTOGGLE    , 1,0,0, N_("toggle between secret "
 						   "and public key listing") },
 	{ N_("t"     )  , cmdTOGGLE    , 1,0,0, NULL },
-	{ N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences") },
+	{ N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences (expert)") },
-	{ N_("showpref"), cmdSHOWPREF  , 0,1,0, N_("list preferences") },
+	{ N_("showpref"), cmdSHOWPREF  , 0,1,0, N_("list preferences (verbose)") },
 	{ N_("setpref") , cmdSETPREF   , 1,1,0, N_("set preference list") },
 	{ N_("updpref") , cmdUPDPREF   , 1,1,0, N_("updated preferences") },
 	{ N_("passwd")  , cmdPASSWD    , 1,1,0, N_("change the passphrase") },

g10/keyring.c

@@ -55,6 +55,7 @@ struct keyring_name {
   int secret;
   DOTLOCK lockhd;
   int is_locked;
+  int did_full_scan;
   char fname[1];
 };
 typedef struct keyring_name const * CONST_KR_NAME;
@@ -214,6 +215,7 @@ keyring_register_filename (const char *fname, int secret)
     kr->secret = !!secret;
     kr->lockhd = NULL;
     kr->is_locked = 0;
+    kr->did_full_scan = 0;
     /* keep a list of all issued pointers */
     kr->next = kr_names;
     kr_names = kr;
@@ -1074,11 +1076,33 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc)
   else if (rc == -1)
     {
       hd->current.eof = 1;
-      /* if we scanned the entire keyring, we are sure that
+      /* if we scanned all keyrings, we are sure that
        * all known key IDs are in our offtbl, mark that. */
-      if (use_offtbl)
+      if (use_offtbl && !kr_offtbl_ready)
+        {
+          KR_NAME kr;
+          
+          /* First set the did_full_scan flag for this keyring (ignore
+             secret keyrings) */
+          for (kr=kr_names; kr; kr = kr->next)
+            {
+              if (!kr->secret && hd->resource == kr) 
+                {
+                  kr->did_full_scan = 1;
+                  break;
+                }
+            }
+          /* Then check whether all flags are set and if so, mark the
+             offtbl ready */
+          for (kr=kr_names; kr; kr = kr->next)
+            {
+              if (!kr->secret && !kr->did_full_scan) 
+                break;
+            }
+          if (!kr)
             kr_offtbl_ready = 1;
         }
+    }
   else 
     hd->current.error = rc;
 

g10/pkclist.c

@@ -151,7 +151,7 @@ show_revocation_reason( PKT_public_key *pk )
 static void
 show_paths (const PKT_public_key *pk, int only_first )
 {
-#warning must change enum_cert_paths to use pk
+    log_debug("not yet implemented\n");
 #if 0    
     void *context = NULL;
     unsigned otrust, validity;

scripts/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-22  Werner Koch  <wk@gnupg.org>
+
+	* autogen.sh (aclocal_vers): Require automalke 1.5.
+
 2001-08-21  Stefan Bellon  <sbellon@sbellon.de>
 
 	* build-riscos [__riscos__]: New.

scripts/autogen.sh

@@ -14,8 +14,8 @@
 PGM=GnuPG
 lib_config_files=""
 autoconf_vers=2.52
-automake_vers=1.4
+automake_vers=1.5
-aclocal_vers=1.4
+aclocal_vers=1.5
 
 
 DIE=no

scripts/config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2001-09-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -95,25 +95,25 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-case $CC_FOR_BUILD,$HOST_CC,$CC in
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
+ ,,)    echo "int dummy(){}" > $dummy.c ;
 	for c in cc gcc c89 ; do
-          ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
 	  if test $? = 0 ; then
-             CC_FOR_BUILD="$c"; break
+	     CC_FOR_BUILD="$c"; break ;
-          fi
+	  fi ;
-        done
+	done ;
-        rm -f $dummy.c $dummy.o $dummy.rel
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
-          CC_FOR_BUILD=no_compiler_found
+	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
@@ -150,6 +150,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE}" in
 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -204,6 +205,7 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
+	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `./$dummy` in
@@ -225,11 +227,13 @@ EOF
 			2-307)
 				UNAME_MACHINE="alphaev67"
 				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrs
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-tuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -329,6 +333,9 @@ tuvwxyz'`
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    sparc*:NetBSD:*)
+	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
+	exit 0 ;;
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -386,6 +393,7 @@ tuvwxyz'`
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -476,6 +484,7 @@ EOF
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
@@ -554,6 +563,7 @@ EOF
                   fi ;;
               esac
               if [ "${HP_ARCH}" = "" ]; then
+	      eval $set_cc_for_build
               sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
@@ -599,6 +609,7 @@ EOF
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -634,7 +645,7 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -678,12 +689,13 @@ EOF
 	echo xmp-cray-unicos
         exit 0 ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -764,97 +776,29 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
-        cat >$dummy.c <<EOF
+	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-#ifdef __cplusplus
+	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-#include <stdio.h>  /* for printf() prototype */
+	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-int main (int argc, char *argv[]) {
+	esac
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-        rm -f $dummy.c $dummy
 	;;
     ppc:Linux:*:*)
-        # Determine Lib Version
+	echo powerpc-unknown-linux-gnu
-        cat >$dummy.c <<EOF
+	exit 0 ;;
-#include <features.h>
+    ppc64:Linux:*:*)
-#if defined(__GLIBC__)
+	echo powerpc64-unknown-linux-gnu
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unknown\n");
-#endif
-  return 0;
-}
-EOF
-        LIBC=""
-        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-        if test "$?" = 0 ; then
-                ./$dummy | grep 1\.99 > /dev/null
-                if test "$?" = 0 ; then LIBC="libc1" ; fi
-        fi
-        rm -f $dummy.c $dummy
-        echo powerpc-unknown-linux-gnu${LIBC}
 	exit 0 ;;
     alpha:Linux:*:*)
-        cat <<EOF >$dummy.s
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-          .data
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-          \$Lformat:
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-                .byte 37,100,45,37,120,10,0     # "%d-%x\n"
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-           .text
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-                .globl main
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-                .align 4
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-                .ent main
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-            main:
-                .frame \$30,16,\$26,0
-                ldgp \$29,0(\$27)
-                .prologue 1
-                .long 0x47e03d80 # implver \$0
-                lda \$2,-1
-                .long 0x47e20c21 # amask \$2,\$1
-                lda \$16,\$Lformat
-                mov \$0,\$17
-                not \$1,\$18
-                jsr \$26,printf
-                ldgp \$29,0(\$26)
-                mov 0,\$16
-                jsr \$26,exit
-                .end main
-EOF
-        LIBC=""
-        $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-        if test "$?" = 0 ; then
-                case `./$dummy` in
-                0-0)    UNAME_MACHINE="alpha" ;;
-                1-0)    UNAME_MACHINE="alphaev5" ;;
-                1-1)    UNAME_MACHINE="alphaev56" ;;
-                1-101)  UNAME_MACHINE="alphapca56" ;;
-                2-303)  UNAME_MACHINE="alphaev6" ;;
-                2-307)  UNAME_MACHINE="alphaev67" ;;
         esac
-                objdump --private-headers $dummy | \
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-                  grep ld.so.1 > /dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-                if test "$?" = 0 ; then
-                        LIBC="libc1"
-                fi
-        fi
-        rm -f $dummy.s $dummy
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
@@ -884,40 +828,30 @@ EOF
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-        ld_supported_emulations=`cd /; ld --help 2>&1 \
+	ld_supported_targets=`cd /; ld --help 2>&1 \
-                         | sed -ne '/supported emulations:/!d
+			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
-                                    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_emulations" in
+        case "$ld_supported_targets" in
-          i*86linux)
+	  elf32-i386)
-                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit 0
-                ;;
-          elf_i*86)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-          i*86coff)
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;		
+	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-                exit 0
+		exit 0 ;;
-                ;;
+	  "")
-        esac
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-        # Either a pre-BFD a.out linker (linux-gnuoldld)
+		# one that does not give us useful --help.
-        # or one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-        # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+		exit 0 ;;
-        # If ld does not provide *any* "supported emulations:"
-        # that means it is gnuoldld.
-        test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-        case "${UNAME_MACHINE}" in
-        i*86)
-          VENDOR=pc;
-          ;;
-        *)
-          VENDOR=unknown;
-          ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
 	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
@@ -929,15 +863,15 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+    printf ("%s-pc-linux-gnu\n", argv[1]);
 #  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 #  endif
 # else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
 # endif
 #else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
@@ -946,9 +880,10 @@ EOF
 	rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
     i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
 	echo i386-sequent-sysv4
 	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
@@ -967,14 +902,13 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i*86:*:5:7*)
+    i*86:*:5:[78]*)
-        # Fixed at (any) Pentium or better
+	case `/bin/uname -X | grep "^Machine"` in
-        UNAME_MACHINE=i586
+	    *486*)	     UNAME_MACHINE=i486 ;;
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-            echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-        else
+	esac
-            echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-        fi
 	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -1068,7 +1002,7 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
@@ -1081,6 +1015,10 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
@@ -1173,11 +1111,18 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1370,4 +1315,3 @@ exit 1
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
-

scripts/config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-04-20'
+timestamp='2001-09-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -117,7 +117,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -157,6 +157,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -215,26 +223,36 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-        tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+	1750a | 580 \
-                | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+	| a29k \
-                | pyramid | mn10200 | mn10300 | tron | a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-                | 580 | i960 | h8300 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-                | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+	| c4x | clipper \
-                | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+	| d10v | d30v | dsp16xx \
-                | hppa64 \
+	| fr30 \
-                | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-                | alphaev6[78] \
+	| i370 | i860 | i960 | ia64 \
-                | we32k | ns16k | clipper | i370 | sh | sh[34] \
+	| m32r | m68000 | m68k | m88k | mcore \
-                | powerpc | powerpcle \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-                | 1750a | dsp16xx | pdp10 | pdp11 \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-                | mips16 | mips64 | mipsel | mips64el \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-                | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-                | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+	| mipsisa32 \
-                | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+	| mn10200 | mn10300 \
-                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+	| ns16k | ns32k \
-                | v850 | c4x \
+	| openrisc \
-                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+	| pdp10 | pdp11 | pj | pjl \
-                | pj | pjl | h8500)
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| s390 | s390x \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| stormy16 | strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 \
+	| we32k \
+	| x86 | xscale \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -242,7 +260,7 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
@@ -257,31 +275,43 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-        # FIXME: clean up the formatting here.
+	580-* \
-        vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	| a29k-* \
-              | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-              | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+	| alphapca5[67]-* | arc-* \
-              | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
-              | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	| bs2000-* \
-              | xmp-* | ymp-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-              | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+	| clipper-* | cray2-* | cydra-* \
-              | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	| d10v-* | d30v-* \
-              | hppa2.0n-* | hppa64-* \
+	| elxsi-* \
-              | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
-              | alphaev6[78]-* \
+	| h8300-* | h8500-* \
-              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-              | clipper-* | orion-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
-              | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	| m32r-* \
-              | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-              | mips16-* | mips64-* | mipsel-* \
+	| m88110-* | m88k-* | mcore-* \
-              | mips64el-* | mips64orion-* | mips64orionel-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-              | mipstx39-* | mipstx39el-* | mcore-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-              | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-              | [cjt]90-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
-              | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	| orion-* \
-              | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-              | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| s390-* | s390x-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -727,6 +757,16 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+	        ;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+	        ;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
@@ -881,6 +921,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -934,7 +978,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-        sh3 | sh4)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv9 | sparcv9b)
@@ -1018,11 +1062,13 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1346,6 +1392,9 @@ case $basic_machine in
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
@@ -1360,4 +1409,3 @@ exit 0
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
-

scripts/install-sh

@@ -118,6 +118,7 @@ if [ x"$dir_arg" != x ]; then
 	
 	if [ -d $dst ]; then
 		instcmd=:
+		chmodcmd=""
 	else
 		instcmd=mkdir
 	fi

scripts/missing

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
@@ -18,11 +18,37 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
 case "$1" in
 
   -h|--h|--he|--hel|--help)
@@ -35,19 +61,24 @@ error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
   automake     touch all \`Makefile.in' files
-  bison        touch file \`y.tab.c'
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  yacc         touch file \`y.tab.c'"
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
+    echo "missing 0.3 - GNU automake"
     ;;
 
   -*)
@@ -59,7 +90,7 @@ Supported PROGRAM values:
   aclocal)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
@@ -68,7 +99,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
   autoconf)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
+         you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
     touch configure
@@ -77,21 +108,31 @@ WARNING: \`$1' is missing on your system.  You should only need it if
   autoheader)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    touch config.h.in
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
     ;;
 
   automake)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print \
+    find . -type f -name Makefile.am -print |
-      | sed 's/^\(.*\).am$/touch \1.in/' \
+	   sed 's/\.am$/.in/' |
-      | sh
+	   while read f; do touch "$f"; done
     ;;
 
   bison|yacc)
@@ -100,10 +141,79 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
-    touch y.tab.c
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
     ;;
 
   makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -119,6 +229,45 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $file
     ;;
 
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar ${1+"$@"} && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar ${1+"$@"} && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your

scripts/mkinstalldirs

@@ -7,26 +7,6 @@
 # $Id$
 
 errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )			# -h for help
-        echo "${usage}" 1>&2; exit 0 ;;
-     -m )					# -m PERM arg
-        shift
-        test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-        dirmode="${1}"
-        shift ;;
-     -- ) shift; break ;;			# stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
-     * )  break ;;				# first non-opt arg
-   esac
-done
 
 for file
 do
@@ -48,17 +28,6 @@ do
 
         if test ! -d "$pathcomp"; then
   	  errstatus=$lasterr
-	else
-	  if test ! -z "$dirmode"; then
-	     echo "chmod $dirmode $pathcomp"
-
-	     lasterr=""
-	     chmod $dirmode "$pathcomp" || lasterr=$?
-
-	     if test ! -z "$lasterr"; then
-	       errstatus=$lasterr
-	     fi
-	  fi
         fi
      fi
 
@@ -68,7 +37,4 @@ done
 
 exit $errstatus
 
-# Local Variables:
+# mkinstalldirs ends here
-# mode:shell-script
-# sh-indentation:3
-# End: