Update to 1.11. Changes since 1.10:

* The new "cvs version" command gives a short version message.  If
the repository is remote, both the client and server versions are
reported.

* "cvs admin -t" now works correctly in client/server mode.

* The "cvs history" command output format has changed -- the date
now includes the year and is given is ISO 8601 format (yyyy-mm-dd).
Also, the new LogHistory option in CVSROOT/config can be used to
control what information gets recorded in the log file and code has
been added to record file removals.

* The buggy PreservePermissions code has been disabled.

* Anonymous read-only access can now be done without requiring a
password.  On the server side, simply give that user (presumably
`anonymous') an empty password in the CVSROOT/passwd file, and then
any received password will authenticate successfully.

* There is a new access method :fork: which is similar to :local:
except that it is implemented via the CVS remote protocol, and thus
has a somewhat different set of quirks and bugs.

* The -d command line option no longer updates the CVS/Root file.  For
one thing, the CVS 1.9/1.10 behavior never had updated CVS/Root in
subdirectories, and for another, it didn't seem that popular in
general.  So this change restores the CVS 1.8 behavior (which is also
the CVS 1.9/1.10 behavior if the environment variable
CVS_IGNORE_REMOTE_ROOT is set; with this change,
CVS_IGNORE_REMOTE_ROOT no longer has any effect).

* It is now possible for a single CVS command to recurse into several
CVS roots.  This includes roots which are located on several servers,
or which are both remote and local.  CVS will make connections to as
many servers as necessary.

* It is now possible to put the CVS lock files in a directory
set by the new LockDir option in CVSROOT/config.  The default
continues to be to put the lock files in the repository itself.

26 files changed, 219 insertions, 2989 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 586a9160de1..8d3a6101dea 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2000/10/17 00:05:02 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2000/10/18 03:31:15 hubertf Exp $
 #
 
-DISTNAME=       cvs-1.10
+DISTNAME=       cvs-1.11
 CATEGORIES=	devel
 MASTER_SITES=   ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=cvs/}
@@ -14,10 +14,6 @@ USE_GTEXINFO=	yes
 
 BUILD_DEFS+=	RCS_LOCALID
 
-.if exists(/usr/bin/cvs)
-IGNORE=		"${PKGNAME} is part of your NetBSD distribution"
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/devel/cvs/files/md5 b/devel/cvs/files/md5
index 043301c3683..157e4edd175 100644
--- a/devel/cvs/files/md5
+++ b/devel/cvs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/21 19:06:51 tv Exp $
+$NetBSD: md5,v 1.4 2000/10/18 03:31:15 hubertf Exp $
 
-MD5 (cvs-1.10.tar.gz) = b70e965731be44d39453c0914c0f4b27
+MD5 (cvs-1.11.tar.gz) = fd67a990423a0e9fa2fa1c3cf10f4356
diff --git a/devel/cvs/files/patch-sum b/devel/cvs/files/patch-sum
index 63d6df892f6..fcf6963b327 100644
--- a/devel/cvs/files/patch-sum
+++ b/devel/cvs/files/patch-sum
@@ -1,24 +1,25 @@
-$NetBSD: patch-sum,v 1.8 2000/02/28 03:25:52 thorpej Exp $
+$NetBSD: patch-sum,v 1.9 2000/10/18 03:31:15 hubertf Exp $
 
-MD5 (patch-aa) = 5849cf99985eeb67db5f9f69e69e8fd5
-MD5 (patch-ab) = 152906e7f3605dabf55aeedd9af72cce
-MD5 (patch-ac) = 4cef2709c703f5eddadbeea4bf941391
-MD5 (patch-ad) = 872077097162e9ccc5bcba45981ea548
-MD5 (patch-ae) = 74b1abdcc1972981cd39bba16a78cc14
-MD5 (patch-af) = 0b3c7857aa0847764b33d1105597acd1
-MD5 (patch-ak) = 69517b9d8bd99ad50703caf011dd255a
-MD5 (patch-al) = b8d09fb35d14373fb1bd7f3a44f2e3ba
-MD5 (patch-am) = 6309163fb8c2c3fa5ab796e08b498170
-MD5 (patch-an) = dacc9f9386a51b9c8adaf169b8b68200
-MD5 (patch-ao) = 6c9bf927b697b2241d71946e37c7e9db
-MD5 (patch-ap) = ad15f87fa6cbb84799621d385d363e06
-MD5 (patch-aq) = 4376c574048a1dcb9a43dcd0e84dcec5
-MD5 (patch-ar) = 29a235e68b26547a4cfc91655143a5ee
-MD5 (patch-as) = a1ee9d85ca2a060240d8d75f1d41f1a2
-MD5 (patch-at) = d93c12293c95d3dfad29ff79cefbf992
-MD5 (patch-au) = 2f1ac71a9a44a70fff7a7c5b672fe965
-MD5 (patch-av) = a24f01924b302a476e963f93e81eb9d6
-MD5 (patch-aw) = 96ec3405a0b84b4bd5e45d03fbe4196c
-MD5 (patch-ax) = 1f5eccc22dcd87fa5617fd03bc7f9260
+MD5 (patch-aa) = 87ac7c35c0dfd74d274b6032cb11c3a3
+MD5 (patch-ab) = 582f4e9e7c390a407df52a4baccd979e
+MD5 (patch-ac) = e7ff730e87b13ba56af16e9db2334550
+MD5 (patch-ad) = a2d7df4269ad5e6cd5730c37bb354b8b
+MD5 (patch-ae) = 01f994646e4d8ba20b6a38fb81496672
+MD5 (patch-af) = b8801bee112d538135a9ec08660e1b61
+MD5 (patch-ag) = 0b07944e7d3ae215325c2dc05ca0f191
+MD5 (patch-ak) = c4fce62d350decea0f0c20ee53e7b618
+MD5 (patch-al) = 7c374e30d426324f39423944edfd158d
+MD5 (patch-am) = b9a29bd6c99d5f250a39a3b0e4561bbe
+MD5 (patch-an) = 2695c0b9c45c21fa004a750b69595697
+MD5 (patch-ao) = acb748a3058898cbb0cebc0d881c9361
+MD5 (patch-ap) = 1d7d2a9a3daba487cf9de8d05348c0ca
+MD5 (patch-aq) = f100cb527846b8ea5e9d5029e34f5881
+MD5 (patch-ar) = 88032cc13f9d9712e764dcf3572d55e0
+MD5 (patch-as) = 57bb4e77f01132eb20d0a66f6141540c
+MD5 (patch-at) = a3a3221012536f04c230f9cb5dabcabe
+MD5 (patch-au) = c8c6999a983456c1e09626c26aecb2bc
+MD5 (patch-av) = 15444411b2beb5b9adca8f9cbb7304d9
+MD5 (patch-aw) = cc139d5fe1c82acf7f051800869cd68a
+MD5 (patch-ax) = d3e9dbd9a7563ebf8419cf77715b3952
 MD5 (patch-ay) = 582a67798f19e25bcfd5d6c6201bdc76
-MD5 (patch-az) = f1cfc49cc61c4a74a09a345bd02a08aa
+MD5 (patch-az) = bc7e2eed182940b59bb4a839cc88d05b
diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa
index a6d5da4c066..f0e240b5e0d 100644
--- a/devel/cvs/patches/patch-aa
+++ b/devel/cvs/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/21 19:06:52 tv Exp $
+$NetBSD: patch-aa,v 1.4 2000/10/18 03:31:15 hubertf Exp $
 
---- Makefile.in.orig	Thu Jan 15 15:45:45 1998
-+++ Makefile.in	Thu Mar 19 22:44:33 1998
+--- Makefile.in.orig	Fri Sep  8 20:28:02 2000
++++ Makefile.in
 @@ -94,7 +94,7 @@
  
  ### Subdirectories to run make in for the primary targets.
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/21 19:06:52 tv Exp $
 +USOURCE_SUBDIRS = lib diff src
  # All other subdirs:
  SUBDIRS = ${USOURCE_SUBDIRS} man doc contrib tools \
- 	windows-NT os2 emx macintosh vms
+ 	windows-NT os2 emx vms
 @@ -187,21 +187,18 @@
  .PHONY: check
  check:
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
index 745e6c0901a..1b23b915c44 100644
--- a/devel/cvs/patches/patch-ab
+++ b/devel/cvs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 1998/08/21 19:06:52 tv Exp $
+$NetBSD: patch-ab,v 1.4 2000/10/18 03:31:16 hubertf Exp $
 
---- doc/cvs.texinfo.orig	Wed Mar  4 10:47:24 1998
-+++ doc/cvs.texinfo	Thu Mar 19 22:45:08 1998
-@@ -41,6 +41,10 @@
+--- doc/cvs.texinfo.orig	Wed Aug 30 03:16:32 2000
++++ doc/cvs.texinfo
+@@ -40,6 +40,10 @@
  @setfilename cvs.info
  @include CVSvn.texi
  @settitle CVS---Concurrent Versions System
@@ -13,17 +13,3 @@ $NetBSD: patch-ab,v 1.3 1998/08/21 19:06:52 tv Exp $
  @setchapternewpage odd
  
  @c -- TODO list:
---- doc/cvsclient.texi.orig	Tue Feb 10 18:07:31 1998
-+++ doc/cvsclient.texi	Thu Mar 19 22:45:08 1998
-@@ -3,6 +3,11 @@
- @setfilename cvsclient.info
- @include CVSvn.texi
- 
-+@dircategory Programming & development tools
-+@direntry
-+* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual.
-+@end direntry
-+
- @node Top
- @top CVS Client/Server
- 
diff --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac
index e2e68e31c5b..2dc0eae3f85 100644
--- a/devel/cvs/patches/patch-ac
+++ b/devel/cvs/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 1998/08/21 19:06:52 tv Exp $
+$NetBSD: patch-ac,v 1.4 2000/10/18 03:31:16 hubertf Exp $
 
---- src/Makefile.in.orig	Thu Jun 18 13:21:42 1998
-+++ src/Makefile.in	Wed Aug 12 13:32:09 1998
+--- src/Makefile.in.orig	Fri Sep  8 20:28:03 2000
++++ src/Makefile.in
 @@ -86,10 +86,8 @@
  	@cd ..; $(MAKE) lint SUBDIRS=src
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.3 1998/08/21 19:06:52 tv Exp $
  
  installdirs:
  	$(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
-@@ -144,10 +142,10 @@
+@@ -140,10 +138,10 @@
  
  # Linking rules.
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ac,v 1.3 1998/08/21 19:06:52 tv Exp $
  
  xlint: $(SOURCES)
  	files= ; \
-@@ -181,7 +179,7 @@
+@@ -177,7 +175,7 @@
  	$(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/diff $(DEFS) $(CFLAGS) -c $(srcdir)/rcscmds.c
  
  zlib.o: zlib.c $(top_srcdir)/zlib/zlib.h
diff --git a/devel/cvs/patches/patch-ad b/devel/cvs/patches/patch-ad
index 10ffab580eb..528fd7d43f0 100644
--- a/devel/cvs/patches/patch-ad
+++ b/devel/cvs/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 1998/08/21 19:06:52 tv Exp $
+$NetBSD: patch-ad,v 1.5 2000/10/18 03:31:16 hubertf Exp $
 
---- contrib/Makefile.in.orig	Sat Feb 21 22:02:32 1998
-+++ contrib/Makefile.in	Fri Aug 21 14:53:04 1998
+--- contrib/Makefile.in.orig	Fri Sep  8 20:28:02 2000
++++ contrib/Makefile.in
 @@ -37,7 +37,7 @@
  # Use cp if you don't have install.
  INSTALL = @INSTALL@
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 1998/08/21 19:06:52 tv Exp $
  
  DISTFILES = \
  	ChangeLog README .cvsignore intro.doc \
-@@ -81,10 +81,10 @@
+@@ -80,10 +80,10 @@
  
  install: all installdirs
  	for f in $(CONTRIB_FILES) ; do\
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.4 1998/08/21 19:06:52 tv Exp $
  	done
  	for f in $(PROGS) ; do\
  		$(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
-@@ -92,7 +92,7 @@
+@@ -91,7 +91,7 @@
  .PHONY: install
  
  installdirs:
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
index 6528d9d48a3..1e8ef1ab755 100644
--- a/devel/cvs/patches/patch-ae
+++ b/devel/cvs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 1998/08/21 19:06:52 tv Exp $
+$NetBSD: patch-ae,v 1.2 2000/10/18 03:31:16 hubertf Exp $
 
---- src/rcs.c.orig	Wed Aug 12 13:14:05 1998
-+++ src/rcs.c	Wed Aug 12 13:17:05 1998
-@@ -3559,6 +3559,9 @@
+--- src/rcs.c.orig	Mon Aug 21 23:16:38 2000
++++ src/rcs.c
+@@ -3361,6 +3361,9 @@
      { KEYWORD_INIT ("Revision") },
      { KEYWORD_INIT ("Source") },
      { KEYWORD_INIT ("State") },
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.1 1998/08/21 19:06:52 tv Exp $
      { NULL, 0 }
  };
  enum keyword
-@@ -3573,7 +3576,8 @@
+@@ -3375,7 +3378,8 @@
      KEYWORD_RCSFILE,
      KEYWORD_REVISION,
      KEYWORD_SOURCE,
@@ -22,7 +22,7 @@ $NetBSD: patch-ae,v 1.1 1998/08/21 19:06:52 tv Exp $
  };
  
  /* Convert an RCS date string into a readable string.  This is like
-@@ -3801,6 +3805,7 @@
+@@ -3603,6 +3607,7 @@
  
  	    case KEYWORD_HEADER:
  	    case KEYWORD_ID:
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index fb819d3a395..20d8ea275b9 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,18 +1,8 @@
-$NetBSD: patch-af,v 1.2 2000/02/23 06:48:56 mycroft Exp $
+$NetBSD: patch-af,v 1.3 2000/10/18 03:31:16 hubertf Exp $
 
---- src/update.c.orig	Thu Jun 25 10:56:50 1998
-+++ src/update.c	Wed Feb 23 01:28:45 2000
-@@ -1039,7 +1039,8 @@
- 	    cvs_output (": Executing '", 0);
- 	    run_print (stdout);
- 	    cvs_output ("'\n", 0);
--	    (void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
-+	    (void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
-+			     RUN_NORMAL | RUN_UNSETXID);
- 	}
- 	else if (ferror (fp))
- 	    error (0, errno, "cannot read %s", CVSADM_UPROG);
-@@ -1304,11 +1305,18 @@
+--- src/update.c.orig	Wed Jul 26 21:29:01 2000
++++ src/update.c
+@@ -1374,11 +1374,18 @@
  		    xchmod (finfo->file, 1);
  		else
  		{
diff --git a/devel/cvs/patches/patch-ag b/devel/cvs/patches/patch-ag
new file mode 100644
index 00000000000..42354058b08
--- /dev/null
+++ b/devel/cvs/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.3 2000/10/18 03:31:16 hubertf Exp $
+
+--- doc/cvsclient.texi.orig	Wed Aug 30 03:16:32 2000
++++ doc/cvsclient.texi
+@@ -8,6 +8,11 @@
+ * cvsclient: (cvsclient).      The CVS client/server protocol.
+ @end direntry
+ 
++@dircategory Programming & development tools
++@direntry
++* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual.
++@end direntry
++
+ @node Top
+ @top CVS Client/Server
+ 
diff --git a/devel/cvs/patches/patch-ak b/devel/cvs/patches/patch-ak
index e202da28c49..dbf4698e7cf 100644
--- a/devel/cvs/patches/patch-ak
+++ b/devel/cvs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 1999/05/24 16:53:49 mycroft Exp $
+$NetBSD: patch-ak,v 1.3 2000/10/18 03:31:16 hubertf Exp $
 
---- src/checkout.c.orig	Sun Jul 26 22:54:04 1998
-+++ src/checkout.c	Tue Apr 20 10:15:03 1999
-@@ -180,7 +180,7 @@
+--- src/checkout.c.orig	Wed Jun 28 06:15:47 2000
++++ src/checkout.c
+@@ -179,7 +179,7 @@
  	    case 'p':
  		pipeout = 1;
  		run_module_prog = 0;	/* don't run module prog when piping */
diff --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al
index a94aa4789df..88f88df8126 100644
--- a/devel/cvs/patches/patch-al
+++ b/devel/cvs/patches/patch-al
@@ -1,22 +1,11 @@
-$NetBSD: patch-al,v 1.3 2000/02/23 06:48:56 mycroft Exp $
+$NetBSD: patch-al,v 1.4 2000/10/18 03:31:16 hubertf Exp $
 
---- src/client.c.orig	Sun Jul 26 22:54:06 1998
-+++ src/client.c	Wed Feb 23 01:23:49 2000
-@@ -1777,7 +1777,8 @@
- 		run_arg ("~");
- 		run_arg (filename);
- 		run_arg (temp_filename);
--		retcode = run_exec (DEVNULL, RUN_TTY, RUN_TTY, RUN_NORMAL);
-+		retcode = run_exec (DEVNULL, RUN_TTY, RUN_TTY,
-+				    RUN_NORMAL | RUN_UNSETXID);
- 	    }
- 	    /* FIXME: should we really be silently ignoring errors?  */
- 	    (void) unlink_file (temp_filename);
-@@ -4171,6 +4172,16 @@
- 	    else
+--- src/client.c.orig	Thu Jul  6 18:20:41 2000
++++ src/client.c
+@@ -4455,6 +4455,16 @@
  		error (1, 0,
  		       "This server does not support the global -n option.");
-+	}
+ 	}
 +	if (nolock && !noexec)
 +	{
 +	    if (have_global)
@@ -26,6 +15,7 @@ $NetBSD: patch-al,v 1.3 2000/02/23 06:48:56 mycroft Exp $
 +	    else
 +		error (1, 0,
 +		       "This server does not support the global -u option.");
- 	}
++	}
  	if (quiet)
  	{
+ 	    if (have_global)
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index c16175135ae..6912b1cb8f9 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2000/02/23 06:48:56 mycroft Exp $
+$NetBSD: patch-am,v 1.4 2000/10/18 03:31:16 hubertf Exp $
 
---- src/cvs.h.orig	Sun Jul 26 22:54:11 1998
-+++ src/cvs.h	Wed Feb 23 01:22:45 2000
-@@ -383,6 +383,7 @@
+--- src/cvs.h.orig	Sat Jul  8 21:57:21 2000
++++ src/cvs.h
+@@ -394,6 +394,7 @@
  
  extern int trace;		/* Show all commands */
  extern int noexec;		/* Don't modify disk anywhere */
@@ -10,7 +10,7 @@ $NetBSD: patch-am,v 1.3 2000/02/23 06:48:56 mycroft Exp $
  extern int logoff;		/* Don't write history entry */
  
  extern int top_level_admin;
-@@ -636,6 +637,7 @@
+@@ -654,6 +655,7 @@
  #define	RUN_STDOUT_APPEND	0x0004	/* append to stdout, don't truncate */
  #define	RUN_STDERR_APPEND	0x0008	/* append to stderr, don't truncate */
  #define	RUN_SIGIGNORE		0x0010	/* ignore interrupts for command */
diff --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an
index d990dc54a2d..05575ad1cc0 100644
--- a/devel/cvs/patches/patch-an
+++ b/devel/cvs/patches/patch-an
@@ -1,11 +1,11 @@
-$NetBSD: patch-an,v 1.1 1999/04/20 15:01:11 mycroft Exp $
+$NetBSD: patch-an,v 1.2 2000/10/18 03:31:16 hubertf Exp $
 
---- src/history.c.orig	Sat Apr 11 12:29:49 1998
-+++ src/history.c	Tue Apr 20 10:15:03 1999
-@@ -725,7 +725,7 @@
- #else
- 	fprintf (stderr, "-> fopen(%s,a)\n", fname);
- #endif
+--- src/history.c.orig	Wed May  3 00:13:25 2000
++++ src/history.c
+@@ -730,7 +730,7 @@
+     if (trace)
+ 	fprintf (stderr, "%s-> fopen(%s,a)\n",
+ 		 CLIENT_SERVER_STR, fname);
 -    if (noexec)
 +    if (nolock)
  	goto out;
diff --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao
index 8f7f5005f69..6ab471c81bc 100644
--- a/devel/cvs/patches/patch-ao
+++ b/devel/cvs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 1999/04/20 15:01:11 mycroft Exp $
+$NetBSD: patch-ao,v 1.2 2000/10/18 03:31:16 hubertf Exp $
 
---- src/lock.c.orig	Wed Mar  4 00:41:50 1998
-+++ src/lock.c	Tue Apr 20 10:15:04 1999
-@@ -243,7 +243,7 @@
+--- src/lock.c.orig	Thu Jul 27 18:49:27 2000
++++ src/lock.c
+@@ -395,7 +395,7 @@
      FILE *fp;
      char *tmp;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.1 1999/04/20 15:01:11 mycroft Exp $
  	return (0);
  
      /* we only do one directory at a time for read locks! */
-@@ -316,7 +316,7 @@
+@@ -467,7 +467,7 @@
  {
      char *wait_repos;
  
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
index dc64af7f09d..0e4cfe48472 100644
--- a/devel/cvs/patches/patch-ap
+++ b/devel/cvs/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 1999/04/20 15:01:11 mycroft Exp $
+$NetBSD: patch-ap,v 1.2 2000/10/18 03:31:16 hubertf Exp $
 
---- src/main.c.orig	Wed Aug 12 18:39:33 1998
-+++ src/main.c	Tue Apr 20 10:20:12 1999
-@@ -40,6 +40,7 @@
+--- src/main.c.orig	Thu Sep  7 01:35:04 2000
++++ src/main.c
+@@ -41,6 +41,7 @@
  int quiet = 0;
  int trace = 0;
  int noexec = 0;
@@ -10,24 +10,24 @@ $NetBSD: patch-ap,v 1.1 1999/04/20 15:01:11 mycroft Exp $
  int logoff = 0;
  
  /* Set if we should be writing CVSADM directories at top level.  At
-@@ -217,6 +218,7 @@
+@@ -239,6 +240,7 @@
      "    -w           Make checked-out files read-write (default).\n",
      "    -l           Turn history logging off.\n",
      "    -n           Do not execute anything that will change the disk.\n",
 +    "    -u           Don't create locks (implies -l).\n",
      "    -t           Show trace of program execution -- try with -n.\n",
      "    -v           CVS version and copyright.\n",
-     "    -b bindir    Find RCS programs in 'bindir'.\n",
-@@ -485,7 +487,7 @@
-     opterr = 1;
- 
-     while ((c = getopt_long
--            (argc, argv, "+Qqrwtnlvb:T:e:d:Hfz:s:xa", long_options, &option_index))
-+            (argc, argv, "+Qqrwtnulvb:T:e:d:Hfz:s:xa", long_options, &option_index))
-            != EOF)
+     "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
+@@ -432,7 +434,7 @@
+     int help = 0;		/* Has the user asked for help?  This
+ 				   lets us support the `cvs -H cmd'
+ 				   convention to give help for cmd. */
+-    static const char short_options[] = "+Qqrwtnlvb:T:e:d:Hfz:s:xa";
++    static const char short_options[] = "+Qqrwtunlvb:T:e:d:Hfz:s:xa";
+     static struct option long_options[] =
      {
- 	switch (c)
-@@ -523,6 +525,8 @@
+         {"help", 0, NULL, 'H'},
+@@ -562,6 +564,8 @@
  		break;
  	    case 'n':
  		noexec = 1;
@@ -36,12 +36,12 @@ $NetBSD: patch-ap,v 1.1 1999/04/20 15:01:11 mycroft Exp $
  	    case 'l':			/* Fall through */
  		logoff = 1;
  		break;
-@@ -802,7 +806,7 @@
- 	     * BUT, only if the history file exists.
- 	     */
- 
--	    if (!client_active)
-+	    if (!client_active && !nolock)
- 	    {
- 		char *path;
- 		int save_errno;
+@@ -936,7 +940,7 @@
+ 		/*
+ 		 * Check to see if the repository exists.
+ 		 */
+-		if (!client_active)
++		if (!client_active && !nolock)
+ 		{
+ 		    char *path;
+ 		    int save_errno;
diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq
index 9b2a30b6f9b..dac0f4bad84 100644
--- a/devel/cvs/patches/patch-aq
+++ b/devel/cvs/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 1999/04/20 15:01:11 mycroft Exp $
+$NetBSD: patch-aq,v 1.2 2000/10/18 03:31:16 hubertf Exp $
 
---- src/recurse.c.orig	Sun Jul 26 22:54:14 1998
-+++ src/recurse.c	Tue Apr 20 10:15:04 1999
-@@ -364,7 +364,7 @@
+--- src/recurse.c.orig	Thu Jun 22 00:28:37 2000
++++ src/recurse.c
+@@ -508,7 +508,7 @@
      if (frame->flags == R_SKIP_ALL)
  	return (0);
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.1 1999/04/20 15:01:11 mycroft Exp $
  
      /* The fact that locks are not active here is what makes us fail to have
         the
-@@ -406,7 +406,7 @@
+@@ -550,7 +550,7 @@
       */
      if (server_active
  	/* If there are writelocks around, we cannot pause here.  */
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index 3cdf731c0c4..9267ecb3153 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,66 +1,24 @@
-$NetBSD: patch-ar,v 1.3 2000/02/23 06:48:56 mycroft Exp $
+$NetBSD: patch-ar,v 1.4 2000/10/18 03:31:16 hubertf Exp $
 
---- src/server.c.orig	Thu Aug  6 20:46:38 1998
-+++ src/server.c	Wed Feb 23 01:18:51 2000
-@@ -597,31 +597,34 @@
+--- src/server.c.orig	Fri Jul 28 22:18:40 2000
++++ src/server.c
+@@ -796,6 +796,7 @@
         nothing.  But for rsh, we need to do it now.  */
      parse_config (CVSroot_directory);
  
--    path = xmalloc (strlen (CVSroot_directory)
--		    + sizeof (CVSROOTADM)
--		    + sizeof (CVSROOTADM_HISTORY)
--		    + 10);
--    (void) sprintf (path, "%s/%s", CVSroot_directory, CVSROOTADM);
--    if (!isaccessible (path, R_OK | X_OK))
--    {
--	save_errno = errno;
--	pending_error_text = malloc (80 + strlen (path));
--	if (pending_error_text != NULL)
--	    sprintf (pending_error_text, "E Cannot access %s", path);
--	pending_error = save_errno;
--    }
--    (void) strcat (path, "/");
--    (void) strcat (path, CVSROOTADM_HISTORY);
--    if (isfile (path) && !isaccessible (path, R_OK | W_OK))
--    {
--	save_errno = errno;
--	pending_error_text = malloc (80 + strlen (path));
--	if (pending_error_text != NULL)
--	    sprintf (pending_error_text, "E \
-+    if (!nolock)
-+    {
-+	path = xmalloc (strlen (CVSroot_directory)
-+			+ sizeof (CVSROOTADM)
-+			+ sizeof (CVSROOTADM_HISTORY)
-+			+ 10);
-+	(void) sprintf (path, "%s/%s", CVSroot_directory, CVSROOTADM);
-+	if (!isaccessible (path, R_OK | X_OK))
-+	{
-+	    save_errno = errno;
-+	    pending_error_text = malloc (80 + strlen (path));
-+	    if (pending_error_text != NULL)
-+		sprintf (pending_error_text, "E Cannot access %s", path);
-+	    pending_error = save_errno;
-+	}
-+	(void) strcat (path, "/");
-+	(void) strcat (path, CVSROOTADM_HISTORY);
-+	if (isfile (path) && !isaccessible (path, R_OK | W_OK))
-+	{
-+	    save_errno = errno;
-+	    pending_error_text = malloc (80 + strlen (path));
-+	    if (pending_error_text != NULL)
-+		sprintf (pending_error_text, "E \
- Sorry, you don't have read/write access to the history file %s", path);
--	pending_error = save_errno;
-+	    pending_error = save_errno;
-+	}
-+	free (path);
++    if (!nolock) {
+     path = malloc (strlen (CVSroot_directory)
+ 		   + sizeof (CVSROOTADM)
+ 		   + 10);
+@@ -813,6 +814,7 @@
+ 	pending_error = save_errno;
      }
--    free (path);
+     free (path);
++    }
  
  #ifdef HAVE_PUTENV
      env = malloc (strlen (CVSROOT_ENV) + strlen (CVSroot_directory) + 1 + 1);
-@@ -1759,6 +1762,8 @@
+@@ -2194,6 +2196,8 @@
      {
  	case 'n':
  	    noexec = 1;
@@ -69,33 +27,28 @@ $NetBSD: patch-ar,v 1.3 2000/02/23 06:48:56 mycroft Exp $
  	    break;
  	case 'q':
  	    quiet = 1;
-@@ -4663,19 +4668,23 @@
- #endif /* HAVE_INITGROUPS */
+@@ -5172,6 +5176,7 @@
+     const char *username;
+ {
+     struct passwd *pw;
++    int rc;
  
- #ifdef SETXID_SUPPORT
--    /* honor the setgid bit iff set*/
-+    /* Honor the setgid bit iff set. */
-     if (getgid() != getegid())
--    {
- 	setgid (getegid ());
--    }
-     else
- #else
--    {
- 	setgid (pw->pw_gid);
--    }
- #endif
+     pw = getpwnam (username);
+     if (pw == NULL)
+@@ -5231,7 +5236,15 @@
+ 	}
+     }
      
--    setuid (pw->pw_uid);
+-    if (setuid (pw->pw_uid) < 0)
 +#ifdef SETXID_SUPPORT
 +    /* Honor the setuid bit iff set. */
 +    if (getuid() != geteuid())
-+	setuid (geteuid ());
++	rc = setuid (geteuid ());
 +    else
 +#else
-+	setuid (pw->pw_uid);
++        rc = setuid (pw->pw_uid);
 +#endif
-+
-     /* We don't want our umask to change file modes.  The modes should
-        be set by the modes used in the repository, and by the umask of
-        the client.  */
++    if (rc < 0)
+     {
+ 	/* Note that this means that if run as a non-root user,
+ 	   CVSROOT/passwd must contain the user we are running as
diff --git a/devel/cvs/patches/patch-as b/devel/cvs/patches/patch-as
index cd24bb8e858..c2280a977b5 100644
--- a/devel/cvs/patches/patch-as
+++ b/devel/cvs/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 1999/04/20 15:01:12 mycroft Exp $
+$NetBSD: patch-as,v 1.2 2000/10/18 03:31:16 hubertf Exp $
 
---- src/tag.c.orig	Tue Jul 14 21:59:02 1998
-+++ src/tag.c	Tue Apr 20 10:15:05 1999
-@@ -851,7 +851,7 @@
+--- src/tag.c.orig	Wed Jun 14 21:32:51 2000
++++ src/tag.c
+@@ -868,7 +868,7 @@
  	/* The tags is valid but not mentioned in val-tags.  Add it.  */
  	datum value;
  
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
index d1ee79c55c2..04677b84897 100644
--- a/devel/cvs/patches/patch-at
+++ b/devel/cvs/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.3 2000/02/23 01:32:11 mycroft Exp $
+$NetBSD: patch-at,v 1.4 2000/10/18 03:31:17 hubertf Exp $
 
---- src/logmsg.c.orig	Sat Jan 10 12:46:19 1998
-+++ src/logmsg.c	Tue Feb 22 20:25:09 2000
-@@ -285,7 +285,7 @@
+--- src/logmsg.c.orig	Wed Mar  1 17:33:39 2000
++++ src/logmsg.c
+@@ -283,7 +283,7 @@
      run_setup (editinfo_editor ? editinfo_editor : Editor);
      run_arg (fname);
      if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.3 2000/02/23 01:32:11 mycroft Exp $
  	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
  	       editinfo_editor ? "Logfile verification failed" :
  	       "warning: editor session failed");
-@@ -586,6 +586,15 @@
+@@ -590,6 +590,15 @@
  			xrealloc (str_list,
  				  strlen (str_list) + strlen (p->key) + 5);
  		    (void) strcat (str_list, p->key);
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
index dcdbea3488c..5789185aab5 100644
--- a/devel/cvs/patches/patch-au
+++ b/devel/cvs/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.2 2000/02/23 06:48:56 mycroft Exp $
+$NetBSD: patch-au,v 1.3 2000/10/18 03:31:17 hubertf Exp $
 
---- src/commit.c.orig	Thu Aug  6 23:04:11 1998
-+++ src/commit.c	Wed Feb 23 01:24:54 2000
-@@ -984,7 +984,9 @@
+--- src/commit.c.orig	Wed Jul 26 21:29:01 2000
++++ src/commit.c
+@@ -996,7 +996,9 @@
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
  	    li->tag = xstrdup (vers->tag);
@@ -13,13 +13,12 @@ $NetBSD: patch-au,v 1.2 2000/02/23 06:48:56 mycroft Exp $
  	    li->rev_new = NULL;
  	    p->data = (char *) li;
  	    (void) addnode (ulist, p);
-@@ -1476,7 +1478,8 @@
- 		cvs_output (": Executing '", 0);
+@@ -1497,7 +1499,7 @@
  		run_print (stdout);
  		cvs_output ("'\n", 0);
+ 		cvs_flushout ();
 -		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
-+		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
-+				 RUN_NORMAL | RUN_UNSETXID);
++		(void) run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL | RUN_UNSETXID);
  		free (repos);
  	    }
  	    else
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
index 35e7837c0bf..cae5f79f2b2 100644
--- a/devel/cvs/patches/patch-av
+++ b/devel/cvs/patches/patch-av
@@ -1,18 +1,8 @@
-$NetBSD: patch-av,v 1.3 2000/02/28 03:25:53 thorpej Exp $
+$NetBSD: patch-av,v 1.4 2000/10/18 03:31:17 hubertf Exp $
 
---- configure.in.orig	Sun Feb 27 19:14:29 2000
-+++ configure.in	Sun Feb 27 19:13:59 2000
-@@ -168,6 +168,9 @@
-   AC_DEFINE(HAVE_CONNECT)
- fi])
- 
-+includeopt=
-+AC_SUBST(includeopt)
-+
- dnl
- dnl set $(KRB4) from --with-krb4=value -- WITH_KRB4
- dnl
-@@ -175,16 +178,19 @@
+--- configure.in.orig	Tue Aug  1 18:13:25 2000
++++ configure.in
+@@ -110,16 +110,19 @@
  dnl libkrb in the system libraries, so --with-krb4=value needs to
  dnl override the system -lkrb.
  dnl
@@ -26,7 +16,7 @@ $NetBSD: patch-av,v 1.3 2000/02/28 03:25:53 thorpej Exp $
  )dnl
 -echo "default place for krb4 is $KRB4"
 +if test X"$KRB4" != X""; then
-+   echo "default place for krb4 is $KRB4"
++    echo "default place for krb4 is $KRB4"
 +fi
  AC_SUBST(KRB4)])dnl
  WITH_KRB4
@@ -35,20 +25,14 @@ $NetBSD: patch-av,v 1.3 2000/02/28 03:25:53 thorpej Exp $
  krb_h=
  AC_MSG_CHECKING([for krb.h])
  if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
-@@ -213,8 +219,6 @@
- fi
- AC_MSG_RESULT($krb_h)
- 
--includeopt=
--AC_SUBST(includeopt)
- if test -n "$krb_h"; then
-   krb_lib=
-   if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
-@@ -246,20 +250,24 @@
+@@ -181,20 +184,27 @@
    fi
  fi
  AC_CHECK_FUNCS(krb_get_err_text)
 +fi	# KRB4 empty
++
++includeopt=
++AC_SUBST(includeopt)
  
  dnl
  dnl Use --with-gssapi=DIR to enable GSSAPI support.
@@ -63,7 +47,7 @@ $NetBSD: patch-av,v 1.3 2000/02/28 03:25:53 thorpej Exp $
  )dnl
 -echo "default place for GSSAPI is $GSSAPI"
 +if test X"$GSSAPI" != X""; then
-+   echo "default place for GSSAPI is $GSSAPI"
++    echo "default place for GSSAPI is $GSSAPI"
 +fi
  AC_SUBST(GSSAPI)])dnl
  WITH_GSSAPI
@@ -71,8 +55,8 @@ $NetBSD: patch-av,v 1.3 2000/02/28 03:25:53 thorpej Exp $
 +if test X"$GSSAPI" != X""; then
  hold_cppflags=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
- AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
-@@ -286,6 +294,7 @@
+ AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
+@@ -223,6 +233,7 @@
    # there, an_to_ln.o refers to things defined only in -lgen.
    AC_CHECK_LIB(gen, compile)
  fi
diff --git a/devel/cvs/patches/patch-aw b/devel/cvs/patches/patch-aw
index 48533d0c175..5ccb8d7810e 100644
--- a/devel/cvs/patches/patch-aw
+++ b/devel/cvs/patches/patch-aw
@@ -1,1887 +1,10 @@
-$NetBSD: patch-aw,v 1.3 2000/02/28 03:25:53 thorpej Exp $
-
---- configure.orig	Tue Jun  2 10:29:52 1998
-+++ configure	Sun Feb 27 19:15:39 2000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- 
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.10 
-+# Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -61,6 +61,9 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+# Maximum number of lines to put in a shell here document.
-+ac_max_here_lines=12
- 
- ac_prev=
- for ac_option
-@@ -342,7 +345,7 @@
-     verbose=yes ;;
- 
-   -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.10"
-+    echo "configure generated by autoconf version 2.13"
-     exit 0 ;;
- 
-   -with-* | --with-*)
-@@ -444,11 +447,14 @@
- done
- 
- # NLS nuisances.
--# Only set LANG and LC_ALL to C if already set.
--# These must not be set unconditionally because not all systems understand
--# e.g. LANG=C (notably SCO).
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
- if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
-@@ -509,8 +515,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+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.
-   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -529,14 +538,16 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:542: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  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_prog_CC="gcc"
-@@ -557,15 +568,17 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:572: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_prog_rejected=no
--  for ac_dir in $PATH; do
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -600,10 +613,92 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:623: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  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_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
- 
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:655: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+cat > conftest.$ac_ext << EOF
-+
-+#line 666 "configure"
-+#include "confdefs.h"
-+
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  ac_cv_prog_cc_works=yes
-+  # If we can't run a trivial program, we are probably using a cross compiler.
-+  if (./conftest; exit) 2>/dev/null; then
-+    ac_cv_prog_cc_cross=no
-+  else
-+    ac_cv_prog_cc_cross=yes
-+  fi
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:697: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+echo "configure:702: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -612,7 +707,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -620,37 +715,51 @@
- fi
- 
- echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
- if test $ac_cv_prog_gcc = yes; then
-   GCC=yes
--  if test "${CFLAGS+set}" != set; then
--    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:730: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
--  ac_cv_prog_gcc_g=yes
-+  ac_cv_prog_cc_g=yes
- else
--  ac_cv_prog_gcc_g=no
-+  ac_cv_prog_cc_g=no
- fi
- rm -f conftest*
- 
- fi
- 
--echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
--    if test $ac_cv_prog_gcc_g = yes; then
--      CFLAGS="-g -O"
--    else
--      CFLAGS="-O"
--    fi
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-   fi
- else
--  GCC=
--  test "${CFLAGS+set}" = set || CFLAGS="-g"
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
- fi
- 
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:763: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -665,39 +774,62 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 669 "configure"
-+#line 778 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 684 "configure"
-+#line 795 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 812 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CPP=/lib/cpp
- fi
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
- fi
-   CPP="$ac_cv_prog_CPP"
-@@ -707,8 +839,9 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
-+echo "configure:843: checking for AIX" >&5
- cat > conftest.$ac_ext <<EOF
--#line 712 "configure"
-+#line 845 "configure"
- #include "confdefs.h"
- #ifdef _AIX
-   yes
-@@ -729,24 +862,27 @@
- rm -f conftest*
- 
- 
--ac_safe=`echo "minix/config.h" | tr './\055' '___'`
-+ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-+echo "configure:868: checking for minix/config.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 739 "configure"
-+#line 873 "configure"
- #include "confdefs.h"
- #include <minix/config.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=no"
- fi
-@@ -776,6 +912,7 @@
- fi
- 
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-+echo "configure:916: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -801,10 +938,11 @@
- fi
- 
- if test "x$prefix" = xNONE; then
--echo $ac_n "checking for prefix by ""... $ac_c" 1>&6
-+echo $ac_n "checking for prefix by $ac_c" 1>&6
- # Extract the first word of "cvs", so it can be a program name with args.
- set dummy cvs; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:946: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_CVS'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -812,9 +950,13 @@
-   /*)
-   ac_cv_path_CVS="$CVS" # Let the user override the test with a path.
-   ;;
-+  ?:/*)			 
-+  ac_cv_path_CVS="$CVS" # Let the user override the test with a dos path.
-+  ;;
-   *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  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_CVS="$ac_dir/$ac_word"
-@@ -838,43 +980,18 @@
- fi
- 
- 
--# If we cannot run a trivial program, we must be cross compiling.
--echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test "$cross_compiling" = yes; then
--  ac_cv_c_cross=yes
--else
--cat > conftest.$ac_ext <<EOF
--#line 851 "configure"
--#include "confdefs.h"
--main(){return(0);}
--EOF
--{ (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
--  ac_cv_c_cross=no
--else
--  ac_cv_c_cross=yes
--fi
--fi
--rm -fr conftest*
--fi
--
--echo "$ac_t""$ac_cv_c_cross" 1>&6
--cross_compiling=$ac_cv_c_cross
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:987: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 874 "configure"
-+#line 992 "configure"
- #include "confdefs.h"
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* Ultrix mips cc rejects this.  */
- typedef int charset[2]; const charset x;
-@@ -920,15 +1037,16 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_c_const=no
- fi
- rm -f conftest*
--
- fi
- 
- echo "$ac_t""$ac_cv_c_const" 1>&6
-@@ -966,27 +1084,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # 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:1093: 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
- else
--    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-   for ac_dir in $PATH; do
-     # Account for people who put trailing slashes in PATH elements.
-     case "$ac_dir/" in
-     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-     *)
-       # OSF1 and SCO ODT 3.0 have their own names for install.
--      for ac_prog in ginstall installbsd scoinst install; do
-+      # Don't use installbsd from OSF since it installs stuff as root
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-         if test -f $ac_dir/$ac_prog; then
- 	  if test $ac_prog = install &&
-             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
--	    # OSF/1 installbsd also uses dspmsg, but is usable.
- 	    :
- 	  else
- 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -997,7 +1118,7 @@
-       ;;
-     esac
-   done
--  IFS="$ac_save_ifs"
-+  IFS="$ac_save_IFS"
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-@@ -1016,19 +1137,23 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1148: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  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_prog_RANLIB="ranlib"
-@@ -1051,14 +1176,16 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1180: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$YACC"; then
-   ac_cv_prog_YACC="$YACC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  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_prog_YACC="$ac_prog"
-@@ -1080,7 +1207,8 @@
- test -n "$YACC" || YACC="yacc"
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--set dummy ${MAKE-make}; ac_make=$2
-+echo "configure:1211: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1109,6 +1237,7 @@
- # 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:1241: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_perl_path'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1116,9 +1245,13 @@
-   /*)
-   ac_cv_path_perl_path="$perl_path" # Let the user override the test with a path.
-   ;;
-+  ?:/*)			 
-+  ac_cv_path_perl_path="$perl_path" # Let the user override the test with a dos path.
-+  ;;
-   *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  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_path="$ac_dir/$ac_word"
-@@ -1140,6 +1273,7 @@
- # Extract the first word of "csh", so it can be a program name with args.
- set dummy csh; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:1277: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_csh_path'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1147,9 +1281,13 @@
-   /*)
-   ac_cv_path_csh_path="$csh_path" # Let the user override the test with a path.
-   ;;
-+  ?:/*)			 
-+  ac_cv_path_csh_path="$csh_path" # Let the user override the test with a dos path.
-+  ;;
-   *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  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_csh_path="$ac_dir/$ac_word"
-@@ -1172,6 +1310,7 @@
- # Pull the hash mark out of the macro call to avoid m4 problems.
- ac_msg="whether #! works in shell scripts"
- echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
-+echo "configure:1314: checking $ac_msg" >&5
- if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1189,6 +1328,7 @@
- fi
- 
- echo "$ac_t""$ac_cv_sys_interpreter" 1>&6
-+interpval="$ac_cv_sys_interpreter"
- 
- if test X"$ac_cv_sys_interpreter" != X"yes" ; then
-   # silly trick to avoid problems in AC macros...
-@@ -1197,11 +1337,12 @@
- fi
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-+echo "configure:1341: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1205 "configure"
-+#line 1346 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1209,13 +1350,15 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   ac_cv_header_stdc=yes
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_header_stdc=no
- fi
-@@ -1224,7 +1367,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1228 "configure"
-+#line 1371 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1242,7 +1385,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1246 "configure"
-+#line 1389 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1262,8 +1405,8 @@
- if test "$cross_compiling" = yes; then
-   :
- else
--cat > conftest.$ac_ext <<EOF
--#line 1267 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1410 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1274,15 +1417,19 @@
- exit (0); }
- 
- EOF
--{ (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-+if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-   :
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-   ac_cv_header_stdc=no
- fi
--fi
- rm -fr conftest*
- fi
-+
-+fi
- fi
- 
- echo "$ac_t""$ac_cv_header_stdc" 1>&6
-@@ -1298,24 +1445,27 @@
-                  sys/param.h sys/select.h sys/time.h sys/timeb.h \
-                  io.h direct.h sys/bsdtypes.h sys/resource.h
- do
--ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:1451: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1308 "configure"
-+#line 1456 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=no"
- fi
-@@ -1323,7 +1473,7 @@
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_hdr 1
- EOF
-@@ -1334,11 +1484,12 @@
- done
- 
- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-+echo "configure:1488: checking for sys/wait.h that is POSIX.1 compatible" >&5
- if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1342 "configure"
-+#line 1493 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -1348,22 +1499,22 @@
- #ifndef WIFEXITED
- #define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
--int main() { return 0; }
--int t() {
-+int main() {
- int s;
- wait (&s);
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ; return 0; }
- EOF
--if { (eval echo configure:1359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_sys_wait_h=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_header_sys_wait_h=no
- fi
- rm -f conftest*
--
- fi
- 
- echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-@@ -1375,11 +1526,12 @@
- fi
- 
- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-+echo "configure:1530: checking whether stat file-mode macros are broken" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1383 "configure"
-+#line 1535 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -1430,29 +1582,30 @@
- fi
- 
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-+echo "configure:1586: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1438 "configure"
-+#line 1591 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
--int main() { return 0; }
--int t() {
-+int main() {
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_time=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_header_time=no
- fi
- rm -f conftest*
--
- fi
- 
- echo "$ac_t""$ac_cv_header_time" 1>&6
-@@ -1466,34 +1619,35 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
- do
--ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-+echo "configure:1625: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1476 "configure"
-+#line 1630 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
--int main() { return 0; }
--int t() {
-+int main() {
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:1485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=no"
- fi
- rm -f conftest*
--
- fi
- if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'`
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_hdr 1
- EOF
-@@ -1504,30 +1658,32 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--echo $ac_n "checking for -ldir""... $ac_c" 1>&6
--ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'`
-+echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-+echo "configure:1663: checking for opendir in -ldir" >&5
-+ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-ldir  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1516 "configure"
-+#line 1671 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char opendir();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1543,30 +1699,32 @@
- fi
- 
- else
--echo $ac_n "checking for -lx""... $ac_c" 1>&6
--ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'`
-+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-+echo "configure:1704: checking for opendir in -lx" >&5
-+ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lx  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1555 "configure"
-+#line 1712 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char opendir();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1584,11 +1742,12 @@
- fi
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-+echo "configure:1746: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1592 "configure"
-+#line 1751 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1601,20 +1760,20 @@
- void (*signal ()) ();
- #endif
- 
--int main() { return 0; }
--int t() {
-+int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_type_signal=int
- fi
- rm -f conftest*
--
- fi
- 
- echo "$ac_t""$ac_cv_type_signal" 1>&6
-@@ -1624,11 +1783,12 @@
- 
- 
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-+echo "configure:1787: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1632 "configure"
-+#line 1792 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -1657,19 +1817,21 @@
- fi
- 
- echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-+echo "configure:1821: checking for mode_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1665 "configure"
-+#line 1826 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
- #include <stdlib.h>
-+#include <stddef.h>
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "mode_t" >/dev/null 2>&1; then
-+  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
-   ac_cv_type_mode_t=yes
- else
-@@ -1688,19 +1850,21 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
-+echo "configure:1854: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1696 "configure"
-+#line 1859 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
- #include <stdlib.h>
-+#include <stddef.h>
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "size_t" >/dev/null 2>&1; then
-+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
-   ac_cv_type_size_t=yes
- else
-@@ -1719,19 +1883,21 @@
- fi
- 
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-+echo "configure:1887: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1727 "configure"
-+#line 1892 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
- #include <stdlib.h>
-+#include <stddef.h>
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "pid_t" >/dev/null 2>&1; then
-+  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-   rm -rf conftest*
-   ac_cv_type_pid_t=yes
- else
-@@ -1750,28 +1916,29 @@
- fi
- 
- echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-+echo "configure:1920: checking for st_blksize in struct stat" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1758 "configure"
-+#line 1925 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
--int main() { return 0; }
--int t() {
-+int main() {
- struct stat s; s.st_blksize;
- ; return 0; }
- EOF
--if { (eval echo configure:1767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_struct_st_blksize=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_struct_st_blksize=no
- fi
- rm -f conftest*
--
- fi
- 
- echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
-@@ -1785,11 +1952,12 @@
- for ac_func in mkdir rename strstr dup2 strerror valloc waitpid memmove vasprintf strtoul
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:1956: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1793 "configure"
-+#line 1961 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1799,8 +1967,7 @@
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -1813,34 +1980,41 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  :
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
- else
-   echo "$ac_t""no" 1>&6
--LIBOBJS="$LIBOBJS ${ac_func}.o"
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
- fi
--
- done
- 
-+
- for ac_func in fchmod fsync ftime mktemp putenv vprintf ftruncate timezone getpagesize initgroups fchdir sigaction sigprocmask sigvec sigsetmask sigblock tempnam tzset readlink wait3
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:2013: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1844 "configure"
-+#line 2018 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1850,8 +2024,7 @@
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -1864,16 +2037,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-@@ -1896,24 +2071,27 @@
- EOF
- 
- 
--ac_safe=`echo "vfork.h" | tr './\055' '___'`
-+ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-+echo "configure:2077: checking for vfork.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1906 "configure"
-+#line 2082 "configure"
- #include "confdefs.h"
- #include <vfork.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=no"
- fi
-@@ -1930,16 +2108,18 @@
- fi
- 
- echo $ac_n "checking for working vfork""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-+echo "configure:2112: checking for working vfork" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
-   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-+echo "configure:2118: checking for vfork" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1943 "configure"
-+#line 2123 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char vfork(); below.  */
-@@ -1949,8 +2129,7 @@
-     builtin and then its argument prototype would still apply.  */
- char vfork();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -1963,16 +2142,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_vfork=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_vfork=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
-@@ -1980,9 +2161,10 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+ac_cv_func_vfork_works=$ac_cv_func_vfork
- else
--cat > conftest.$ac_ext <<EOF
--#line 1986 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2168 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -2010,8 +2192,10 @@
-   static pid_t child;
-   if (!child) {
-     child = vfork ();
--    if (child < 0)
-+    if (child < 0) {
-       perror ("vfork");
-+      _exit(2);
-+    }
-     if (!child) {
-       arg = getpid();
-       write(-1, "", 0);
-@@ -2075,18 +2259,22 @@
-   }
- }
- EOF
--{ (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
--  ac_cv_func_vfork=yes
-+if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  ac_cv_func_vfork_works=yes
- else
--  ac_cv_func_vfork=no
--fi
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  ac_cv_func_vfork_works=no
- fi
- rm -fr conftest*
- fi
- 
--echo "$ac_t""$ac_cv_func_vfork" 1>&6
--if test $ac_cv_func_vfork = no; then
-+fi
-+
-+echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
-+if test $ac_cv_func_vfork_works = no; then
-   cat >> confdefs.h <<\EOF
- #define vfork fork
- EOF
-@@ -2094,29 +2282,34 @@
- fi
- 
- echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
-+echo "configure:2286: checking whether closedir returns void" >&5
- if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
-   ac_cv_func_closedir_void=yes
- else
--cat > conftest.$ac_ext <<EOF
--#line 2105 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2294 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_header_dirent>
- int closedir(); main() { exit(closedir(opendir(".")) != 0); }
- EOF
--{ (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-+if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-   ac_cv_func_closedir_void=no
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-   ac_cv_func_closedir_void=yes
- fi
--fi
- rm -fr conftest*
- fi
- 
-+fi
-+
- echo "$ac_t""$ac_cv_func_closedir_void" 1>&6
- if test $ac_cv_func_closedir_void = yes; then
-   cat >> confdefs.h <<\EOF
-@@ -2126,30 +2319,32 @@
- fi
- 
- 
--echo $ac_n "checking for -lsec""... $ac_c" 1>&6
--ac_lib_var=`echo sec'_'getspnam | tr './+\055' '__p_'`
-+echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6
-+echo "configure:2324: checking for getspnam in -lsec" >&5
-+ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lsec  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2138 "configure"
-+#line 2332 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char getspnam();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- getspnam()
- ; return 0; }
- EOF
--if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
+--- configure.orig	Wed Oct 18 04:35:53 2000
++++ configure	Wed Oct 18 04:36:01 2000
+@@ -2820,19 +2820,22 @@
+   
  fi
-@@ -2159,7 +2354,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo sec | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo sec | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -2173,11 +2369,12 @@
- for ac_func in getspnam
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:2373: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2181 "configure"
-+#line 2378 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2187,8 +2384,7 @@
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -2201,16 +2397,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-@@ -2225,6 +2423,7 @@
- 
- 
- echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
-+echo "configure:2427: checking whether utime accepts a null argument" >&5
- if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2233,8 +2432,8 @@
- if test "$cross_compiling" = yes; then
-   ac_cv_func_utime_null=no
- else
--cat > conftest.$ac_ext <<EOF
--#line 2238 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2437 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -2245,14 +2444,18 @@
- && t.st_mtime - s.st_mtime < 120));
- }
- EOF
--{ (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-+if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-   ac_cv_func_utime_null=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-   ac_cv_func_utime_null=no
- fi
--fi
- rm -fr conftest*
-+fi
-+
- rm -f core core.* *.core
- fi
- 
-@@ -2265,19 +2468,27 @@
- fi
- 
- echo $ac_n "checking for long file names""... $ac_c" 1>&6
-+echo "configure:2472: checking for long file names" >&5
- if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_sys_long_file_names=yes
- # Test for long file names in all the places we know might matter:
- #      .		the current directory, where building will happen
--#      /tmp		where it might want to write temporary files
--#      /var/tmp		likewise
--#      /usr/tmp		likewise
- #      $prefix/lib	where we will be installing things
- #      $exec_prefix/lib	likewise
- # eval it to expand exec_prefix.
--for ac_dir in `eval echo . /tmp /var/tmp /usr/tmp $prefix/lib $exec_prefix/lib` ; do
-+#      $TMPDIR		if set, where it might want to write temporary files
-+# if $TMPDIR is not set:
-+#      /tmp		where it might want to write temporary files
-+#      /var/tmp		likewise
-+#      /usr/tmp		likewise
-+if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-+  ac_tmpdirs="$TMPDIR"
-+else
-+  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
-+fi
-+for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-   test -d $ac_dir || continue
-   test -w $ac_dir || continue # It is less confusing to not echo anything here.
-   (echo 1 > $ac_dir/conftest9012345) 2>/dev/null
-@@ -2302,14 +2513,15 @@
- 
- 
- echo $ac_n "checking for working fnmatch function""... $ac_c" 1>&6
-+echo "configure:2517: checking for working fnmatch function" >&5
- if eval "test \"`echo '$''{'ccvs_cv_sys_working_fnmatch'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
-   ccvs_cv_sys_working_fnmatch=no
- else
--cat > conftest.$ac_ext <<EOF
--#line 2313 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2525 "configure"
- #include "confdefs.h"
- 
- #include <fnmatch.h>
-@@ -2321,16 +2533,20 @@
- 	? 0 : 1);
- }
- EOF
--{ (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-+if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-   ccvs_cv_sys_working_fnmatch=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-   ccvs_cv_sys_working_fnmatch=no
- fi
--fi
- rm -fr conftest*
- fi
- 
-+fi
-+
- if test $ccvs_cv_sys_working_fnmatch = no; then
-   LIBOBJS="$LIBOBJS fnmatch.o"
- fi
-@@ -2342,11 +2558,12 @@
- # only looks in /etc/hosts), so we only look for -lsocket if we need
- # it.
- echo $ac_n "checking for connect""... $ac_c" 1>&6
-+echo "configure:2562: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2350 "configure"
-+#line 2567 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
-@@ -2356,8 +2573,7 @@
-     builtin and then its argument prototype would still apply.  */
- char connect();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -2370,16 +2586,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_connect=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
-@@ -2387,30 +2605,32 @@
-   echo "$ac_t""no" 1>&6
- case "$LIBS" in
- *-lnsl*) ;;
--*) echo $ac_n "checking for -lnsl_s""... $ac_c" 1>&6
--ac_lib_var=`echo nsl_s'_'printf | tr './+\055' '__p_'`
-+*) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6
-+echo "configure:2610: checking for printf in -lnsl_s" >&5
-+ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl_s  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2399 "configure"
-+#line 2618 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char printf();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2420,7 +2640,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo nsl_s | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo nsl_s | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -2434,30 +2655,32 @@
- esac
- case "$LIBS" in
- *-lnsl*) ;;
--*) echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
--ac_lib_var=`echo nsl'_'printf | tr './+\055' '__p_'`
-+*) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6
-+echo "configure:2660: checking for printf in -lnsl" >&5
-+ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2446 "configure"
-+#line 2668 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char printf();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2467,7 +2690,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -2481,30 +2705,32 @@
- esac
- case "$LIBS" in
- *-lsocket*) ;;
--*) echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
--ac_lib_var=`echo socket'_'connect | tr './+\055' '__p_'`
-+*) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-+echo "configure:2710: checking for connect in -lsocket" >&5
-+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2493 "configure"
-+#line 2718 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char connect();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2514,7 +2740,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -2528,30 +2755,32 @@
- esac
- case "$LIBS" in
- *-linet*) ;;
--*) echo $ac_n "checking for -linet""... $ac_c" 1>&6
--ac_lib_var=`echo inet'_'connect | tr './+\055' '__p_'`
-+*) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6
-+echo "configure:2760: checking for connect in -linet" >&5
-+ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-linet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2540 "configure"
-+#line 2768 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char connect();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2561,7 +2790,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo inet | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo inet | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -2583,144 +2813,154 @@
- fi
- 
  
 -KRB4=/usr/kerberos
-+includeopt=
-+
-+
 +KRB4=
  
  # Check whether --with-krb4 or --without-krb4 was given.
@@ -1891,7 +14,7 @@ $NetBSD: patch-aw,v 1.3 2000/02/28 03:25:53 thorpej Exp $
 +  if test X"$withval" != X"no"; then KRB4=$withval; fi
 +fi
 +if test X"$KRB4" != X""; then
-+   echo "default place for krb4 is $KRB4"
++    echo "default place for krb4 is $KRB4"
  fi
 -echo "default place for krb4 is $KRB4"
  
@@ -1899,341 +22,21 @@ $NetBSD: patch-aw,v 1.3 2000/02/28 03:25:53 thorpej Exp $
 +if test X"$KRB4" != X""; then
  krb_h=
  echo $ac_n "checking for krb.h""... $ac_c" 1>&6
-+echo "configure:2835: checking for krb.h" >&5
+-echo "configure:2836: checking for krb.h" >&5
++echo "configure:2839: checking for krb.h" >&5
  if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
     hold_cflags=$CFLAGS
     CFLAGS="$CFLAGS -I$KRB4/include"
-    cat > conftest.$ac_ext <<EOF
--#line 2603 "configure"
-+#line 2840 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() { return 0; }
--int t() {
-+int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   krb_h=yes krb_incdir=$KRB4/include
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CFLAGS=$hold_cflags
-            cat > conftest.$ac_ext <<EOF
--#line 2618 "configure"
-+#line 2856 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() { return 0; }
--int t() {
-+int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   krb_h=yes krb_incdir=
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--
- fi
- rm -f conftest*
--
-    CFLAGS=$hold_cflags
- else
-    cat > conftest.$ac_ext <<EOF
--#line 2638 "configure"
-+#line 2876 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() { return 0; }
--int t() {
-+int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   krb_h=yes krb_incdir=
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--
- fi
- if test -z "$krb_h"; then
-   cat > conftest.$ac_ext <<EOF
--#line 2655 "configure"
-+#line 2894 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() { return 0; }
--int t() {
-+int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   krb_h=yes krb_incdir=
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   if test "$cross_compiling" != yes && test -r $KRB4/include/kerberosIV/krb.h; then
-        hold_cflags=$CFLAGS
-        CFLAGS="$CFLAGS -I$KRB4/include/kerberosIV"
-        cat > conftest.$ac_ext <<EOF
--#line 2672 "configure"
-+#line 2912 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() { return 0; }
--int t() {
-+int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:2680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   krb_h=yes krb_incdir=$KRB4/include/kerberosIV
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--
-        CFLAGS=$hold_cflags
-      fi
- fi
- rm -f conftest*
--
- fi
- echo "$ac_t""$krb_h" 1>&6
- 
--includeopt=
--
- if test -n "$krb_h"; then
-   krb_lib=
-   if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
-        hold_ldflags=$LDFLAGS
-        LDFLAGS="-L${KRB4}/lib $LDFLAGS"
--       echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
--ac_lib_var=`echo krb'_'printf | tr './+\055' '__p_'`
-+       echo $ac_n "checking for printf in -lkrb""... $ac_c" 1>&6
-+echo "configure:2940: checking for printf in -lkrb" >&5
-+ac_lib_var=`echo krb'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lkrb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2709 "configure"
-+#line 2948 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char printf();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2736,30 +2976,32 @@
- LDFLAGS=$hold_ldflags
-             # Using open here instead of printf so we don't
-             # get confused by the cached value for printf from above.
--            echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
--ac_lib_var=`echo krb'_'open | tr './+\055' '__p_'`
-+            echo $ac_n "checking for open in -lkrb""... $ac_c" 1>&6
-+echo "configure:2981: checking for open in -lkrb" >&5
-+ac_lib_var=`echo krb'_'open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lkrb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2748 "configure"
-+#line 2989 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char open();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- open()
- ; return 0; }
- EOF
--if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2778,30 +3020,32 @@
- 
-        LDFLAGS=$hold_ldflags
-   else
--       echo $ac_n "checking for -lkrb""... $ac_c" 1>&6
--ac_lib_var=`echo krb'_'printf | tr './+\055' '__p_'`
-+       echo $ac_n "checking for printf in -lkrb""... $ac_c" 1>&6
-+echo "configure:3025: checking for printf in -lkrb" >&5
-+ac_lib_var=`echo krb'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lkrb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2790 "configure"
-+#line 3033 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char printf();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2829,30 +3073,32 @@
-     # the user's setting for LDFLAGS
-     hold_ldflags=$LDFLAGS
-     test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
--    echo $ac_n "checking for -ldes""... $ac_c" 1>&6
--ac_lib_var=`echo des'_'printf | tr './+\055' '__p_'`
-+    echo $ac_n "checking for printf in -ldes""... $ac_c" 1>&6
-+echo "configure:3078: checking for printf in -ldes" >&5
-+ac_lib_var=`echo des'_'printf | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-ldes  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2841 "configure"
-+#line 3086 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char printf();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- printf()
- ; return 0; }
- EOF
--if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2876,11 +3122,12 @@
- for ac_func in krb_get_err_text
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:3126: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2884 "configure"
-+#line 3131 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2890,8 +3137,7 @@
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -2904,16 +3150,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-@@ -2926,39 +3174,46 @@
+@@ -3177,17 +3180,24 @@
  fi
  done
  
 +fi	# KRB4 empty
++
++includeopt=
  
 -GSSAPI=/usr/cygnus/kerbnet
++
 +GSSAPI=
  
  # Check whether --with-gssapi or --without-gssapi was given.
@@ -2243,7 +46,7 @@ $NetBSD: patch-aw,v 1.3 2000/02/28 03:25:53 thorpej Exp $
 +  if test X"$withval" != X"no"; then GSSAPI=$withval; fi
 +fi
 +if test X"$GSSAPI" != X""; then
-+   echo "default place for GSSAPI is $GSSAPI"
++    echo "default place for GSSAPI is $GSSAPI"
  fi
 -echo "default place for GSSAPI is $GSSAPI"
  
@@ -2251,120 +54,8 @@ $NetBSD: patch-aw,v 1.3 2000/02/28 03:25:53 thorpej Exp $
 +if test X"$GSSAPI" != X""; then
  hold_cppflags=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
- for ac_hdr in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
- do
--ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:3199: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2951 "configure"
-+#line 3204 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:3209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
- else
-   echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=no"
- fi
-@@ -2966,7 +3221,7 @@
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_hdr 1
- EOF
-@@ -2988,13 +3243,13 @@
-   if test "$ac_cv_header_gssapi_h" = "yes"; then
-     LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
-   else
--    LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
-+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-   fi
-   save_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
-   if test "$ac_cv_header_gssapi_h" = "yes"; then
-     cat > conftest.$ac_ext <<EOF
--#line 2998 "configure"
-+#line 3253 "configure"
- #include "confdefs.h"
- #include <gssapi.h>
- EOF
-@@ -3010,7 +3265,7 @@
- 
-   else
-     cat > conftest.$ac_ext <<EOF
--#line 3014 "configure"
-+#line 3269 "configure"
- #include "confdefs.h"
- #include <gssapi/gssapi.h>
- EOF
-@@ -3028,30 +3283,32 @@
-   CPPFLAGS=$save_CPPFLAGS
-   # This is necessary on Irix 5.3, in order to link against libkrb5 --
-   # there, an_to_ln.o refers to things defined only in -lgen.
--  echo $ac_n "checking for -lgen""... $ac_c" 1>&6
--ac_lib_var=`echo gen'_'compile | tr './+\055' '__p_'`
-+  echo $ac_n "checking for compile in -lgen""... $ac_c" 1>&6
-+echo "configure:3288: checking for compile in -lgen" >&5
-+ac_lib_var=`echo gen'_'compile | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lgen  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3040 "configure"
-+#line 3296 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char compile();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- compile()
- ; return 0; }
- EOF
--if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -3061,7 +3318,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo gen | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo gen | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -3073,6 +3331,7 @@
+ for ac_hdr in krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
+@@ -3332,6 +3342,7 @@
  fi
  
  fi
@@ -2372,380 +63,3 @@ $NetBSD: patch-aw,v 1.3 2000/02/28 03:25:53 thorpej Exp $
  
  # Check whether --enable-encryption or --disable-encryption was given.
  if test "${enable_encryption+set}" = set; then
-@@ -3094,11 +3353,12 @@
- fi
- 
- echo $ac_n "checking for gethostname""... $ac_c" 1>&6
-+echo "configure:3357: checking for gethostname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3102 "configure"
-+#line 3362 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostname(); below.  */
-@@ -3108,8 +3368,7 @@
-     builtin and then its argument prototype would still apply.  */
- char gethostname();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -3122,16 +3381,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostname=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_gethostname=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
-@@ -3191,30 +3452,32 @@
- ### there's any harm in just testing for -lcrypt first.
- 
- if test "$enable_server" = yes; then
--echo $ac_n "checking for -lcrypt""... $ac_c" 1>&6
--ac_lib_var=`echo crypt'_'crypt | tr './+\055' '__p_'`
-+echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-+echo "configure:3457: checking for crypt in -lcrypt" >&5
-+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3203 "configure"
-+#line 3465 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char crypt();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:3215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -3224,7 +3487,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo crypt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+    ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -3238,11 +3502,12 @@
- for ac_func in crypt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:3506: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3246 "configure"
-+#line 3511 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3252,8 +3517,7 @@
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
--int main() { return 0; }
--int t() {
-+int main() {
- 
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-@@ -3266,16 +3530,18 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
- fi
- rm -f conftest*
--
- fi
-+
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-@@ -3303,27 +3569,28 @@
- 
- 
- echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
-+echo "configure:3573: checking for cygwin32" >&5
- if eval "test \"`echo '$''{'ccvs_cv_sys_cygwin32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3311 "configure"
-+#line 3578 "configure"
- #include "confdefs.h"
- 
--int main() { return 0; }
--int t() {
-+int main() {
- return __CYGWIN32__;
- ; return 0; }
- EOF
--if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ccvs_cv_sys_cygwin32=yes
- else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ccvs_cv_sys_cygwin32=no
- fi
- rm -f conftest*
--
- fi
- 
- echo "$ac_t""$ccvs_cv_sys_cygwin32" 1>&6
-@@ -3370,11 +3637,25 @@
- # --recheck option to rerun configure.
- #
- EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
--  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
--  >> confcache
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
- if cmp -s $cache_file confcache; then
-   :
- else
-@@ -3429,7 +3710,7 @@
-     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
--    echo "$CONFIG_STATUS generated by autoconf version 2.10"
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-     exit 0 ;;
-   -help | --help | --hel | --he | --h)
-     echo "\$ac_cs_usage"; exit 0 ;;
-@@ -3454,9 +3735,11 @@
-  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -3479,6 +3762,7 @@
- s%@CPP@%$CPP%g
- s%@CVS@%$CVS%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@RANLIB@%$RANLIB%g
- s%@YACC@%$YACC%g
-@@ -3486,12 +3770,48 @@
- s%@perl_path@%$perl_path%g
- s%@csh_path@%$csh_path%g
- s%@LIBOBJS@%$LIBOBJS%g
--s%@KRB4@%$KRB4%g
- s%@includeopt@%$includeopt%g
-+s%@KRB4@%$KRB4%g
- s%@GSSAPI@%$GSSAPI%g
- 
- CEOF
- EOF
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+  if test $ac_beg -gt 1; then
-+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+  else
-+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+  fi
-+  if test ! -s conftest.s$ac_file; then
-+    ac_more_lines=false
-+    rm -f conftest.s$ac_file
-+  else
-+    if test -z "$ac_sed_cmds"; then
-+      ac_sed_cmds="sed -f conftest.s$ac_file"
-+    else
-+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+    fi
-+    ac_file=`expr $ac_file + 1`
-+    ac_beg=$ac_end
-+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+  fi
-+done
-+if test -z "$ac_sed_cmds"; then
-+  ac_sed_cmds=cat
-+fi
-+EOF
-+
- cat >> $CONFIG_STATUS <<EOF
- 
- CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile src/Makefile zlib/Makefile diff/Makefile doc/Makefile \
-@@ -3503,14 +3823,14 @@
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile]", defaulting infile="outfile.in".
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-   *) ac_file_in="${ac_file}.in" ;;
-   esac
- 
--  # Adjust relative srcdir, etc. for subdirectories.
-+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
- 
-   # Remove last slash and all that follows it.  Not all systems have dirname.
-   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-@@ -3538,6 +3858,7 @@
-   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-   esac
-+
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-@@ -3546,14 +3867,16 @@
- # $configure_input" ;;
-   *) ac_comsub= ;;
-   esac
-+
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-   sed -e "$ac_comsub
- s%@configure_input@%$configure_input%g
- s%@srcdir@%$srcdir%g
- s%@top_srcdir@%$top_srcdir%g
- s%@INSTALL@%$INSTALL%g
--" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
-+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
- fi; done
--rm -f conftest.subs
-+rm -f conftest.s*
- 
- # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
- # NAME is the cpp macro being defined and VALUE is the value it is being given.
-@@ -3574,11 +3897,17 @@
- ac_eC=' '
- ac_eD='%g'
- 
--CONFIG_HEADERS=${CONFIG_HEADERS-"config.h src/options.h"}
-+if test "${CONFIG_HEADERS+set}" != set; then
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+  CONFIG_HEADERS="config.h src/options.h"
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+fi
- for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile]", defaulting infile="outfile.in".
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-   *) ac_file_in="${ac_file}.in" ;;
-   esac
-@@ -3586,7 +3915,8 @@
-   echo creating $ac_file
- 
-   rm -f conftest.frag conftest.in conftest.out
--  cp $ac_given_srcdir/$ac_file_in conftest.in
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  cat $ac_file_inputs > conftest.in
- 
- EOF
- 
-@@ -3614,8 +3944,6 @@
- 
- # Break up conftest.vals because some shells have a limit on
- # the size of here documents, and old seds have small limits too.
--# Maximum number of lines to put in a single here document.
--ac_max_here_lines=12
- 
- rm -f conftest.tail
- while :
-@@ -3657,7 +3985,11 @@
-   fi
- fi; done
- 
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
- 
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
- 
- exit 0
- EOF
diff --git a/devel/cvs/patches/patch-ax b/devel/cvs/patches/patch-ax
index ba8be352986..bdc99ab050d 100644
--- a/devel/cvs/patches/patch-ax
+++ b/devel/cvs/patches/patch-ax
@@ -1,7 +1,8 @@
-$NetBSD: patch-ax,v 1.2 1999/12/28 04:58:38 wiz Exp $
---- diff/Makefile.in.orig	Tue Nov  2 20:08:02 1999
-+++ diff/Makefile.in	Tue Nov  2 20:07:31 1999
-@@ -35,7 +35,7 @@
+$NetBSD: patch-ax,v 1.3 2000/10/18 03:31:17 hubertf Exp $
+
+--- diff/Makefile.in.orig	Thu May  6 18:32:55 1999
++++ diff/Makefile.in
+@@ -31,7 +31,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  
diff --git a/devel/cvs/patches/patch-az b/devel/cvs/patches/patch-az
index 8d296fdd505..264ffaa6b4c 100644
--- a/devel/cvs/patches/patch-az
+++ b/devel/cvs/patches/patch-az
@@ -1,10 +1,10 @@
-$NetBSD: patch-az,v 1.1 2000/02/23 06:49:28 mycroft Exp $
+$NetBSD: patch-az,v 1.2 2000/10/18 03:31:17 hubertf Exp $
 
---- src/modules.c.orig	Wed Feb 23 01:29:50 2000
-+++ src/modules.c	Wed Feb 23 01:27:57 2000
-@@ -720,7 +720,8 @@
- 		    run_print (stdout);
+--- src/modules.c.orig	Wed Jul 26 21:29:01 2000
++++ src/modules.c
+@@ -740,7 +740,8 @@
  		    cvs_output ("'\n", 0);
+ 		    cvs_flushout ();
  		}
 -		err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
 +		err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
diff --git a/devel/cvs/pkg/PLIST b/devel/cvs/pkg/PLIST
index 740df397ef1..d10593384a8 100644
--- a/devel/cvs/pkg/PLIST
+++ b/devel/cvs/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 1999/02/11 19:17:29 tv Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/10/18 03:31:17 hubertf Exp $
 bin/cvs
 bin/cvsbug
 bin/rcs2log
-@unexec	install-info --delete --info-dir=%D/info	%D/info/cvs.info
-@unexec	install-info --delete --info-dir=%D/info	%D/info/cvsclient.info
+@unexec install-info --delete --info-dir=%D/info %D/info/cvs.info
 info/cvs.info
+@exec install-info --info-dir=%D/info %D/info/cvs.info
 info/cvs.info-1
 info/cvs.info-2
 info/cvs.info-3
@@ -14,18 +14,21 @@ info/cvs.info-6
 info/cvs.info-7
 info/cvs.info-8
 info/cvs.info-9
+@unexec install-info --delete --info-dir=%D/info %D/info/cvsclient.info
 info/cvsclient.info
+@exec install-info --info-dir=%D/info %D/info/cvsclient.info
 info/cvsclient.info-1
 info/cvsclient.info-2
 info/cvsclient.info-3
-@exec	install-info --info-dir=%D/info		%D/info/cvs.info
-@exec	install-info --info-dir=%D/info		%D/info/cvsclient.info
+man/man1/cvs.1
+man/man5/cvs.5
+man/man8/cvsbug.8
 share/cvs/contrib/README
 share/cvs/contrib/clmerge
 share/cvs/contrib/cln_hist
 share/cvs/contrib/commit_prep
-share/cvs/contrib/cvs_acls
 share/cvs/contrib/cvs2vendor
+share/cvs/contrib/cvs_acls
 share/cvs/contrib/cvscheck
 share/cvs/contrib/cvscheck.man
 share/cvs/contrib/intro.doc
@@ -38,6 +41,3 @@ share/cvs/contrib/rcslock
 share/cvs/contrib/sccs2rcs
 @dirrm share/cvs/contrib
 @dirrm share/cvs
-man/man1/cvs.1
-man/man5/cvs.5
-man/man8/cvsbug.8