Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/cvs
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2002-05-04 04:28:40 +0000
committerDaniel Robbins <drobbins@gentoo.org>2002-05-04 04:28:40 +0000
commit0b46e05f4c5dea7732ebeb482950a55ca229d8b9 (patch)
tree09243ce530a7462760ade3895609e7021f6e516a /dev-util/cvs
parentadd LICENSE, SLOT, $Headers. (diff)
downloadhistorical-0b46e05f4c5dea7732ebeb482950a55ca229d8b9.tar.gz
historical-0b46e05f4c5dea7732ebeb482950a55ca229d8b9.tar.bz2
historical-0b46e05f4c5dea7732ebeb482950a55ca229d8b9.zip
cleanups
Diffstat (limited to 'dev-util/cvs')
-rw-r--r--dev-util/cvs/ChangeLog17
-rw-r--r--dev-util/cvs/cvs-1.11-r1.ebuild32
-rw-r--r--dev-util/cvs/cvs-1.11.1_p1.ebuild46
-rw-r--r--dev-util/cvs/cvs-1.11.2.ebuild17
-rw-r--r--dev-util/cvs/files/cvs-1.11.1p1-extzlib.patch15562
-rw-r--r--dev-util/cvs/files/digest-cvs-1.11-r11
-rw-r--r--dev-util/cvs/files/digest-cvs-1.11.1_p11
7 files changed, 14 insertions, 15662 deletions
diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index e4a7cdc155e4..377f887d560a 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,19 +1,14 @@
# ChangeLog for dev-util/cvs
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.3 2002/04/26 06:49:28 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.4 2002/05/04 04:28:40 drobbins Exp $
*cvs-1.11.2 (26 Apr 2002)
- 26 Apr 2002; Arcady Genkin <agenkin@thpoon.com> cvs-1.11.2.ebuild :
-
- Updated to version 1.11.2
- Changed download URI to use HTTP instead of FTP, b/c the ftp server of
- cvshome.org seems flaky.
+ 26 Apr 2002; Arcady Genkin <agenkin@thpoon.com> cvs-1.11.2.ebuild : Updated
+ to version 1.11.2 Changed download URI to use HTTP instead of FTP, b/c the
+ ftp server of cvshome.org seems flaky.
*cvs-1.11.1_p1 (16 Mar 2002)
- 16 Mar 2002; Bruce A. Locke <blocke@shivan.org> cvs-1.11.1_p1.ebuild :
-
- Update to cvs 1.11.1p1 with Redhat's external zlib linking patch
-
-
+ 16 Mar 2002; Bruce A. Locke <blocke@shivan.org> cvs-1.11.1_p1.ebuild : Update
+ to cvs 1.11.1p1 with Redhat's external zlib linking patch
diff --git a/dev-util/cvs/cvs-1.11-r1.ebuild b/dev-util/cvs/cvs-1.11-r1.ebuild
deleted file mode 100644
index bcc1539cfaba..000000000000
--- a/dev-util/cvs/cvs-1.11-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11-r1.ebuild,v 1.3 2001/11/10 12:45:09 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-SRC_URI="ftp://ftp.cvshome.org/pub/${P}/${P}.tar.gz"
-HOMEPAGE="http://www.cvshome.org/"
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.1"
-
-src_compile() {
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info
- assert
-
- make || die
-}
-
-src_install() {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info \
- install || die
-
- dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING
- dodoc MINOR* NEWS PROJECTS README* TESTS TODO
- mv ${D}/usr/lib/cvs/contrib ${D}/usr/doc/${P}/contrib
- insinto /usr/share/emacs/site-lisp
- doins cvs-format.el
-}
diff --git a/dev-util/cvs/cvs-1.11.1_p1.ebuild b/dev-util/cvs/cvs-1.11.1_p1.ebuild
deleted file mode 100644
index 6b91015de6f1..000000000000
--- a/dev-util/cvs/cvs-1.11.1_p1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.1_p1.ebuild,v 1.1 2002/03/16 10:09:50 blocke Exp $
-
-# hopefully future upstream releases won't need such hardcoding
-PVER="1.11.1p1"
-PFTPDIR="cvs-1.11.1"
-
-S=${WORKDIR}/cvs-${PVER}
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-SRC_URI="ftp://ftp.cvshome.org/pub/${PFTPDIR}/cvs-${PVER}.tar.gz"
-HOMEPAGE="http://www.cvshome.org/"
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.1 >=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-
- unpack ${DISTFILES}/cvs-${PVER}.tar.gz
-
- # Redhat's external zlib patch
- cd ${S}/..
- patch -p0 < ${FILESDIR}/cvs-1.11.1p1-extzlib.patch
-
-}
-
-src_compile() {
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info
- assert
-
- make || die
-}
-
-src_install() {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info \
- install || die
-
- dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING
- dodoc MINOR* NEWS PROJECTS README* TESTS TODO
- mv ${D}/usr/lib/cvs/contrib ${D}/usr/doc/${P}/contrib
- insinto /usr/share/emacs/site-lisp
- doins cvs-format.el
-}
diff --git a/dev-util/cvs/cvs-1.11.2.ebuild b/dev-util/cvs/cvs-1.11.2.ebuild
index e1afae3ce1d2..8473e0db8b86 100644
--- a/dev-util/cvs/cvs-1.11.2.ebuild
+++ b/dev-util/cvs/cvs-1.11.2.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.2.ebuild,v 1.1 2002/04/26 06:49:28 agenkin Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.2.ebuild,v 1.2 2002/05/04 04:28:40 drobbins Exp $
S=${WORKDIR}/${P}
DESCRIPTION="Concurrent Versions System - source code revision control tools"
@@ -12,17 +11,17 @@ DEPEND="virtual/glibc
>=sys-libs/zlib-1.1.4"
src_compile() {
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
--infodir=/usr/share/info
assert
make || die
}
src_install() {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info \
+ make prefix=${D}/usr \
+ mandir=${D}/usr/share/man \
+ infodir=${D}/usr/share/info \
install || die
dodoc BUGS COPYING* ChangeLog* DEVEL* FAQ HACKING
diff --git a/dev-util/cvs/files/cvs-1.11.1p1-extzlib.patch b/dev-util/cvs/files/cvs-1.11.1p1-extzlib.patch
deleted file mode 100644
index ded78385684e..000000000000
--- a/dev-util/cvs/files/cvs-1.11.1p1-extzlib.patch
+++ /dev/null
@@ -1,15562 +0,0 @@
-diff -uNr cvs-1.11.1p1/Makefile.am cvs-1.11.1p1/Makefile.am
---- cvs-1.11.1p1/Makefile.am Wed Jan 3 10:50:41 2001
-+++ cvs-1.11.1p1/Makefile.am Mon Feb 18 10:48:31 2002
-@@ -17,7 +17,7 @@
- ## Subdirectories to run make in for the primary targets.
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- windows-NT os2 emx vms
-diff -uNr cvs-1.11.1p1/configure.in cvs-1.11.1p1/configure.in
---- cvs-1.11.1p1/configure.in Mon Feb 18 10:47:54 2002
-+++ cvs-1.11.1p1/configure.in Mon Feb 18 10:48:22 2002
-@@ -368,7 +368,7 @@
- vms/Makefile \
- windows-NT/Makefile \
- windows-NT/SCC/Makefile \
-- zlib/Makefile],
-+ ],
- [chmod -f +x \
- contrib/clmerge \
- contrib/cln_hist \
-diff -uNr cvs-1.11.1p1/src/Makefile.am cvs-1.11.1p1/src/Makefile.am
---- cvs-1.11.1p1/src/Makefile.am Tue Apr 24 14:14:53 2001
-+++ cvs-1.11.1p1/src/Makefile.am Mon Feb 18 10:47:33 2002
-@@ -20,7 +20,7 @@
- # try and remove naming ocnflicts and fix Automake to allow particular includes
- # to be attached only to particular object files. Short term fix is either or.
- ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
-
- bin_PROGRAMS = cvs
- bin_SCRIPTS = cvsbug
-@@ -95,7 +95,7 @@
- cvs_LDADD = \
- ../diff/libdiff.a \
- ../lib/libcvs.a \
-- ../zlib/libz.a \
-+ -lz \
- version.o
- cvs_EXTRA_DIST = version.c
-
-diff -uNr cvs-1.11.1p1/Makefile.in cvs-1.11.1p1/Makefile.in
---- cvs-1.11.1p1/Makefile.in Fri Apr 27 16:02:06 2001
-+++ cvs-1.11.1p1/Makefile.in Tue Feb 19 10:52:44 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -26,7 +26,6 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -47,11 +46,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = .
-
- ACLOCAL = @ACLOCAL@
-@@ -65,7 +62,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -77,25 +73,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -103,7 +96,7 @@
-
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- windows-NT os2 emx vms
-@@ -128,16 +121,15 @@
- cvsnt.dsw \
- cvsnt.mak
-
--EXEEXT =
--OBJEXT = o
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h $(top_builddir)/src/options.h
--CONFIG_CLEAN_FILES = emx/Makefile os2/Makefile zlib/Makefile
-+CONFIG_CLEAN_FILES = emx/Makefile os2/Makefile
- DIST_SOURCES =
-
--RECURSIVE_TARGETS = all-recursive install-data-recursive \
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+ uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README ./stamp-h1.in AUTHORS COPYING COPYING.LIB \
-@@ -149,25 +141,21 @@
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
- .SUFFIXES:
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$@ $(SHELL) ./config.status
-
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
--
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-
- $(ACLOCAL_M4): configure.in acinclude.m4
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
-@@ -197,8 +185,7 @@
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
- os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
--zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in
-- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
-+uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -272,39 +259,44 @@
- here=`pwd`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && tags="$$tags $(ETAGS_INCLUDE_OPTION)$$here/$$subdir/TAGS"; \
-+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-- unique=`for i in $$list @CONFIG@; do \
-+ unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-- || $(ETAGS) $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
-+ || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
-
- GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
-- && gtags -i $$here
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
-- -rm -f TAGS ID
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
- top_distdir = .
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+# Avoid unsightly `./'.
-+distdir = $(PACKAGE)-$(VERSION)
-
- GZIP_ENV = --best
-
- distdir: $(DISTFILES)
- -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
- mkdir $(distdir)
-- $(mkinstalldirs) $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/zlib
-+ $(mkinstalldirs) $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -359,7 +351,9 @@
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-- && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-+ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-+ || (echo "Error: files left after uninstall" 1>&2; \
-+ exit 1) ) \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && $(MAKE) $(AM_MAKEFLAGS) distclean \
- && rm -f $(distdir).tar.gz \
-@@ -372,7 +366,6 @@
- check-am: all-am
- check: check-recursive
- all-am: Makefile config.h
--
- installdirs: installdirs-recursive
- installdirs-am:
-
-@@ -385,38 +378,37 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-recursive
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-recursive
-
- clean-am: clean-generic mostlyclean-am
-
--dist-all: dist dist-bzip2
--
-+dist-all: distdir
-+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-+ -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
- distclean: distclean-recursive
-- -rm -f config.status
-+ -rm -f config.status config.cache config.log
- distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
--dvi:
-+dvi: dvi-recursive
-
- dvi-am:
-
--info:
-+info: info-recursive
-
- info-am:
-
-@@ -424,33 +416,39 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-recursive
-
- install-man:
-
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-- -rm -f config.status
-+
- maintainer-clean-am: distclean-am maintainer-clean-generic
-
- mostlyclean: mostlyclean-recursive
-
- mostlyclean-am: mostlyclean-generic
-
--.PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive dist dist-all dist-bzip2 \
- distcheck distclean distclean-generic distclean-hdr \
-- distclean-recursive distclean-tags distdir dvi dvi-am info \
-- info-am install install-am install-data install-data-am \
-- install-data-recursive install-exec install-exec-am \
-- install-exec-recursive install-info install-man \
-+ distclean-recursive distclean-tags distdir dvi dvi-am \
-+ dvi-recursive info info-am info-recursive install install-am \
-+ install-data install-data-am install-data-recursive \
-+ install-exec install-exec-am install-exec-recursive \
-+ install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
-- uninstall-am uninstall-recursive
-+ uninstall-am uninstall-info-am uninstall-info-recursive \
-+ uninstall-recursive
-
-
- .PHONY: remotecheck
-@@ -473,7 +471,6 @@
- # for backwards compatibility with the old makefiles
- .PHONY: realclean
- realclean: maintainer-clean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/aclocal.m4 cvs-1.11.1p1/aclocal.m4
---- cvs-1.11.1p1/aclocal.m4 Fri Apr 27 16:02:04 2001
-+++ cvs-1.11.1p1/aclocal.m4 Tue Feb 19 10:52:42 2002
-@@ -1,6 +1,6 @@
--# aclocal.m4 generated automatically by aclocal 1.4e
-+# aclocal.m4 generated automatically by aclocal 1.5
-
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
-+# Copyright 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -295,7 +295,16 @@
- # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
- # the ones we care about.
- ifdef([m4_pattern_allow],
-- [m4_pattern_allow([^AM_(C|CPP|CXX|OBJC|F|R|GCJ)FLAGS])])dnl
-+ [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
-+
-+# Autoconf 2.50 always computes EXEEXT. However we need to be
-+# compatible with 2.13, for now. So we always define EXEEXT, but we
-+# don't compute it.
-+AC_SUBST(EXEEXT)
-+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
-+# requests that it be used. This is a bit dumb.
-+: ${OBJEXT=o}
-+AC_SUBST(OBJEXT)
-
- # Some tools Automake needs.
- AC_REQUIRE([AM_SANITY_CHECK])dnl
-@@ -306,23 +315,22 @@
- AM_MISSING_PROG(AUTOHEADER, autoheader)
- AM_MISSING_PROG(MAKEINFO, makeinfo)
- AM_MISSING_PROG(AMTAR, tar)
--AM_MISSING_INSTALL_SH
-+AM_PROG_INSTALL_SH
- AM_PROG_INSTALL_STRIP
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
- AC_REQUIRE([AC_PROG_AWK])dnl
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_PROG_ETAGS])dnl
- AC_REQUIRE([AM_DEP_TRACK])dnl
- AC_REQUIRE([AM_SET_DEPDIR])dnl
- AC_PROVIDE_IFELSE([AC_PROG_][CC],
-- [AM_DEPENDENCIES(CC)],
-+ [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_][CC],
-- defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl
-+ defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-- [AM_DEPENDENCIES(CXX)],
-+ [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_][CXX],
-- defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl
-+ defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
- ])
-
- #
-@@ -349,6 +357,7 @@
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
-+ rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-@@ -369,7 +378,6 @@
- AC_MSG_ERROR([newly created file is older than distributed files!
- Check your system clock])
- fi
--rm -f conftest*
- AC_MSG_RESULT(yes)])
-
-
-@@ -383,32 +391,13 @@
- AC_SUBST($1)])
-
-
--# AM_MISSING_INSTALL_SH
--# ---------------------
--# Like AM_MISSING_PROG, but only looks for install-sh.
--AC_DEFUN([AM_MISSING_INSTALL_SH],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--if test -z "$install_sh"; then
-- for install_sh in "$ac_aux_dir/install-sh" \
-- "$ac_aux_dir/install.sh" \
-- "${am_missing_run}${ac_auxdir}/install-sh";
-- do
-- test -f "$install_sh" && break
-- done
-- # FIXME: an evil hack: we remove the SHELL invocation from
-- # install_sh because automake adds it back in. Sigh.
-- install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
--fi
--AC_SUBST(install_sh)])
--
--
- # AM_MISSING_HAS_RUN
- # ------------------
- # Define MISSING if not defined so far and test if it supports --run.
- # If it does, set am_missing_run to use it, otherwise, to nothing.
- AC_DEFUN([AM_MISSING_HAS_RUN],
--[test x"${MISSING+set}" = xset ||
-- MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-@@ -422,140 +411,71 @@
- # AM_AUX_DIR_EXPAND
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to ${srcdir}/foo. In other projects, it is set to `.'.
--# Of course, Automake must honor this variable whenever it call a tool
--# from the auxiliary directory. The problem is that $srcdir (hence
--# $ac_aux_dir) can be either an absolute path or a path relative to
--# $top_srcdir or absolute, this depends on how configure is run. This
--# is pretty anoying since it makes $ac_aux_dir quite unusable in
--# subdirectories: on the top source directory, any form will work
--# fine, but in subdirectories relative pat needs to be adapted.
--# - calling $top_srcidr/$ac_aux_dir/missing would success if $srcdir is
--# relative, but fail if $srcdir is absolute
--# - conversly, calling $ax_aux_dir/missing would fail if $srcdir is
--# absolute, and success on relative paths.
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
- #
--# Consequently, we define and use $am_aux_dir, the "always absolute"
--# version of $ac_aux_dir.
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-
- AC_DEFUN([AM_AUX_DIR_EXPAND], [
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
- ])
-
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
--# annoying in cross=compiling environments, where the build's strip
-+# annoying in cross-compiling environments, where the build's strip
- # is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so if we ever
--# need to use a non standard strip, we just have to make sure we use
--# install-sh with the STRIPPROG variable set.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
- AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_MISSING_INSTALL_SH])
--dnl Don't test for $cross_compiling = yes, it might be `maybe'...
--# We'd like to do this but we can't because it will unconditionally
--# require config.guess. One way would be if autoconf had the capability
--# to let us compile in this code only when config.guess was already
--# a possibility.
--#if test "$cross_compiling" != no; then
--# # since we are cross-compiling, we need to check for a suitable `strip'
--# AM_PROG_STRIP
--# if test -z "$STRIP"; then
--# AC_MSG_WARN([strip missing, install-strip will not strip binaries])
--# fi
--#fi
--
--# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
--# instruct install-strip to use install-sh and the given $STRIP program.
--# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
--# as much as possible, because it's faster.
--if test -z "$STRIP"; then
-- # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-- # and the double dolard below is there to make sure that ${INSTALL}
-- # is substitued in the sub-makes, not at the top-level; this is
-- # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-- # by config.status).
-- INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-- INSTALL_STRIP_PROGRAM_ENV=''
--else
-- _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
-- INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-- INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
--fi
--AC_SUBST([STRIP])
--AC_SUBST([INSTALL_STRIP_PROGRAM])
--AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
--
--#AC_DEFUN([AM_PROG_STRIP],
--#[# Check for `strip', unless the installer
--# has set the STRIP environment variable.
--# Note: don't explicitly check for -z "$STRIP" here because
--# that will cause problems if AC_CANONICAL_* is AC_REQUIREd after
--# this macro, and anyway it doesn't have an effect anyway.
--#AC_CHECK_TOOL([STRIP],[strip])
--#])
--
--#
--# Find some information about the etags program
--#
--# Sets
--# ETAGS = path to etags
--# ETAGS_INCLUDE_OPTION = option to pass to etags with arg for includes
--#
--
--AC_DEFUN([AM_PROG_ETAGS],
--[AC_BEFORE([$0], [AM_PROG_ETAGS_WORKS])dnl
--AC_CHECK_PROG(ETAGS, etags, etags)
--if test -z "$ETAGS"; then
-- AC_CHECK_PROG(ETAGS, ctags, ctags -e)
--fi
--if test -n "$ETAGS"; then
-- AM_PROG_ETAGS_WORKS
-- if test "$am_cv_prog_etags_works" = yes ; then
-- AM_PROG_ETAGS_INCLUDE_OPTION
-- else
-- AM_MISSING_PROG(ETAGS, etags)
-- fi
--else
-- AM_MISSING_PROG(ETAGS, etags)
--fi])
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-+# serial 4 -*- Autoconf -*-
-
--AC_DEFUN([AM_PROG_ETAGS_WORKS],
--[AC_CACHE_CHECK([whether ${ETAGS-etags} works], [am_cv_prog_etags_works],
--[cat >conftest.c <<EOF
--int globalvar;
--EOF
--if AC_TRY_COMMAND([${ETAGS-etags} -f - conftest.c |egrep ^int\ globalvar\; >&2]); then
-- am_cv_prog_etags_works=yes
--else
-- am_cv_prog_etags_works=no
--fi
--rm -f conftest.c])])
--
--AC_DEFUN([AM_PROG_ETAGS_INCLUDE_OPTION],
--[AC_REQUIRE([AM_PROG_ETAGS_WORKS])dnl
--if test "$am_cv_prog_etags_works" = yes ; then
-- AC_CACHE_CHECK([for etags include option],
-- [am_cv_prog_etags_include_option],
-- [cat >conftest.c <<EOF
--int globalvar;
--EOF
-- if AC_TRY_COMMAND([${ETAGS-etags} --etags-include=TAGS.inc -f - conftest.c |egrep ^TAGS.inc,include\$ >&2]); then
-- am_cv_prog_etags_include_option=--etags-include=
-- elif AC_TRY_COMMAND([${ETAGS-etags} -i TAGS.inc -f - conftest.c |egrep ^TAGS.inc,include\$ >&2]); then
-- am_cv_prog_etags_include_option='"-i "'
-- else :
-- # AC_MSG_ERROR(unfamiliar etags implementation)
-- fi
-- rm -f conftest.c])
--else
-- :
--fi
--ETAGS_INCLUDE_OPTION="$am_cv_prog_etags_include_option"
--AC_SUBST(ETAGS_INCLUDE_OPTION)])
-
--# serial 3
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -563,53 +483,57 @@
- # C support machinery. Also note that it means that autoscan, seeing
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
--# AM_DEPENDENCIES(NAME)
-+
-+
-+# _AM_DEPENDENCIES(NAME)
- # ---------------------
- # See how the compiler implements dependency checking.
- # NAME is "CC", "CXX" or "OBJC".
- # We try a few techniques and use that to set a single cache variable.
--AC_DEFUN([AM_DEPENDENCIES],
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
- [AC_REQUIRE([AM_SET_DEPDIR])dnl
- AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
--ifelse([$1], CC,
-- [AC_REQUIRE([AC_PROG_][CC])dnl
--AC_REQUIRE([AC_PROG_][CPP])
--depcc="$CC"
--depcpp="$CPP"],
-- [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl
--AC_REQUIRE([AC_PROG_][CXXCPP])
--depcc="$CXX"
--depcpp="$CXXCPP"],
-- [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc],
-- [AC_REQUIRE([AC_PROG_][$1])dnl
--depcc="$$1"
--depcpp=""])
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-
--AC_REQUIRE([AM_MAKE_INCLUDE])
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-
- AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP"; then
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
-- mkdir confdir
-+ mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
-- cp "$am_depcomp" confdir
-- cd confdir
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-
- am_cv_$1_dependencies_compiler_type=none
-- for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
-+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
-- case "$depmode" in
-+ case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
-@@ -624,18 +548,19 @@
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
-- if depmode="$depmode" \
-+ if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-- grep conftest.h conftest.Po > /dev/null 2>&1; then
-- am_cv_$1_dependencies_compiler_type="$depmode"
-+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- done
-
- cd ..
-- rm -rf confdir
-+ rm -rf conftest.dir
- else
- am_cv_$1_dependencies_compiler_type=none
- fi
-@@ -648,16 +573,17 @@
- # AM_SET_DEPDIR
- # -------------
- # Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in AM_DEPENDENCIES
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
- AC_DEFUN([AM_SET_DEPDIR],
--[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
-+[rm -f .deps 2>/dev/null
-+mkdir .deps 2>/dev/null
-+if test -d .deps; then
- DEPDIR=.deps
-- # We redirect because .deps might already exist and be populated.
-- # In this situation we don't want to see an error.
-- rmdir .deps > /dev/null 2>&1
- else
-+ # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
- fi
-+rmdir .deps 2>/dev/null
- AC_SUBST(DEPDIR)
- ])
-
-@@ -689,7 +615,7 @@
- # need in order to bootstrap the dependency handling code.
- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
- AC_OUTPUT_COMMANDS([
--test x"$AMDEP" != x"" ||
-+test x"$AMDEP_TRUE" != x"" ||
- for mf in $CONFIG_FILES; do
- case "$mf" in
- Makefile) dirpart=.;;
-@@ -726,7 +652,7 @@
- echo '# dummy' > "$dirpart/$file"
- done
- done
--], [AMDEP="$AMDEP"
-+], [AMDEP_TRUE="$AMDEP_TRUE"
- ac_aux_dir="$ac_aux_dir"])])
-
- # AM_MAKE_INCLUDE()
-@@ -740,27 +666,32 @@
- END
- # If we don't find an include directive, just comment out the code.
- AC_MSG_CHECKING([for style of include used by $am_make])
--_am_include='#'
--_am_quote=
-+am__include='#'
-+am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- _am_include=include
-- _am_quote=
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
- _am_result=GNU
- fi
- # Now try BSD make style include.
--if test "$_am_include" = "#"; then
-+if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- _am_include=.include
-- _am_quote='"'
-+ am__include=.include
-+ am__quote='"'
- _am_result=BSD
- fi
- fi
--AC_SUBST(_am_include)
--AC_SUBST(_am_quote)
-+AC_SUBST(am__include)
-+AC_SUBST(am__quote)
- AC_MSG_RESULT($_am_result)
- rm -f confinc confmf
- ])
-@@ -859,3 +790,21 @@
- m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
- ]) # _AM_DIRNAME
-
-+#serial 1
-+# This test replaces the one in autoconf.
-+# Currently this macro should have the same name as the autoconf macro
-+# because gettext's gettext.m4 (distributed in the automake package)
-+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
-+# give these diagnostics:
-+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-+
-+undefine([AC_ISC_POSIX])
-+
-+AC_DEFUN([AC_ISC_POSIX],
-+ [
-+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-+ ]
-+)
-+
-diff -uNr cvs-1.11.1p1/config.h.in cvs-1.11.1p1/config.h.in
---- cvs-1.11.1p1/config.h.in Tue Apr 24 14:14:51 2001
-+++ cvs-1.11.1p1/config.h.in Tue Feb 19 10:52:37 2002
-@@ -1,79 +1,4 @@
- /* config.h.in. Generated automatically from configure.in by autoheader. */
--
--/* Define if on AIX 3.
-- System headers sometimes define this.
-- We just want to avoid a redefinition error message. */
--#ifndef _ALL_SOURCE
--#undef _ALL_SOURCE
--#endif
--
--/* Define if the closedir function returns void instead of int. */
--#undef CLOSEDIR_VOID
--
--/* Define to empty if the keyword does not work. */
--#undef const
--
--/* Define to `int' if <sys/types.h> doesn't define. */
--#undef gid_t
--
--/* Define if your system has a working fnmatch function. */
--#undef HAVE_FNMATCH
--
--/* Define if you support file names longer than 14 characters. */
--#undef HAVE_LONG_FILE_NAMES
--
--/* Define if your struct stat has st_blksize. */
--#undef HAVE_ST_BLKSIZE
--
--/* Define if your struct stat has st_rdev. */
--#undef HAVE_ST_RDEV
--
--/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
--#undef HAVE_SYS_WAIT_H
--
--/* Define if utime(file, NULL) sets file's timestamp to the present. */
--#undef HAVE_UTIME_NULL
--
--/* Define if you have <vfork.h>. */
--#undef HAVE_VFORK_H
--
--/* Define if on MINIX. */
--#undef _MINIX
--
--/* Define to `int' if <sys/types.h> doesn't define. */
--#undef mode_t
--
--/* Define to `int' if <sys/types.h> doesn't define. */
--#undef pid_t
--
--/* Define if the system does not provide POSIX.1 features except
-- with this defined. */
--#undef _POSIX_1_SOURCE
--
--/* Define if you need to in order for stat and other things to work. */
--#undef _POSIX_SOURCE
--
--/* Define as the return type of signal handlers (int or void). */
--#undef RETSIGTYPE
--
--/* Define to `unsigned' if <sys/types.h> doesn't define. */
--#undef size_t
--
--/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
--#undef STAT_MACROS_BROKEN
--
--/* Define if you have the ANSI C header files. */
--#undef STDC_HEADERS
--
--/* Define if you can safely include both <sys/time.h> and <time.h>. */
--#undef TIME_WITH_SYS_TIME
--
--/* Define to `int' if <sys/types.h> doesn't define. */
--#undef uid_t
--
--/* Define vfork as fork if vfork does not work. */
--#undef vfork
--
- /* Define if you have MIT Kerberos version 4 available. */
- #undef HAVE_KERBEROS
-
-@@ -93,6 +18,9 @@
- /* Define if you have the connect function. */
- #undef HAVE_CONNECT
-
-+/* Define if this system supports chown(), link(), and friends. */
-+#undef PRESERVE_PERMISSIONS_SUPPORT
-+
- /* Define if you have memchr (always for CVS). */
- #undef HAVE_MEMCHR
-
-@@ -122,212 +50,326 @@
- /* Define to force lib/regex.c to define re_comp et al. */
- #undef _REGEX_RE_COMP
-
--/* Define if you have the dup2 function. */
-+/* Define if the `closedir' function returns void instead of `int'. */
-+#undef CLOSEDIR_VOID
-+
-+/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
-+ in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only
-+ relevant when using GSSAPI. */
-+#undef GSS_C_NT_HOSTBASED_SERVICE
-+
-+/* Define if you have the <direct.h> header file. */
-+#undef HAVE_DIRECT_H
-+
-+/* Define if you have the <dirent.h> header file, and it defines `DIR'. */
-+#undef HAVE_DIRENT_H
-+
-+/* Define if you have the `dup2' function. */
- #undef HAVE_DUP2
-
--/* Define if you have the fchdir function. */
-+/* Define if you have the <errno.h> header file. */
-+#undef HAVE_ERRNO_H
-+
-+/* Define if you have the `fchdir' function. */
- #undef HAVE_FCHDIR
-
--/* Define if you have the fchmod function. */
-+/* Define if you have the `fchmod' function. */
- #undef HAVE_FCHMOD
-
--/* Define if you have the fsync function. */
-+/* Define if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
-+/* Define if your system has a working `fnmatch' function. */
-+#undef HAVE_FNMATCH
-+
-+/* Define if you have the `fork' function. */
-+#undef HAVE_FORK
-+
-+/* Define if you have the `fsync' function. */
- #undef HAVE_FSYNC
-
--/* Define if you have the ftime function. */
-+/* Define if you have the `ftime' function. */
- #undef HAVE_FTIME
-
--/* Define if you have the ftruncate function. */
-+/* Define if you have the `ftruncate' function. */
- #undef HAVE_FTRUNCATE
-
--/* Define if you have the getgroups function. */
-+/* Define if you have the `getgroups' function. */
- #undef HAVE_GETGROUPS
-
--/* Define if you have the getpagesize function. */
-+/* Define if you have the `getpagesize' function. */
- #undef HAVE_GETPAGESIZE
-
--/* Define if you have the getpassphrase function. */
-+/* Define if you have the `getpassphrase' function. */
- #undef HAVE_GETPASSPHRASE
-
--/* Define if you have the gettimeofday function. */
-+/* Define if you have the `gettimeofday' function. */
- #undef HAVE_GETTIMEOFDAY
-
--/* Define if you have the initgroups function. */
-+/* Define if you have GSSAPI with Kerberos version 5 available. */
-+#undef HAVE_GSSAPI
-+
-+/* Define if you have the <gssapi/gssapi_generic.h> header file. */
-+#undef HAVE_GSSAPI_GSSAPI_GENERIC_H
-+
-+/* Define if you have the <gssapi/gssapi.h> header file. */
-+#undef HAVE_GSSAPI_GSSAPI_H
-+
-+/* Define if you have the <gssapi.h> header file. */
-+#undef HAVE_GSSAPI_H
-+
-+/* Define if you have the `initgroups' function. */
- #undef HAVE_INITGROUPS
-
--/* Define if you have the krb_get_err_text function. */
-+/* Define if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define if you have the <io.h> header file. */
-+#undef HAVE_IO_H
-+
-+/* Define if you have the <krb5.h> header file. */
-+#undef HAVE_KRB5_H
-+
-+/* Define if you have the `krb_get_err_text' function. */
- #undef HAVE_KRB_GET_ERR_TEXT
-
--/* Define if you have the memmove function. */
-+/* Define if you have the `krb' library (-lkrb). */
-+#undef HAVE_LIBKRB
-+
-+/* Define if you have the <limits.h> header file. */
-+#undef HAVE_LIMITS_H
-+
-+/* Define if you support file names longer than 14 characters. */
-+#undef HAVE_LONG_FILE_NAMES
-+
-+/* Define if you have the `memmove' function. */
- #undef HAVE_MEMMOVE
-
--/* Define if you have the mkdir function. */
-+/* Define if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define if you have the `mkdir' function. */
- #undef HAVE_MKDIR
-
--/* Define if you have the mknod function. */
-+/* Define if you have the `mknod' function. */
- #undef HAVE_MKNOD
-
--/* Define if you have the mkstemp function. */
-+/* Define if you have the `mkstemp' function. */
- #undef HAVE_MKSTEMP
-
--/* Define if you have the mktemp function. */
-+/* Define if you have the `mktemp' function. */
- #undef HAVE_MKTEMP
-
--/* Define if you have the nanosleep function. */
-+/* Define if you have the `nanosleep' function. */
- #undef HAVE_NANOSLEEP
-
--/* Define if you have the putenv function. */
-+/* Define if you have the <ndbm.h> header file. */
-+#undef HAVE_NDBM_H
-+
-+/* Define if you have the <ndir.h> header file, and it defines `DIR'. */
-+#undef HAVE_NDIR_H
-+
-+/* Define if you have the `putenv' function. */
- #undef HAVE_PUTENV
-
--/* Define if you have the readlink function. */
-+/* Define if you have the `readlink' function. */
- #undef HAVE_READLINK
-
--/* Define if you have the rename function. */
-+/* Define if you have the `rename' function. */
- #undef HAVE_RENAME
-
--/* Define if you have the select function. */
-+/* Define if you have the `select' function. */
- #undef HAVE_SELECT
-
--/* Define if you have the sigaction function. */
-+/* Define if you have the `sigaction' function. */
- #undef HAVE_SIGACTION
-
--/* Define if you have the sigblock function. */
-+/* Define if you have the `sigblock' function. */
- #undef HAVE_SIGBLOCK
-
--/* Define if you have the sigprocmask function. */
-+/* Define if you have the `sigprocmask' function. */
- #undef HAVE_SIGPROCMASK
-
--/* Define if you have the sigsetmask function. */
-+/* Define if you have the `sigsetmask' function. */
- #undef HAVE_SIGSETMASK
-
--/* Define if you have the sigvec function. */
-+/* Define if you have the `sigvec' function. */
- #undef HAVE_SIGVEC
-
--/* Define if you have the strerror function. */
-+/* Define if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define if you have the `strerror' function. */
- #undef HAVE_STRERROR
-
--/* Define if you have the strstr function. */
--#undef HAVE_STRSTR
-+/* Define if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-
--/* Define if you have the strtoul function. */
--#undef HAVE_STRTOUL
-+/* Define if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-
--/* Define if you have the tempnam function. */
--#undef HAVE_TEMPNAM
-+/* Define if you have the `strstr' function. */
-+#undef HAVE_STRSTR
-
--/* Define if you have the timezone function. */
--#undef HAVE_TIMEZONE
-+/* Define if you have the `strtoul' function. */
-+#undef HAVE_STRTOUL
-
--/* Define if you have the tzset function. */
--#undef HAVE_TZSET
-+/* Define if `st_blksize' is member of `struct stat'. */
-+#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-
--/* Define if you have the usleep function. */
--#undef HAVE_USLEEP
-+/* Define if `st_rdev' is member of `struct stat'. */
-+#undef HAVE_STRUCT_STAT_ST_RDEV
-
--/* Define if you have the valloc function. */
--#undef HAVE_VALLOC
-+/* Define if your `struct stat' has `st_blksize'. Deprecated, use
-+ `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
-+#undef HAVE_ST_BLKSIZE
-
--/* Define if you have the vprintf function. */
--#undef HAVE_VPRINTF
-+/* Define if your `struct stat' has `st_rdev'. Deprecated, use
-+ `HAVE_STRUCT_STAT_ST_RDEV' instead. */
-+#undef HAVE_ST_RDEV
-
--/* Define if you have the wait3 function. */
--#undef HAVE_WAIT3
-+/* Define if you have the <syslog.h> header file. */
-+#undef HAVE_SYSLOG_H
-
--/* Define if you have the waitpid function. */
--#undef HAVE_WAITPID
-+/* Define if you have the <sys/bsdtypes.h> header file. */
-+#undef HAVE_SYS_BSDTYPES_H
-
--/* Define if you have the <direct.h> header file. */
--#undef HAVE_DIRECT_H
-+/* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
-+#undef HAVE_SYS_DIR_H
-
--/* Define if you have the <dirent.h> header file. */
--#undef HAVE_DIRENT_H
-+/* Define if you have the <sys/file.h> header file. */
-+#undef HAVE_SYS_FILE_H
-
--/* Define if you have the <errno.h> header file. */
--#undef HAVE_ERRNO_H
-+/* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
-+#undef HAVE_SYS_NDIR_H
-
--/* Define if you have the <fcntl.h> header file. */
--#undef HAVE_FCNTL_H
-+/* Define if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H
-
--/* Define if you have the <gssapi.h> header file. */
--#undef HAVE_GSSAPI_H
-+/* Define if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H
-
--/* Define if you have the <gssapi/gssapi.h> header file. */
--#undef HAVE_GSSAPI_GSSAPI_H
-+/* Define if you have the <sys/select.h> header file. */
-+#undef HAVE_SYS_SELECT_H
-
--/* Define if you have the <gssapi/gssapi_generic.h> header file. */
--#undef HAVE_GSSAPI_GSSAPI_GENERIC_H
-+/* Define if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-
--/* Define if you have the <io.h> header file. */
--#undef HAVE_IO_H
-+/* Define if you have the <sys/timeb.h> header file. */
-+#undef HAVE_SYS_TIMEB_H
-
--/* Define if you have the <krb5.h> header file. */
--#undef HAVE_KRB5_H
-+/* Define if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-
--/* Define if you have the <limits.h> header file. */
--#undef HAVE_LIMITS_H
-+/* Define if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-
--/* Define if you have the <memory.h> header file. */
--#undef HAVE_MEMORY_H
-+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-+#undef HAVE_SYS_WAIT_H
-
--/* Define if you have the <ndbm.h> header file. */
--#undef HAVE_NDBM_H
-+/* Define if you have the `tempnam' function. */
-+#undef HAVE_TEMPNAM
-
--/* Define if you have the <ndir.h> header file. */
--#undef HAVE_NDIR_H
-+/* Define if you have the `timezone' function. */
-+#undef HAVE_TIMEZONE
-
--/* Define if you have the <string.h> header file. */
--#undef HAVE_STRING_H
-+/* Define if you have the `tzset' function. */
-+#undef HAVE_TZSET
-
--/* Define if you have the <sys/bsdtypes.h> header file. */
--#undef HAVE_SYS_BSDTYPES_H
-+/* Define if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-
--/* Define if you have the <sys/dir.h> header file. */
--#undef HAVE_SYS_DIR_H
-+/* Define if you have the `usleep' function. */
-+#undef HAVE_USLEEP
-
--/* Define if you have the <sys/file.h> header file. */
--#undef HAVE_SYS_FILE_H
-+/* Define if you have the <utime.h> header file. */
-+#undef HAVE_UTIME_H
-
--/* Define if you have the <sys/ndir.h> header file. */
--#undef HAVE_SYS_NDIR_H
-+/* Define if `utime(file, NULL)' sets file's timestamp to the present. */
-+#undef HAVE_UTIME_NULL
-
--/* Define if you have the <sys/param.h> header file. */
--#undef HAVE_SYS_PARAM_H
-+/* Define if you have the `valloc' function. */
-+#undef HAVE_VALLOC
-
--/* Define if you have the <sys/resource.h> header file. */
--#undef HAVE_SYS_RESOURCE_H
-+/* Define if you have the `vfork' function. */
-+#undef HAVE_VFORK
-
--/* Define if you have the <sys/select.h> header file. */
--#undef HAVE_SYS_SELECT_H
-+/* Define if you have the <vfork.h> header file. */
-+#undef HAVE_VFORK_H
-
--/* Define if you have the <sys/time.h> header file. */
--#undef HAVE_SYS_TIME_H
-+/* Define if you have the `vprintf' function. */
-+#undef HAVE_VPRINTF
-
--/* Define if you have the <sys/timeb.h> header file. */
--#undef HAVE_SYS_TIMEB_H
-+/* Define if you have the `wait3' function. */
-+#undef HAVE_WAIT3
-
--/* Define if you have the <syslog.h> header file. */
--#undef HAVE_SYSLOG_H
-+/* Define if you have the `waitpid' function. */
-+#undef HAVE_WAITPID
-
--/* Define if you have the <unistd.h> header file. */
--#undef HAVE_UNISTD_H
-+/* Define if `fork' works. */
-+#undef HAVE_WORKING_FORK
-
--/* Define if you have the <utime.h> header file. */
--#undef HAVE_UTIME_H
-+/* Define if `vfork' works. */
-+#undef HAVE_WORKING_VFORK
-
- /* Name of package */
- #undef PACKAGE
-
-+/* Path to the pr utility */
-+#undef PR_PROGRAM
-+
-+/* Define as the return type of signal handlers (`int' or `void'). */
-+#undef RETSIGTYPE
-+
-+/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-+#undef STAT_MACROS_BROKEN
-+
-+/* Define if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
- /* Version number of package */
- #undef VERSION
-
--/* Path to the pr utility */
--#undef PR_PROGRAM
-+/* Define if on AIX 3.
-+ System headers sometimes define this.
-+ We just want to avoid a redefinition error message. */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-
--/* Define if you have GSSAPI with Kerberos version 5 available. */
--#undef HAVE_GSSAPI
-+/* Define if on MINIX. */
-+#undef _MINIX
-
--/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
--in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only relevant
--when using GSSAPI. */
--#undef GSS_C_NT_HOSTBASED_SERVICE
-+/* Define if the system does not provide POSIX.1 features except with this
-+ defined. */
-+#undef _POSIX_1_SOURCE
-+
-+/* Define if you need to in order for `stat' and other things to work. */
-+#undef _POSIX_SOURCE
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef gid_t
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef mode_t
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef pid_t
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+#undef size_t
-
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef uid_t
-+
-+/* Define as `fork' if `vfork' does not work. */
-+#undef vfork
-diff -uNr cvs-1.11.1p1/configure cvs-1.11.1p1/configure
---- cvs-1.11.1p1/configure Fri Apr 27 16:02:07 2001
-+++ cvs-1.11.1p1/configure Tue Feb 19 10:52:48 2002
-@@ -1,41 +1,155 @@
- #! /bin/sh
--
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.13
--# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by Autoconf 2.52.
- #
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-
--# Defaults:
--ac_help=
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+
-+# Name of the executable.
-+as_me=`echo "$0" |sed 's,.*[\\/],,'`
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+as_executable_p="test -f"
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+# NLS nuisances.
-+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+exec 6>&1
-+
-+#
-+# Initializations.
-+#
- ac_default_prefix=/usr/local
--# Any additions from configure.in:
--ac_help="$ac_help
-- --disable-dependency-tracking Speeds up one-time builds
-- --enable-dependency-tracking Do not reject slow dependency extractors"
--ac_help="$ac_help
-- --with-krb4=value set default \$(KRB4) from value"
--ac_help="$ac_help
-- --with-gssapi=value GSSAPI directory"
--ac_help="$ac_help
-- --enable-encryption enable encryption support"
--ac_help="$ac_help
-- --enable-client include code for running as a remote client (default)
-- --disable-client don't include remote client code"
--ac_help="$ac_help
-- --enable-server include code for running as a server (default)
-- --disable-server don't include server code"
-+cross_compiling=no
-+subdirs=
-+MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Maximum number of lines to put in a shell here document.
-+# This variable seems obsolete. It should probably be removed, and
-+# only ac_max_sed_lines should be used.
-+: ${ac_max_here_lines=38}
-+
-+ac_unique_file="src/cvs.h"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#if STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# if HAVE_STDLIB_H
-+# include <stdlib.h>
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+# include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#if HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+# include <stdint.h>
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-
- # Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
- # The variables have the same names as the options, with
- # dashes changed to underlines.
--build=NONE
--cache_file=./config.cache
-+cache_file=/dev/null
- exec_prefix=NONE
--host=NONE
- no_create=
--nonopt=NONE
- no_recursion=
- prefix=NONE
- program_prefix=NONE
-@@ -44,10 +158,15 @@
- silent=
- site=
- srcdir=
--target=NONE
- verbose=
- x_includes=NONE
- x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
-@@ -61,17 +180,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
--# 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
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-
- ac_prev=
- for ac_option
- do
--
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
-@@ -79,59 +197,59 @@
- continue
- fi
-
-- case "$ac_option" in
-- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-- *) ac_optarg= ;;
-- esac
-+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case "$ac_option" in
-+ case $ac_option in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-- bindir="$ac_optarg" ;;
-+ bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
-- ac_prev=build ;;
-+ ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-- build="$ac_optarg" ;;
-+ build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-- cache_file="$ac_optarg" ;;
-+ cache_file=$ac_optarg ;;
-+
-+ --config-cache | -C)
-+ cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
-- datadir="$ac_optarg" ;;
-+ datadir=$ac_optarg ;;
-
- -disable-* | --disable-*)
-- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-- fi
-- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-- eval "enable_${ac_feature}=no" ;;
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ eval "enable_$ac_feature=no" ;;
-
- -enable-* | --enable-*)
-- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-- fi
-- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-- case "$ac_option" in
-- *=*) ;;
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
-- eval "enable_${ac_feature}='$ac_optarg'" ;;
-+ eval "enable_$ac_feature='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -140,95 +258,47 @@
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
-- exec_prefix="$ac_optarg" ;;
-+ exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
-- -help | --help | --hel | --he)
-- # Omit some internal or obsolete options to make the list less imposing.
-- # This message is too long to be a string in the A/UX 3.1 sh.
-- cat << EOF
--Usage: configure [options] [host]
--Options: [defaults in brackets after descriptions]
--Configuration:
-- --cache-file=FILE cache test results in FILE
-- --help print this message
-- --no-create do not create output files
-- --quiet, --silent do not print \`checking...' messages
-- --version print the version of autoconf that created configure
--Directory and file names:
-- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [same as prefix]
-- --bindir=DIR user executables in DIR [EPREFIX/bin]
-- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
-- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data in DIR
-- [PREFIX/share]
-- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
-- --sharedstatedir=DIR modifiable architecture-independent data in DIR
-- [PREFIX/com]
-- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
-- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
-- --includedir=DIR C header files in DIR [PREFIX/include]
-- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
-- --infodir=DIR info documentation in DIR [PREFIX/info]
-- --mandir=DIR man documentation in DIR [PREFIX/man]
-- --srcdir=DIR find the sources in DIR [configure dir or ..]
-- --program-prefix=PREFIX prepend PREFIX to installed program names
-- --program-suffix=SUFFIX append SUFFIX to installed program names
-- --program-transform-name=PROGRAM
-- run sed PROGRAM on installed program names
--EOF
-- cat << EOF
--Host type:
-- --build=BUILD configure for building on BUILD [BUILD=HOST]
-- --host=HOST configure for HOST [guessed]
-- --target=TARGET configure for TARGET [TARGET=HOST]
--Features and packages:
-- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-- --x-includes=DIR X include files are in DIR
-- --x-libraries=DIR X library files are in DIR
--EOF
-- if test -n "$ac_help"; then
-- echo "--enable and --with options recognized:$ac_help"
-- fi
-- exit 0 ;;
-+ -help | --help | --hel | --he | -h)
-+ ac_init_help=long ;;
-+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+ ac_init_help=recursive ;;
-+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+ ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
-- ac_prev=host ;;
-+ ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
-- host="$ac_optarg" ;;
-+ host_alias=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
-- includedir="$ac_optarg" ;;
-+ includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-- infodir="$ac_optarg" ;;
-+ infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
-- libdir="$ac_optarg" ;;
-+ libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
-- libexecdir="$ac_optarg" ;;
-+ libexecdir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
-@@ -237,12 +307,12 @@
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-- localstatedir="$ac_optarg" ;;
-+ localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-- mandir="$ac_optarg" ;;
-+ mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
-@@ -263,26 +333,26 @@
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-- oldincludedir="$ac_optarg" ;;
-+ oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-- prefix="$ac_optarg" ;;
-+ prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-- program_prefix="$ac_optarg" ;;
-+ program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-- program_suffix="$ac_optarg" ;;
-+ program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
-@@ -299,7 +369,7 @@
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
-- program_transform_name="$ac_optarg" ;;
-+ program_transform_name=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
-@@ -309,7 +379,7 @@
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
-- sbindir="$ac_optarg" ;;
-+ sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-@@ -320,58 +390,57 @@
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
-- sharedstatedir="$ac_optarg" ;;
-+ sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
-- site="$ac_optarg" ;;
-+ site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-- srcdir="$ac_optarg" ;;
-+ srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-- sysconfdir="$ac_optarg" ;;
-+ sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
-- ac_prev=target ;;
-+ ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-- target="$ac_optarg" ;;
-+ target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
-- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.13"
-- exit 0 ;;
-+ -version | --version | --versio | --versi | --vers | -V)
-+ ac_init_version=: ;;
-
- -with-* | --with-*)
-- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-- fi
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case "$ac_option" in
-- *=*) ;;
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
-- eval "with_${ac_package}='$ac_optarg'" ;;
-+ eval "with_$ac_package='$ac_optarg'" ;;
-
- -without-* | --without-*)
-- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-- fi
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- eval "with_${ac_package}=no" ;;
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/-/_/g'`
-+ eval "with_$ac_package=no" ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -382,98 +451,98 @@
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-- x_includes="$ac_optarg" ;;
-+ x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-- x_libraries="$ac_optarg" ;;
-+ x_libraries=$ac_optarg ;;
-
-- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; }
- ;;
-
-+ *=*)
-+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-+ eval "$ac_envvar='$ac_optarg'"
-+ export $ac_envvar ;;
-+
- *)
-- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-- echo "configure: warning: $ac_option: invalid host type" 1>&2
-- fi
-- if test "x$nonopt" != xNONE; then
-- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-- fi
-- nonopt="$ac_option"
-+ # FIXME: should be removed in autoconf 3.0.
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
- done
-
- if test -n "$ac_prev"; then
-- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
--fi
--
--trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
--
--# File descriptor usage:
--# 0 standard input
--# 1 file creation
--# 2 errors and warnings
--# 3 some systems may open it to /dev/tty
--# 4 used on the Kubota Titan
--# 6 checking for... messages and results
--# 5 compiler messages saved in config.log
--if test "$silent" = yes; then
-- exec 6>/dev/null
--else
-- exec 6>&1
-+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
-+ { (exit 1); exit 1; }; }
- fi
--exec 5>./config.log
-
--echo "\
--This file contains any messages produced by compilers while
--running configure, to aid debugging if configure makes a mistake.
--" 1>&5
-+# Be sure to have absolute paths.
-+for ac_var in exec_prefix prefix
-+do
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-+ *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-
--# Strip out --no-create and --no-recursion so they do not pile up.
--# Also quote any args containing shell metacharacters.
--ac_configure_args=
--for ac_arg
-+# Be sure to have absolute paths.
-+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-+ localstatedir libdir includedir oldincludedir infodir mandir
- do
-- case "$ac_arg" in
-- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-- | --no-cr | --no-c) ;;
-- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
- esac
- done
-
--# NLS nuisances.
--# 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
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: should be removed in autoconf 3.0.
-+if test "x$host_alias" != x; then
-+ if test "x$build_alias" = x; then
-+ cross_compiling=maybe
-+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used." >&2
-+ elif test "x$build_alias" != "x$host_alias"; then
-+ cross_compiling=yes
-+ fi
-+fi
-
--# confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo > confdefs.h
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
--# A filename unique to this package, relative to the directory that
--# configure is in, which we can look for to find out if srcdir is correct.
--ac_unique_file=src/cvs.h
-+test "$silent" = yes && exec 6>/dev/null
-
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_prog=$0
-- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-+ ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
- srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
-@@ -484,13 +553,317 @@
- fi
- if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+ { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
-+ { (exit 1); exit 1; }; }
- else
-- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+ { echo "$as_me: error: cannot find sources in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
- fi
- fi
--srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-+ac_env_build_alias_set=${build_alias+set}
-+ac_env_build_alias_value=$build_alias
-+ac_cv_env_build_alias_set=${build_alias+set}
-+ac_cv_env_build_alias_value=$build_alias
-+ac_env_host_alias_set=${host_alias+set}
-+ac_env_host_alias_value=$host_alias
-+ac_cv_env_host_alias_set=${host_alias+set}
-+ac_cv_env_host_alias_value=$host_alias
-+ac_env_target_alias_set=${target_alias+set}
-+ac_env_target_alias_value=$target_alias
-+ac_cv_env_target_alias_set=${target_alias+set}
-+ac_cv_env_target_alias_value=$target_alias
-+ac_env_CC_set=${CC+set}
-+ac_env_CC_value=$CC
-+ac_cv_env_CC_set=${CC+set}
-+ac_cv_env_CC_value=$CC
-+ac_env_CFLAGS_set=${CFLAGS+set}
-+ac_env_CFLAGS_value=$CFLAGS
-+ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+ac_cv_env_CFLAGS_value=$CFLAGS
-+ac_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_env_LDFLAGS_value=$LDFLAGS
-+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_cv_env_LDFLAGS_value=$LDFLAGS
-+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_env_CPPFLAGS_value=$CPPFLAGS
-+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-+ac_env_CPP_set=${CPP+set}
-+ac_env_CPP_value=$CPP
-+ac_cv_env_CPP_set=${CPP+set}
-+ac_cv_env_CPP_value=$CPP
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+ # Omit some internal or obsolete options to make the list less imposing.
-+ # This message is too long to be a string in the A/UX 3.1 sh.
-+ cat <<EOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE. See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+ -h, --help display this help and exit
-+ --help=short display options specific to this package
-+ --help=recursive display the short help of all the included packages
-+ -V, --version display version information and exit
-+ -q, --quiet, --silent do not print \`checking...' messages
-+ --cache-file=FILE cache test results in FILE [disabled]
-+ -C, --config-cache alias for \`--cache-file=config.cache'
-+ -n, --no-create do not create output files
-+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
-+
-+EOF
-+
-+ cat <<EOF
-+Installation directories:
-+ --prefix=PREFIX install architecture-independent files in PREFIX
-+ [$ac_default_prefix]
-+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-+ [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+ --bindir=DIR user executables [EPREFIX/bin]
-+ --sbindir=DIR system admin executables [EPREFIX/sbin]
-+ --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
-+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --libdir=DIR object code libraries [EPREFIX/lib]
-+ --includedir=DIR C header files [PREFIX/include]
-+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
-+ --infodir=DIR info documentation [PREFIX/info]
-+ --mandir=DIR man documentation [PREFIX/man]
-+EOF
-+
-+ cat <<\EOF
-+
-+Program names:
-+ --program-prefix=PREFIX prepend PREFIX to installed program names
-+ --program-suffix=SUFFIX append SUFFIX to installed program names
-+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-+EOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+ cat <<\EOF
-+
-+Optional Features:
-+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --disable-dependency-tracking Speeds up one-time builds
-+ --enable-dependency-tracking Do not reject slow dependency extractors
-+ --enable-encryption enable encryption support
-+ --enable-client include code for running as a remote client (default)
-+ --disable-client don't include remote client code
-+ --enable-server include code for running as a server (default)
-+ --disable-server don't include server code
-+
-+Optional Packages:
-+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-+ --with-krb4=value set default \$(KRB4) from value
-+ --with-gssapi=value GSSAPI directory
-+
-+Some influential environment variables:
-+ CC C compiler command
-+ CFLAGS C compiler flags
-+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-+ nonstandard directory <lib dir>
-+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-+ headers in a nonstandard directory <include dir>
-+ CPP C preprocessor
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+EOF
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+ # If there are subdirs, report their specific --help.
-+ ac_popdir=`pwd`
-+ for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
-+ cd $ac_subdir
-+ # A "../" for each directory in /$ac_subdir.
-+ ac_dots=`echo $ac_subdir |
-+ sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
-+
-+ case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_sub_srcdir=$srcdir ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_sub_srcdir=$srcdir/$ac_subdir ;;
-+ *) # Relative path.
-+ ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
-+ esac
-+
-+ # Check for guested configure; otherwise get Cygnus style configure.
-+ if test -f $ac_sub_srcdir/configure.gnu; then
-+ echo
-+ $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
-+ elif test -f $ac_sub_srcdir/configure; then
-+ echo
-+ $SHELL $ac_sub_srcdir/configure --help=recursive
-+ elif test -f $ac_sub_srcdir/configure.ac ||
-+ test -f $ac_sub_srcdir/configure.in; then
-+ echo
-+ $ac_configure --help
-+ else
-+ echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
-+ fi
-+ cd $ac_popdir
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit 0
-+if $ac_init_version; then
-+ cat <<\EOF
-+
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+EOF
-+ exit 0
-+fi
-+exec 5>config.log
-+cat >&5 <<EOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.52. Invocation command line was
-+
-+ $ $0 $@
-+
-+EOF
-+{
-+cat <<_ASUNAME
-+## ---------- ##
-+## Platform. ##
-+## ---------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-+
-+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-+
-+PATH = $PATH
-+
-+_ASUNAME
-+} >&5
-+
-+cat >&5 <<EOF
-+## ------------ ##
-+## Core tests. ##
-+## ------------ ##
-+
-+EOF
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Also quote any args containing shell meta-characters.
-+ac_configure_args=
-+ac_sep=
-+for ac_arg
-+do
-+ case $ac_arg in
-+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+ | --no-cr | --no-c) ;;
-+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
-+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+ ac_sep=" " ;;
-+ *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
-+ ac_sep=" " ;;
-+ esac
-+ # Get rid of the leading space.
-+done
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log. We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+trap 'exit_status=$?
-+ # Save into config.log some information that might help in debugging.
-+ echo >&5
-+ echo "## ----------------- ##" >&5
-+ echo "## Cache variables. ##" >&5
-+ echo "## ----------------- ##" >&5
-+ echo >&5
-+ # The following way of writing the cache mishandles newlines in values,
-+{
-+ (set) 2>&1 |
-+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ sed -n \
-+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+ ;;
-+ *)
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+} >&5
-+ sed "/^$/d" confdefs.h >conftest.log
-+ if test -s conftest.log; then
-+ echo >&5
-+ echo "## ------------ ##" >&5
-+ echo "## confdefs.h. ##" >&5
-+ echo "## ------------ ##" >&5
-+ echo >&5
-+ cat conftest.log >&5
-+ fi
-+ (echo; echo) >&5
-+ test "$ac_signal" != 0 &&
-+ echo "$as_me: caught signal $ac_signal" >&5
-+ echo "$as_me: exit $exit_status" >&5
-+ rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
-+ exit $exit_status
-+ ' 0
-+for ac_signal in 1 2 13 15; do
-+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo >confdefs.h
-
-+# Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
-@@ -501,40 +874,107 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
-- echo "loading site script $ac_site_file"
-+ { echo "$as_me:877: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+ cat "$ac_site_file" >&5
- . "$ac_site_file"
- fi
- done
-
- if test -r "$cache_file"; then
-- echo "loading cache $cache_file"
-- . $cache_file
-+ # Some versions of bash will fail to source /dev/null (special
-+ # files actually), so we avoid doing that.
-+ if test -f "$cache_file"; then
-+ { echo "$as_me:888: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . $cache_file;;
-+ *) . ./$cache_file;;
-+ esac
-+ fi
- else
-- echo "creating cache $cache_file"
-- > $cache_file
-+ { echo "$as_me:896: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+ >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in `(set) 2>&1 |
-+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+ eval ac_new_set=\$ac_env_${ac_var}_set
-+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-+ eval ac_new_val="\$ac_env_${ac_var}_value"
-+ case $ac_old_set,$ac_new_set in
-+ set,)
-+ { echo "$as_me:912: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,set)
-+ { echo "$as_me:916: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,);;
-+ *)
-+ if test "x$ac_old_val" != "x$ac_new_val"; then
-+ { echo "$as_me:922: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:924: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:926: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
-+ fi;;
-+ esac
-+ # Pass precious variables to config.status. It doesn't matter if
-+ # we pass some twice (in addition to the command line arguments).
-+ if test "$ac_new_set" = set; then
-+ case $ac_new_val in
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
-+ ;;
-+ *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
-+ ;;
-+ esac
-+ fi
-+done
-+if $ac_cache_corrupted; then
-+ { echo "$as_me:945: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:947: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- 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
--
--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
-- ac_n= ac_c='
--' ac_t=' '
-- else
-- ac_n=-n ac_c= ac_t=
-- fi
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+echo "#! $SHELL" >conftest.sh
-+echo "exit 0" >>conftest.sh
-+chmod +x conftest.sh
-+if { (echo "$as_me:967: PATH=\".;.\"; conftest.sh") >&5
-+ (PATH=".;."; conftest.sh) 2>&5
-+ ac_status=$?
-+ echo "$as_me:970: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ ac_path_separator=';'
- else
-- ac_n= ac_c='\c' ac_t=
-+ ac_path_separator=:
- fi
--
-+PATH_SEPARATOR="$ac_path_separator"
-+rm -f conftest.sh
-
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-@@ -546,14 +986,20 @@
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-+ elif test -f $ac_dir/shtool; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/shtool install -c"
-+ break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
--fi
--ac_config_guess=$ac_aux_dir/config.guess
--ac_config_sub=$ac_aux_dir/config.sub
--ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+ { { echo "$as_me:996: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -562,31 +1008,39 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
- # 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:571: checking for a BSD compatible install" >&5
-+echo "$as_me:1016: checking for a BSD compatible install" >&5
-+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
- for ac_dir in $PATH; do
-+ IFS=$ac_save_IFS
- # 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/*) ;;
-+ case $ac_dir/ in
-+ / | ./ | .// | /cC/* \
-+ | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
-+ | /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # 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 $as_executable_p "$ac_dir/$ac_prog"; then
- if test $ac_prog = install &&
-- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+ grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
-@@ -596,31 +1050,31 @@
- ;;
- esac
- done
-- IFS="$ac_save_IFS"
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-- INSTALL="$ac_cv_path_install"
-+ INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
-- INSTALL="$ac_install_sh"
-+ INSTALL=$ac_install_sh
- fi
- fi
--echo "$ac_t""$INSTALL" 1>&6
-+echo "$as_me:1065: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # 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_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:624: checking whether build environment is sane" >&5
-+echo "$as_me:1076: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -635,6 +1089,7 @@
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
-+ rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
-@@ -642,8 +1097,11 @@
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
--alias in your environment" 1>&2; exit 1; }
-+ { { echo "$as_me:1100: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&5
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- test "$2" = conftest.file
-@@ -652,228 +1110,117 @@
- # Ok.
- :
- else
-- { echo "configure: error: newly created file is older than distributed files!
--Check your system clock" 1>&2; exit 1; }
--fi
--rm -f conftest*
--echo "$ac_t""yes" 1>&6
--if test "$program_transform_name" = s,x,x,; then
-- program_transform_name=
--else
-- # Double any \ or $. echo might interpret backslashes.
-- cat <<\EOF_SED > conftestsed
--s,\\,\\\\,g; s,\$,$$,g
--EOF_SED
-- program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-- rm -f conftestsed
-+ { { echo "$as_me:1113: error: newly created file is older than distributed files!
-+Check your system clock" >&5
-+echo "$as_me: error: newly created file is older than distributed files!
-+Check your system clock" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-+echo "$as_me:1119: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- test "$program_prefix" != NONE &&
-- program_transform_name="s,^,${program_prefix},; $program_transform_name"
-+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
-- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+# Double any \ or $. echo might interpret backslashes.
-+# By default was `s,x,x', remove it if useless.
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm conftest.sed
-
--# sed with no file args requires a program.
--test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
-
--test x"${MISSING+set}" = xset ||
-- MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
- else
- am_missing_run=
- am_backtick='`'
-- echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
-+ { echo "$as_me:1144: WARNING: ${am_backtick}missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
- fi
-
- for ac_prog in gawk mawk nawk awk
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # 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:696: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:1152: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_AWK="$ac_prog"
-+echo "$as_me:1167: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- fi
- fi
--AWK="$ac_cv_prog_AWK"
-+AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$ac_t""$AWK" 1>&6
-+ echo "$as_me:1175: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:1178: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$AWK" && break
-+ test -n "$AWK" && break
- done
-
--echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:726: 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
-+echo "$as_me:1185: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftestmake <<\EOF
-+ cat >conftest.make <<\EOF
- all:
- @echo 'ac_maketemp="${MAKE}"'
- EOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
- if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
- else
- eval ac_cv_prog_make_${ac_make}_set=no
- fi
--rm -f conftestmake
-+rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ echo "$as_me:1205: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- SET_MAKE=
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:1209: result: no" >&5
-+echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
--# Extract the first word of "etags", so it can be a program name with args.
--set dummy etags; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:755: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_ETAGS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$ETAGS"; then
-- ac_cv_prog_ETAGS="$ETAGS" # 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_ETAGS="etags"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--ETAGS="$ac_cv_prog_ETAGS"
--if test -n "$ETAGS"; then
-- echo "$ac_t""$ETAGS" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--if test -z "$ETAGS"; then
-- # Extract the first word of "ctags", so it can be a program name with args.
--set dummy ctags; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:785: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_ETAGS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$ETAGS"; then
-- ac_cv_prog_ETAGS="$ETAGS" # 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_ETAGS="ctags -e"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--ETAGS="$ac_cv_prog_ETAGS"
--if test -n "$ETAGS"; then
-- echo "$ac_t""$ETAGS" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--fi
--if test -n "$ETAGS"; then
-- echo $ac_n "checking whether ${ETAGS-etags} works""... $ac_c" 1>&6
--echo "configure:814: checking whether ${ETAGS-etags} works" >&5
--if eval "test \"`echo '$''{'am_cv_prog_etags_works'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat >conftest.c <<EOF
--int globalvar;
--EOF
--if { ac_try='${ETAGS-etags} -f - conftest.c |egrep ^int\ globalvar\; >&2'; { (eval echo configure:821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-- am_cv_prog_etags_works=yes
--else
-- am_cv_prog_etags_works=no
--fi
--rm -f conftest.c
--fi
--
--echo "$ac_t""$am_cv_prog_etags_works" 1>&6
-- if test "$am_cv_prog_etags_works" = yes ; then
-- if test "$am_cv_prog_etags_works" = yes ; then
-- echo $ac_n "checking for etags include option""... $ac_c" 1>&6
--echo "configure:833: checking for etags include option" >&5
--if eval "test \"`echo '$''{'am_cv_prog_etags_include_option'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat >conftest.c <<EOF
--int globalvar;
--EOF
-- if { ac_try='${ETAGS-etags} --etags-include=TAGS.inc -f - conftest.c |egrep ^TAGS.inc,include\$ >&2'; { (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-- am_cv_prog_etags_include_option=--etags-include=
-- elif { ac_try='${ETAGS-etags} -i TAGS.inc -f - conftest.c |egrep ^TAGS.inc,include\$ >&2'; { (eval echo configure:842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-- am_cv_prog_etags_include_option='"-i "'
-- else :
-- # AC_MSG_ERROR(unfamiliar etags implementation)
-- fi
-- rm -f conftest.c
--fi
--
--echo "$ac_t""$am_cv_prog_etags_include_option" 1>&6
--else
-- :
--fi
--ETAGS_INCLUDE_OPTION="$am_cv_prog_etags_include_option"
--
-- else
--
--ETAGS=${ETAGS-"${am_missing_run}etags"}
--
-- fi
--else
--
--ETAGS=${ETAGS-"${am_missing_run}etags"}
--
--fi
- # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
- enableval="$enable_dependency_tracking"
-- :
--fi
-
-+fi;
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- fi
-
--
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-@@ -882,397 +1229,735 @@
- AMDEP_FALSE=
- fi
-
--
--
--
--if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
-+rm -f .deps 2>/dev/null
-+mkdir .deps 2>/dev/null
-+if test -d .deps; then
- DEPDIR=.deps
-- # We redirect because .deps might already exist and be populated.
-- # In this situation we don't want to see an error.
-- rmdir .deps > /dev/null 2>&1
- else
-+ # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
- fi
--
-+rmdir .deps 2>/dev/null
-
- # test to see if srcdir already configured
- if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
-- { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
-+ { { echo "$as_me:1245: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- # Define the identity of the package.
- PACKAGE=cvs
- VERSION=1.11.1p1
--cat >> confdefs.h <<EOF
-+
-+cat >>confdefs.h <<EOF
- #define PACKAGE "$PACKAGE"
- EOF
-
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<EOF
- #define VERSION "$VERSION"
- EOF
-
--
- # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
- # the ones we care about.
-
-+# Autoconf 2.50 always computes EXEEXT. However we need to be
-+# compatible with 2.13, for now. So we always define EXEEXT, but we
-+# don't compute it.
-+
-+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
-+# requests that it be used. This is a bit dumb.
-+: ${OBJEXT=o}
-+
- # Some tools Automake needs.
-
- ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
-
--
- AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
--
- AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
-
--
- AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
--
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--
- AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
--if test -z "$install_sh"; then
-- for install_sh in "$ac_aux_dir/install-sh" \
-- "$ac_aux_dir/install.sh" \
-- "${am_missing_run}${ac_auxdir}/install-sh";
-- do
-- test -f "$install_sh" && break
-- done
-- # FIXME: an evil hack: we remove the SHELL invocation from
-- # install_sh because automake adds it back in. Sigh.
-- install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
--fi
--
--
--# We'd like to do this but we can't because it will unconditionally
--# require config.guess. One way would be if autoconf had the capability
--# to let us compile in this code only when config.guess was already
--# a possibility.
--#if test "$cross_compiling" != no; then
--# # since we are cross-compiling, we need to check for a suitable `strip'
--# AM_PROG_STRIP
--# if test -z "$STRIP"; then
--# AC_MSG_WARN([strip missing, install-strip will not strip binaries])
--# fi
--#fi
--
--# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
--# instruct install-strip to use install-sh and the given $STRIP program.
--# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
--# as much as possible, because it's faster.
--if test -z "$STRIP"; then
-- # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-- # and the double dolard below is there to make sure that ${INSTALL}
-- # is substitued in the sub-makes, not at the top-level; this is
-- # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-- # by config.status).
-- INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-- INSTALL_STRIP_PROGRAM_ENV=''
--else
-- _am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`"
-- INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-- INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
--fi
--
--
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-
--
- if test "x$prefix" = xNONE; then
--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.
-+ echo $ECHO_N "checking for prefix by $ECHO_C" >&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:994: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_CVS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:1298: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_CVS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$CVS" in
-- /*)
-+ case $CVS in
-+ [\\/]* | ?:[\\/]*)
- 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=":"
-- 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"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_CVS="$ac_dir/$ac_word"
-+ echo "$as_me:1315: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- ;;
- esac
- fi
--CVS="$ac_cv_path_CVS"
-+CVS=$ac_cv_path_CVS
-+
- if test -n "$CVS"; then
-- echo "$ac_t""$CVS" 1>&6
-+ echo "$as_me:1326: result: $CVS" >&5
-+echo "${ECHO_T}$CVS" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:1329: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- if test -n "$ac_cv_path_CVS"; then
-- prefix=`echo $ac_cv_path_CVS|sed 's%/[^/][^/]*//*[^/][^/]*$%%'`
-+ prefix=`$as_expr X"$ac_cv_path_CVS" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_cv_path_CVS" : 'X\(//\)[^/]' \| \
-+ X"$ac_cv_path_CVS" : 'X\(//\)$' \| \
-+ X"$ac_cv_path_CVS" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_cv_path_CVS" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
- fi
- fi
-
-+ ac_config_headers="$ac_config_headers config.h"
-
--
--
-+ ac_config_headers="$ac_config_headers src/options.h"
-
- for ac_prog in gawk mawk nawk awk
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # 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:1040: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:1356: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_AWK="$ac_prog"
-+echo "$as_me:1371: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- fi
- fi
--AWK="$ac_cv_prog_AWK"
-+AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$ac_t""$AWK" 1>&6
-+ echo "$as_me:1379: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:1382: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$AWK" && break
-+ test -n "$AWK" && break
-+done
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+echo "$as_me:1397: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+echo "$as_me:1412: found $ac_dir/$ac_word" >&5
-+break
- done
-
--# Extract the first word of "gcc", so it can be a program name with args.
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ echo "$as_me:1420: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:1423: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # 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:1072: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:1432: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_CC="gcc"
-+echo "$as_me:1447: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:1455: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:1458: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+echo "$as_me:1471: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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="gcc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_CC="${ac_tool_prefix}cc"
-+echo "$as_me:1486: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:1494: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:1497: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo "$as_me:1506: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_CC="cc"
-+echo "$as_me:1521: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:1529: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:1532: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
- else
-- echo "$ac_t""no" 1>&6
-+ CC="$ac_cv_prog_CC"
- fi
-
-+fi
- if test -z "$CC"; then
- # 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:1102: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:1545: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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_prog_rejected=no
-- 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
-- ac_prog_rejected=yes
-- continue
-- fi
-- ac_cv_prog_CC="cc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+fi
-+ac_cv_prog_CC="cc"
-+echo "$as_me:1565: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
-- if test $# -gt 0; then
-+ if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
-- set dummy "$ac_dir/$ac_word" "$@"
-+ set dummy "$ac_dir/$ac_word" ${1+"$@"}
- shift
- ac_cv_prog_CC="$@"
- fi
- fi
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:1587: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:1590: result: no" >&5
-+echo "${ECHO_T}no" >&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:1153: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:1601: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+echo "$as_me:1616: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:1624: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:1627: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-- ;;
-- esac
-- fi
-- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo "$as_me:1640: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_CC="$ac_prog"
-+echo "$as_me:1655: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:1663: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:1666: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1185: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+ test -n "$ac_ct_CC" && break
-+done
-
--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
-+ CC=$ac_ct_CC
-+fi
-+
-+fi
-
--cat > conftest.$ac_ext << EOF
-+test -z "$CC" && { { echo "$as_me:1678: error: no acceptable cc found in \$PATH" >&5
-+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:1683:" \
-+ "checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:1686: \"$ac_compiler --version </dev/null >&5\"") >&5
-+ (eval $ac_compiler --version </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1689: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:1691: \"$ac_compiler -v </dev/null >&5\"") >&5
-+ (eval $ac_compiler -v </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1694: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:1696: \"$ac_compiler -V </dev/null >&5\"") >&5
-+ (eval $ac_compiler -V </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1699: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-
--#line 1196 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 1703 "configure"
- #include "confdefs.h"
-
--main(){return(0);}
--EOF
--if { (eval echo configure:1201: \"$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
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+echo "$as_me:1719: checking for C compiler default output" >&5
-+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+if { (eval echo "$as_me:1722: \"$ac_link_default\"") >&5
-+ (eval $ac_link_default) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1725: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # Find the output, starting from the most likely. This scheme is
-+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+# resort.
-+for ac_file in `ls a.exe conftest.exe 2>/dev/null;
-+ ls a.out conftest 2>/dev/null;
-+ ls a.* conftest.* 2>/dev/null`; do
-+ case $ac_file in
-+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+ a.out ) # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
-+ export ac_cv_exeext
-+ break;;
-+ * ) break;;
-+ esac
-+done
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+{ { echo "$as_me:1748: error: C compiler cannot create executables" >&5
-+echo "$as_me: error: C compiler cannot create executables" >&2;}
-+ { (exit 77); exit 77; }; }
-+fi
-+
-+ac_exeext=$ac_cv_exeext
-+echo "$as_me:1754: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6
-+
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:1759: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+ if { ac_try='./$ac_file'
-+ { (eval echo "$as_me:1765: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1768: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ cross_compiling=no
- else
-- ac_cv_prog_cc_cross=yes
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { echo "$as_me:1775: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
- 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 "$as_me:1783: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-
--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; }
-+rm -f a.out a.exe conftest$ac_cv_exeext
-+ac_clean_files=$ac_clean_files_save
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:1790: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:1792: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6
-+
-+echo "$as_me:1795: checking for executable suffix" >&5
-+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-+if { (eval echo "$as_me:1797: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1800: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
-+ case $ac_file in
-+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ export ac_cv_exeext
-+ break;;
-+ * ) break;;
-+ esac
-+done
-+else
-+ { { echo "$as_me:1816: error: cannot compute EXEEXT: cannot compile and link" >&5
-+echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1227: 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:1232: 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
-- cat > conftest.c <<EOF
--#ifdef __GNUC__
-- yes;
--#endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-- ac_cv_prog_gcc=yes
-+rm -f conftest$ac_cv_exeext
-+echo "$as_me:1822: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+echo "$as_me:1828: checking for object suffix" >&5
-+echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-+if test "${ac_cv_objext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_gcc=no
--fi
--fi
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 1834 "configure"
-+#include "confdefs.h"
-
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+int
-+main ()
-+{
-
--if test $ac_cv_prog_gcc = yes; then
-- GCC=yes
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { (eval echo "$as_me:1846: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1849: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+ break;;
-+ esac
-+done
- else
-- GCC=
--fi
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+{ { echo "$as_me:1861: error: cannot compute OBJEXT: cannot compile" >&5
-+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+echo "$as_me:1868: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+echo "$as_me:1872: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 1878 "configure"
-+#include "confdefs.h"
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
-+#endif
-
--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:1260: 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
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1893: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1896: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:1899: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1902: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+echo "$as_me:1914: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+CFLAGS="-g"
-+echo "$as_me:1920: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 1926 "configure"
-+#include "confdefs.h"
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1941: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:1944: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1947: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
- else
-- ac_cv_prog_cc_g=no
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_prog_cc_g=no
- fi
--rm -f conftest*
--
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+echo "$as_me:1957: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-+ CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
-@@ -1286,87 +1971,118 @@
- CFLAGS=
- fi
- fi
--
--
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1293: checking how to run the C preprocessor" >&5
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
-- CPP=
--fi
--if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- # This must be in double quotes, not single quotes, because CPP may get
-- # substituted into the Makefile and "${CC-cc}" will confuse make.
-- CPP="${CC-cc} -E"
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp.
-- cat > conftest.$ac_ext <<EOF
--#line 1308 "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:1314: \"$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 1325 "configure"
-+# Some people use a C++ compiler to compile C. Since we use `exit',
-+# in C++ we need to declare it. In case someone uses the same compiler
-+# for both compiling C and C++ we need to have the C++ compiler decide
-+# the declaration of exit, since it's the most demanding environment.
-+cat >conftest.$ac_ext <<_ACEOF
-+#ifndef __cplusplus
-+ choke me
-+#endif
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1984: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1987: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:1990: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:1993: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ for ac_declaration in \
-+ ''\
-+ '#include <stdlib.h>' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2005 "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:1331: \"$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
-+#include <stdlib.h>
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:2018: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2021: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:2024: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2027: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; 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 1342 "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:1348: \"$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
-- :
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+continue
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2037 "configure"
-+#include "confdefs.h"
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:2049: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2052: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:2055: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2058: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
- 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*
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
- rm -f conftest*
-- ac_cv_prog_CPP="$CPP"
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
- fi
-- CPP="$ac_cv_prog_CPP"
-+
- else
-- ac_cv_prog_CPP="$CPP"
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--echo "$ac_t""$CPP" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ac_config_commands="$ac_config_commands default-1"
-
- am_make=${MAKE-make}
- cat > confinc << 'END'
-@@ -1374,64 +2090,69 @@
- @echo done
- END
- # If we don't find an include directive, just comment out the code.
--echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
--echo "configure:1379: checking for style of include used by $am_make" >&5
--_am_include='#'
--_am_quote=
-+echo "$as_me:2093: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include='#'
-+am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- _am_include=include
-- _am_quote=
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
- _am_result=GNU
- fi
- # Now try BSD make style include.
--if test "$_am_include" = "#"; then
-+if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- _am_include=.include
-- _am_quote='"'
-+ am__include=.include
-+ am__quote='"'
- _am_result=BSD
- fi
- fi
-
--
--echo "$ac_t""$_am_result" 1>&6
-+echo "$as_me:2120: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
- rm -f confinc confmf
-
-+depcc="$CC" am_compiler_list=
-
--depcc="$CC"
--depcpp="$CPP"
--
--
--
--echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
--echo "configure:1411: checking dependency style of $depcc" >&5
--if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2126: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -z "$AMDEP"; then
-+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
-- mkdir confdir
-+ mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
-- cp "$am_depcomp" confdir
-- cd confdir
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-
- am_cv_CC_dependencies_compiler_type=none
-- for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "./depcomp"`; do
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
-+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
-- case "$depmode" in
-+ case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
-@@ -1446,28 +2167,28 @@
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
-- if depmode="$depmode" \
-+ if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-- grep conftest.h conftest.Po > /dev/null 2>&1; then
-- am_cv_CC_dependencies_compiler_type="$depmode"
-+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- done
-
- cd ..
-- rm -rf confdir
-+ rm -rf conftest.dir
- else
- am_cv_CC_dependencies_compiler_type=none
- fi
-
- fi
--
--echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
-+echo "$as_me:2188: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
- CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
-
--
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -1475,31 +2196,39 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
- # 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:1484: checking for a BSD compatible install" >&5
-+echo "$as_me:2204: checking for a BSD compatible install" >&5
-+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
- for ac_dir in $PATH; do
-+ IFS=$ac_save_IFS
- # 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/*) ;;
-+ case $ac_dir/ in
-+ / | ./ | .// | /cC/* \
-+ | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
-+ | /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # 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 $as_executable_p "$ac_dir/$ac_prog"; then
- if test $ac_prog = install &&
-- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+ grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
-@@ -1509,255 +2238,300 @@
- ;;
- esac
- done
-- IFS="$ac_save_IFS"
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-- INSTALL="$ac_cv_path_install"
-+ INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
-- INSTALL="$ac_install_sh"
-+ INSTALL=$ac_install_sh
- fi
- fi
--echo "$ac_t""$INSTALL" 1>&6
-+echo "$as_me:2253: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # 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_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1537: 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
-+echo "$as_me:2264: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftestmake <<\EOF
-+ cat >conftest.make <<\EOF
- all:
- @echo 'ac_maketemp="${MAKE}"'
- EOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
- if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
- else
- eval ac_cv_prog_make_${ac_make}_set=no
- fi
--rm -f conftestmake
-+rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ echo "$as_me:2284: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- SET_MAKE=
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2288: result: no" >&5
-+echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
- # Automake's more advanced version of AC_PROG_RANLIB
--# 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:1567: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+echo "$as_me:2297: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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=":"
-- 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"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+echo "$as_me:2312: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- fi
- fi
--RANLIB="$ac_cv_prog_RANLIB"
-+RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- echo "$ac_t""$RANLIB" 1>&6
-+ echo "$as_me:2320: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6
-+else
-+ echo "$as_me:2323: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+ ac_ct_RANLIB=$RANLIB
-+ # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+echo "$as_me:2332: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_RANLIB"; then
-+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_RANLIB="ranlib"
-+echo "$as_me:2347: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+ echo "$as_me:2356: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+else
-+ echo "$as_me:2359: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ RANLIB=$ac_ct_RANLIB
- else
-- echo "$ac_t""no" 1>&6
-+ RANLIB="$ac_cv_prog_RANLIB"
- fi
-
- for ac_prog in 'bison -y' byacc
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # 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:1599: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2372: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_YACC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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=":"
-- 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"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_YACC="$ac_prog"
-+echo "$as_me:2387: found $ac_dir/$ac_word" >&5
-+break
-+done
-+
- fi
- fi
--YACC="$ac_cv_prog_YACC"
-+YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; then
-- echo "$ac_t""$YACC" 1>&6
-+ echo "$as_me:2395: result: $YACC" >&5
-+echo "${ECHO_T}$YACC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2398: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$YACC" && break
-+ test -n "$YACC" && break
- done
- test -n "$YACC" || YACC="yacc"
-
--echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:1630: checking whether ln -s works" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- rm -f conftestdata
--if ln -s X conftestdata 2>/dev/null
--then
-- rm -f conftestdata
-- ac_cv_prog_LN_S="ln -s"
-+echo "$as_me:2406: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+ echo "$as_me:2410: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- else
-- ac_cv_prog_LN_S=ln
-+ echo "$as_me:2413: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6
- fi
--fi
--LN_S="$ac_cv_prog_LN_S"
--if test "$ac_cv_prog_LN_S" = "ln -s"; then
-- echo "$ac_t""yes" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1654: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2419: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PERL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$PERL" in
-- /*)
-+ case $PERL in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_PERL="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_PERL="$ac_dir/$ac_word"
-+ echo "$as_me:2436: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
- ;;
- esac
- fi
--PERL="$ac_cv_path_PERL"
-+PERL=$ac_cv_path_PERL
-+
- if test -n "$PERL"; then
-- echo "$ac_t""$PERL" 1>&6
-+ echo "$as_me:2448: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2451: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- # 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:1690: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_CSH'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2457: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_CSH+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$CSH" in
-- /*)
-+ case $CSH in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_CSH="$CSH" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_CSH="$CSH" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_CSH="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_CSH="$ac_dir/$ac_word"
-+ echo "$as_me:2474: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- test -z "$ac_cv_path_CSH" && ac_cv_path_CSH="no"
- ;;
- esac
- fi
--CSH="$ac_cv_path_CSH"
-+CSH=$ac_cv_path_CSH
-+
- if test -n "$CSH"; then
-- echo "$ac_t""$CSH" 1>&6
-+ echo "$as_me:2486: result: $CSH" >&5
-+echo "${ECHO_T}$CSH" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2489: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- # Extract the first word of "pr", so it can be a program name with args.
- set dummy pr; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1726: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_PR'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2495: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$PR" in
-- /*)
-+ case $PR in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_PR="$PR" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_PR="$PR" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_PR="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_PR="$ac_dir/$ac_word"
-+ echo "$as_me:2512: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- test -z "$ac_cv_path_PR" && ac_cv_path_PR="no"
- ;;
- esac
- fi
--PR="$ac_cv_path_PR"
-+PR=$ac_cv_path_PR
-+
- if test -n "$PR"; then
-- echo "$ac_t""$PR" 1>&6
-+ echo "$as_me:2524: result: $PR" >&5
-+echo "${ECHO_T}$PR" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2527: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- # For diff/util.c
- if test x"$PR" != xno; then
-- cat >> confdefs.h <<EOF
-+
-+cat >>confdefs.h <<EOF
- #define PR_PROGRAM "$PR"
- EOF
-
-@@ -1767,128 +2541,131 @@
- glocs="$PATH:/usr/local/bin:/usr/contrib/bin:/usr/gnu/bin:/local/bin:/local/gnu/bin:/gnu/bin"
- for ac_prog in groff roff
- do
--# Extract the first word of "$ac_prog", so it can be a program name with args.
-+ # 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:1774: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_ROFF'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2546: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_ROFF+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$ROFF" in
-- /*)
-+ case $ROFF in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_ROFF="$ROFF" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_ROFF="$ROFF" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$glocs"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_ROFF="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$glocs"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_ROFF="$ac_dir/$ac_word"
-+ echo "$as_me:2563: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- ;;
- esac
- fi
--ROFF="$ac_cv_path_ROFF"
-+ROFF=$ac_cv_path_ROFF
-+
- if test -n "$ROFF"; then
-- echo "$ac_t""$ROFF" 1>&6
-+ echo "$as_me:2574: result: $ROFF" >&5
-+echo "${ECHO_T}$ROFF" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2577: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$ROFF" && break
-+ test -n "$ROFF" && break
- done
- test -n "$ROFF" || ROFF="$missing_dir/missing roff"
-
- # Extract the first word of "ps2pdf", so it can be a program name with args.
- set dummy ps2pdf; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1813: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_PS2PDF'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2587: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PS2PDF+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$PS2PDF" in
-- /*)
-+ case $PS2PDF in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_PS2PDF="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_PS2PDF="$ac_dir/$ac_word"
-+ echo "$as_me:2604: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- test -z "$ac_cv_path_PS2PDF" && ac_cv_path_PS2PDF="$missing_dir/missing ps2pdf"
- ;;
- esac
- fi
--PS2PDF="$ac_cv_path_PS2PDF"
-+PS2PDF=$ac_cv_path_PS2PDF
-+
- if test -n "$PS2PDF"; then
-- echo "$ac_t""$PS2PDF" 1>&6
-+ echo "$as_me:2616: result: $PS2PDF" >&5
-+echo "${ECHO_T}$PS2PDF" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2619: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- # Extract the first word of "texi2dvi", so it can be a program name with args.
- set dummy texi2dvi; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1849: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_TEXI2DVI'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2625: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_TEXI2DVI+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$TEXI2DVI" in
-- /*)
-+ case $TEXI2DVI in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_TEXI2DVI="$TEXI2DVI" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_TEXI2DVI="$TEXI2DVI" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_TEXI2DVI="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+ IFS=$ac_save_IFS
-+ test -z "$ac_dir" && ac_dir=.
-+ if $as_executable_p "$ac_dir/$ac_word"; then
-+ ac_cv_path_TEXI2DVI="$ac_dir/$ac_word"
-+ echo "$as_me:2642: found $ac_dir/$ac_word" >&5
-+ break
-+fi
-+done
-+
- test -z "$ac_cv_path_TEXI2DVI" && ac_cv_path_TEXI2DVI="$missing_dir/missing texi2dvi"
- ;;
- esac
- fi
--TEXI2DVI="$ac_cv_path_TEXI2DVI"
-+TEXI2DVI=$ac_cv_path_TEXI2DVI
-+
- if test -n "$TEXI2DVI"; then
-- echo "$ac_t""$TEXI2DVI" 1>&6
-+ echo "$as_me:2654: result: $TEXI2DVI" >&5
-+echo "${ECHO_T}$TEXI2DVI" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2657: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
--# 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:1886: checking $ac_msg" >&5
--if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2661: checking whether #! works in shell scripts" >&5
-+echo $ECHO_N "checking whether #! works in shell scripts... $ECHO_C" >&6
-+if test "${ac_cv_sys_interpreter+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- echo '#! /bin/cat
- exit 69
--' > conftest
-+' >conftest
- chmod u+x conftest
- (SHELL=/bin/sh; export SHELL; ./conftest >/dev/null)
- if test $? -ne 69; then
-@@ -1898,24 +2675,30 @@
- fi
- rm -f conftest
- fi
--
--echo "$ac_t""$ac_cv_sys_interpreter" 1>&6
--interpval="$ac_cv_sys_interpreter"
-+echo "$as_me:2678: result: $ac_cv_sys_interpreter" >&5
-+echo "${ECHO_T}$ac_cv_sys_interpreter" >&6
-+interpval=$ac_cv_sys_interpreter
-
- if test X"$ac_cv_sys_interpreter" != X"yes" ; then
- # silly trick to avoid problems in AC macros...
- ac_msg='perl scripts using #! may not be invoked properly'
-- echo "configure: warning: $ac_msg" 1>&2
-+ { echo "$as_me:2685: WARNING: $ac_msg" >&5
-+echo "$as_me: WARNING: $ac_msg" >&2;}
- fi
-
- # BSD's logo is a devil for a reason, hey?
--echo $ac_n "checking for BSD VPATH bug in make""... $ac_c" 1>&6
--echo "configure:1914: checking for BSD VPATH bug in make" >&5
--if eval "test \"`echo '$''{'ccvs_cv_bsd_make_vpath_bug'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:2690: checking for BSD VPATH bug in make" >&5
-+echo $ECHO_N "checking for BSD VPATH bug in make... $ECHO_C" >&6
-+if test "${ccvs_cv_bsd_make_vpath_bug+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test ! -d ac_test_dir ; then
-- { ac_try='mkdir ac_test_dir'; { (eval echo configure:1919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+ { ac_try='mkdir ac_test_dir'
-+ { (eval echo "$as_me:2697: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2700: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
- fi
- cat >conftestmake <<EOF
- VPATH = ac_test_dir
-@@ -1929,18 +2712,27 @@
- # Don't know why, but the following test doesn't work under FreeBSD 4.2
- # without this sleep command
- sleep 1
--if { ac_try='make -f conftestmake 2>&1 >/dev/null |grep ^BSD\ VPATH\ bug\ present\$ >/dev/null'; { (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
-+if { ac_try='make -f conftestmake 2>&1 >/dev/null |grep ^BSD\ VPATH\ bug\ present\$ >/dev/null'
-+ { (eval echo "$as_me:2716: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2719: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } ; then
- ccvs_cv_bsd_make_vpath_bug=yes
- else
- ccvs_cv_bsd_make_vpath_bug=no
- fi
--{ ac_try='rm -rf ac_test_dir ac_test_target conftestmake'; { (eval echo configure:1938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+{ ac_try='rm -rf ac_test_dir ac_test_target conftestmake'
-+ { (eval echo "$as_me:2726: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:2729: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }
- fi
--
--echo "$ac_t""$ccvs_cv_bsd_make_vpath_bug" 1>&6
-+echo "$as_me:2732: result: $ccvs_cv_bsd_make_vpath_bug" >&5
-+echo "${ECHO_T}$ccvs_cv_bsd_make_vpath_bug" >&6
- # We also don't need to worry about the bug when $srcdir = $builddir
-
--
- if \
- test $ccvs_cv_bsd_make_vpath_bug = no \
- || test $srcdir = .; then
-@@ -1951,98 +2743,340 @@
- MAKE_TARGETS_IN_VPATH_FALSE=
- fi
-
--echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:1956: checking for AIX" >&5
--cat > conftest.$ac_ext <<EOF
--#line 1958 "configure"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+echo "$as_me:2751: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2772 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:2777: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:2783: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2806 "configure"
-+#include "confdefs.h"
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:2810: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:2816: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ break
-+fi
-+
-+ done
-+ ac_cv_prog_CPP=$CPP
-+
-+fi
-+ CPP=$ac_cv_prog_CPP
-+else
-+ ac_cv_prog_CPP=$CPP
-+fi
-+echo "$as_me:2853: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2863 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:2868: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:2874: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2897 "configure"
-+#include "confdefs.h"
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:2901: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:2907: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ :
-+else
-+ { { echo "$as_me:2935: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+echo "$as_me:2946: checking for AIX" >&5
-+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 2949 "configure"
- #include "confdefs.h"
- #ifdef _AIX
- yes
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
-+ echo "$as_me:2958: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+cat >>confdefs.h <<\EOF
- #define _ALL_SOURCE 1
- EOF
-
- else
-- rm -rf conftest*
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:2965: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- rm -f conftest*
-
--
--ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
--echo "configure:1981: 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
-+echo "$as_me:2970: checking for minix/config.h" >&5
-+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
-+if test "${ac_cv_header_minix_config_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 1986 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 2976 "configure"
- #include "confdefs.h"
- #include <minix/config.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1991: \"$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"
-+_ACEOF
-+if { (eval echo "$as_me:2980: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:2986: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_cv_header_minix_config_h=yes
-+else
-+ echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cv_header_minix_config_h=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+echo "$as_me:3005: result: $ac_cv_header_minix_config_h" >&5
-+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
-+if test $ac_cv_header_minix_config_h = yes; then
- MINIX=yes
- else
-- echo "$ac_t""no" 1>&6
--MINIX=
-+ MINIX=
- fi
-
- if test "$MINIX" = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define _POSIX_SOURCE 1
- EOF
-
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define _POSIX_1_SOURCE 2
- EOF
-
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define _MINIX 1
- EOF
-
- fi
-
--echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:2029: 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
-- echo "$ac_t""yes" 1>&6
-- ISC=yes # If later tests want to check for ISC.
-- cat >> confdefs.h <<\EOF
--#define _POSIX_SOURCE 1
--EOF
-+ echo "$as_me:3029: checking for strerror in -lcposix" >&5
-+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcposix $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 3037 "configure"
-+#include "confdefs.h"
-
-- if test "$GCC" = yes; then
-- CC="$CC -posix"
-- else
-- CC="$CC -Xp"
-- fi
--else
-- echo "$ac_t""no" 1>&6
-- ISC=
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char strerror ();
-+int
-+main ()
-+{
-+strerror ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:3056: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3059: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:3062: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3065: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_cposix_strerror=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_cposix_strerror=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:3076: result: $ac_cv_lib_cposix_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-+if test $ac_cv_lib_cposix_strerror = yes; then
-+ LIBS="$LIBS -lcposix"
- fi
-
- if test "$ISC" = yes; then
-@@ -2051,170 +3085,221 @@
- fi
-
- ac_header_dirent=no
--for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:2059: 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
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+echo "$as_me:3090: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2064 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3096 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
--int main() {
--DIR *dirp = 0;
--; return 0; }
--EOF
--if { (eval echo configure:2072: \"$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 | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3111: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3114: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3117: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3120: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:3130: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
- EOF
-- ac_header_dirent=$ac_hdr; break
--else
-- echo "$ac_t""no" 1>&6
-+
-+ac_header_dirent=$ac_hdr; break
- fi
-+
- 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 opendir in -ldir""... $ac_c" 1>&6
--echo "configure:2097: 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
-+ echo "$as_me:3143: checking for opendir in -ldir" >&5
-+echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
-+if test "${ac_cv_lib_dir_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2105 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 3151 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:2116: \"$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
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:3170: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3173: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:3176: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3179: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dir_opendir=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_dir_opendir=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:3190: result: $ac_cv_lib_dir_opendir" >&5
-+echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
-+if test $ac_cv_lib_dir_opendir = yes; then
- LIBS="$LIBS -ldir"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- else
--echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:2138: 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
-+ echo "$as_me:3197: checking for opendir in -lx" >&5
-+echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
-+if test "${ac_cv_lib_x_opendir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2146 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 3205 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:2157: \"$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
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:3224: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3227: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:3230: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3233: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_x_opendir=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_x_opendir=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:3244: result: $ac_cv_lib_x_opendir" >&5
-+echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
-+if test $ac_cv_lib_x_opendir = yes; then
- LIBS="$LIBS -lx"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-
--echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:2180: 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
-+echo "$as_me:3252: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2185 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3258 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2193: \"$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*
-+
-+_ACEOF
-+if { (eval echo "$as_me:3266: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:3272: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- ac_cv_header_stdc=yes
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-- rm -rf conftest*
- ac_cv_header_stdc=no
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
-
- 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 2210 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3294 "configure"
- #include "confdefs.h"
- #include <string.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "memchr" >/dev/null 2>&1; then
- :
- else
-- rm -rf conftest*
- ac_cv_header_stdc=no
- fi
- rm -f conftest*
-@@ -2223,16 +3308,16 @@
-
- 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 2228 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3312 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "free" >/dev/null 2>&1; then
- :
- else
-- rm -rf conftest*
- ac_cv_header_stdc=no
- fi
- rm -f conftest*
-@@ -2241,136 +3326,182 @@
-
- if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--if test "$cross_compiling" = yes; then
-+ if test "$cross_compiling" = yes; then
- :
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2249 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3333 "configure"
- #include "confdefs.h"
- #include <ctype.h>
--#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int main () { int i; for (i = 0; i < 256; i++)
--if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
--exit (0); }
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-
--EOF
--if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ exit(2);
-+ exit (0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:3359: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3362: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:3364: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3367: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- :
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_header_stdc=no
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_header_stdc=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
- fi
--
--echo "$ac_t""$ac_cv_header_stdc" 1>&6
-+echo "$as_me:3380: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define STDC_HEADERS 1
- EOF
-
- fi
-
--echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:2284: 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
-+echo "$as_me:3390: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_wait_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2289 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3396 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
--#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
- #endif
--int main() {
--int s;
--wait (&s);
--s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
--; return 0; }
--EOF
--if { (eval echo configure:2305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+
-+int
-+main ()
-+{
-+ int s;
-+ wait (&s);
-+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3418: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3421: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3424: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3427: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-+echo "$as_me:3437: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
- if test $ac_cv_header_sys_wait_h = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_SYS_WAIT_H 1
- EOF
-
- fi
-
--for ac_hdr in errno.h unistd.h string.h memory.h utime.h fcntl.h ndbm.h \
-+for ac_header in errno.h unistd.h string.h memory.h utime.h fcntl.h ndbm.h \
- limits.h sys/file.h \
- sys/param.h sys/select.h sys/time.h sys/timeb.h \
- io.h direct.h sys/bsdtypes.h sys/resource.h syslog.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2332: 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
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:3453: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3459 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:3463: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:3469: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2337 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2342: \"$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"
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ eval "$as_ac_Header=yes"
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
- 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 | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
-+echo "$as_me:3488: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- EOF
--
--else
-- echo "$ac_t""no" 1>&6
-+
- fi
- done
-
--echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
--echo "configure:2369: 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
-+echo "$as_me:3498: checking whether stat file-mode macros are broken" >&5
-+echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
-+if test "${ac_cv_header_stat_broken+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2374 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3504 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -2399,283 +3530,510 @@
- # endif
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "You lose" >/dev/null 2>&1; then
-- rm -rf conftest*
- ac_cv_header_stat_broken=yes
- else
-- rm -rf conftest*
- ac_cv_header_stat_broken=no
- fi
- rm -f conftest*
-
- fi
--
--echo "$ac_t""$ac_cv_header_stat_broken" 1>&6
-+echo "$as_me:3543: result: $ac_cv_header_stat_broken" >&5
-+echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
- if test $ac_cv_header_stat_broken = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define STAT_MACROS_BROKEN 1
- EOF
-
- fi
-
--echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:2425: 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
-+echo "$as_me:3553: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+if test "${ac_cv_header_time+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2430 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3559 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
--int main() {
--struct tm *tp;
--; return 0; }
--EOF
--if { (eval echo configure:2439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3575: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3578: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3581: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3584: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_header_time=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_header_time" 1>&6
-+echo "$as_me:3594: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define TIME_WITH_SYS_TIME 1
- EOF
-
- fi
-
--
--echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:2461: 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 2466 "configure"
--#include "confdefs.h"
--
--int main() {
--
--/* Ultrix mips cc rejects this. */
--typedef int charset[2]; const charset x;
--/* SunOS 4.1.1 cc rejects this. */
--char const *const *ccp;
--char **p;
--/* NEC SVR4.0.2 mips cc rejects this. */
--struct point {int x, y;};
--static struct point const zero = {0,0};
--/* AIX XL C 1.02.0.0 rejects this.
-- It does not let you subtract one const X* pointer from another in an arm
-- of an if-expression whose if-part is not a constant expression */
--const char *g = "string";
--ccp = &g + (g ? g-g : 0);
--/* HPUX 7.0 cc rejects these. */
--++ccp;
--p = (char**) ccp;
--ccp = (char const *const *) p;
--{ /* SCO 3.2v4 cc rejects this. */
-- char *t;
-- char const *s = 0 ? (char *) 0 : (char const *) 0;
--
-- *t++ = 0;
--}
--{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-- int x[] = {25, 17};
-- const int *foo = &x[0];
-- ++foo;
--}
--{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-- typedef const int *iptr;
-- iptr p = 0;
-- ++p;
--}
--{ /* AIX XL C 1.02.0.0 rejects this saying
-- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-- struct s { int j; const int *ap[3]; };
-- struct s *b; b->j = 5;
-+echo "$as_me:3604: checking for $CC option to accept ANSI C" >&5
-+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 3612 "configure"
-+#include "confdefs.h"
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
- }
--{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-- const int foo = 10;
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
- }
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3661: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3664: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3667: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3670: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-
--; return 0; }
--EOF
--if { (eval echo configure:2515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:3687: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+ *)
-+ echo "$as_me:3690: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+ CC="$CC $ac_cv_prog_cc_stdc" ;;
-+esac
-+
-+echo "$as_me:3695: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+if test "${ac_cv_c_const+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3701 "configure"
-+#include "confdefs.h"
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+ /* Ultrix mips cc rejects this. */
-+ typedef int charset[2];
-+ const charset x;
-+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *ccp;
-+ char **p;
-+ /* NEC SVR4.0.2 mips cc rejects this. */
-+ struct point {int x, y;};
-+ static struct point const zero = {0,0};
-+ /* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in
-+ an arm of an if-expression whose if-part is not a constant
-+ expression */
-+ const char *g = "string";
-+ ccp = &g + (g ? g-g : 0);
-+ /* HPUX 7.0 cc rejects these. */
-+ ++ccp;
-+ p = (char**) ccp;
-+ ccp = (char const *const *) p;
-+ { /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+ *t++ = 0;
-+ }
-+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+ }
-+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+ }
-+ { /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+ }
-+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+ }
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3759: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3762: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3765: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3768: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_c_const=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_c_const" 1>&6
-+echo "$as_me:3778: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
-- cat >> confdefs.h <<\EOF
--#define const
-+
-+cat >>confdefs.h <<\EOF
-+#define const
- EOF
-
- fi
-
--echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:2536: 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
-+echo "$as_me:3788: checking for uid_t in sys/types.h" >&5
-+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-+if test "${ac_cv_type_uid_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2541 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3794 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "uid_t" >/dev/null 2>&1; then
-- rm -rf conftest*
- ac_cv_type_uid_t=yes
- else
-- rm -rf conftest*
- ac_cv_type_uid_t=no
- fi
- rm -f conftest*
-
- fi
--
--echo "$ac_t""$ac_cv_type_uid_t" 1>&6
-+echo "$as_me:3808: result: $ac_cv_type_uid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uid_t" >&6
- if test $ac_cv_type_uid_t = no; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define uid_t int
- EOF
-
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define gid_t int
- EOF
-
- fi
-
--echo $ac_n "checking for mode_t""... $ac_c" 1>&6
--echo "configure:2570: 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 2575 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#include <stddef.h>
--#endif
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:3828: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3834 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3840: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3843: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3846: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3849: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:3859: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- 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
-- rm -rf conftest*
-- ac_cv_type_mode_t=no
--fi
--rm -f conftest*
-
- fi
--echo "$ac_t""$ac_cv_type_mode_t" 1>&6
--if test $ac_cv_type_mode_t = no; then
-- cat >> confdefs.h <<\EOF
--#define mode_t int
-+done
-+
-+echo "$as_me:3869: checking for mode_t" >&5
-+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-+if test "${ac_cv_type_mode_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3875 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((mode_t *) 0)
-+ return 0;
-+if (sizeof (mode_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3890: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3893: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3896: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3899: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_mode_t=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_mode_t=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:3909: result: $ac_cv_type_mode_t" >&5
-+echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-+if test $ac_cv_type_mode_t = yes; then
-+ :
-+else
-+
-+cat >>confdefs.h <<EOF
-+#define mode_t int
- EOF
-
- fi
-
--echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:2603: 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 2608 "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 "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-- rm -rf conftest*
-+echo "$as_me:3921: checking for pid_t" >&5
-+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-+if test "${ac_cv_type_pid_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3927 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((pid_t *) 0)
-+ return 0;
-+if (sizeof (pid_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3942: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3945: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:3948: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3951: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_pid_t=yes
- else
-- rm -rf conftest*
-- ac_cv_type_pid_t=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_pid_t=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:3961: result: $ac_cv_type_pid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-+if test $ac_cv_type_pid_t = yes; then
-+ :
-+else
-
--fi
--echo "$ac_t""$ac_cv_type_pid_t" 1>&6
--if test $ac_cv_type_pid_t = no; then
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<EOF
- #define pid_t int
- EOF
-
- fi
-
--echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:2636: 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
-+echo "$as_me:3973: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+if test "${ac_cv_type_size_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2641 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 3979 "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 "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-- rm -rf conftest*
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((size_t *) 0)
-+ return 0;
-+if (sizeof (size_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3994: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:3997: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:4000: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4003: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_size_t=yes
- else
-- rm -rf conftest*
-- ac_cv_type_size_t=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_size_t=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:4013: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+if test $ac_cv_type_size_t = yes; then
-+ :
-+else
-
--fi
--echo "$ac_t""$ac_cv_type_size_t" 1>&6
--if test $ac_cv_type_size_t = no; then
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<EOF
- #define size_t unsigned
- EOF
-
- fi
-
--echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:2669: 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
-+echo "$as_me:4025: checking return type of signal handlers" >&5
-+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-+if test "${ac_cv_type_signal+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2674 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4031 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
- #ifdef signal
--#undef signal
-+# undef signal
- #endif
- #ifdef __cplusplus
- extern "C" void (*signal (int, void (*)(int)))(int);
-@@ -2683,92 +4041,142 @@
- void (*signal ()) ();
- #endif
-
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4053: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4056: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:4059: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4062: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_signal=int
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
-+echo "$as_me:4072: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6
-
--echo "$ac_t""$ac_cv_type_signal" 1>&6
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<EOF
- #define RETSIGTYPE $ac_cv_type_signal
- EOF
-
-+echo "$as_me:4079: checking for struct stat.st_blksize" >&5
-+echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
-+if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4085 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+static struct stat ac_aggr;
-+if (ac_aggr.st_blksize)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4099: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4102: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:4105: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4108: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_struct_stat_st_blksize=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_member_struct_stat_st_blksize=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:4118: result: $ac_cv_member_struct_stat_st_blksize" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
-+if test $ac_cv_member_struct_stat_st_blksize = yes; then
-
-+cat >>confdefs.h <<EOF
-+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-+EOF
-
--echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
--echo "configure:2711: 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 2716 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--#include <sys/stat.h>
--int main() {
--struct stat s; s.st_blksize;
--; return 0; }
--EOF
--if { (eval echo configure:2724: \"$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
--if test $ac_cv_struct_st_blksize = yes; then
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define HAVE_ST_BLKSIZE 1
- EOF
-
- fi
-
--echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
--echo "configure:2745: checking for st_rdev in struct stat" >&5
--if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2750 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--#include <sys/stat.h>
--int main() {
--struct stat s; s.st_rdev;
--; return 0; }
--EOF
--if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-- ac_cv_struct_st_rdev=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_struct_st_rdev=no
--fi
--rm -f conftest*
--fi
-+echo "$as_me:4132: checking for struct stat.st_rdev" >&5
-+echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
-+if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4138 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+static struct stat ac_aggr;
-+if (ac_aggr.st_rdev)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4152: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4155: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:4158: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4161: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_struct_stat_st_rdev=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_member_struct_stat_st_rdev=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:4171: result: $ac_cv_member_struct_stat_st_rdev" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
-+if test $ac_cv_member_struct_stat_st_rdev = yes; then
-
--echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6
--if test $ac_cv_struct_st_rdev = yes; then
-- cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<EOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
-+EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_ST_RDEV 1
- EOF
-
-@@ -2776,61 +4184,75 @@
-
- for ac_func in mkdir rename strstr dup2 strerror valloc waitpid memmove strtoul
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2781: 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
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:4188: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2786 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4194 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
-+ which can conflict with char $ac_func (); below. */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
--
--int main() {
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
-+char (*f) ();
-
-+int
-+main ()
-+{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+f = $ac_func;
- #endif
-
--; return 0; }
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4225: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4228: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:4231: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4234: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:4244: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- EOF
--if { (eval echo configure:2809: \"$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}.${ac_objext}"
-+ LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
- fi
- done
-
--
- for ac_func in \
- fchdir \
- fchmod \
-@@ -2859,252 +4281,376 @@
- wait3 \
-
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2864: 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
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:4285: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2869 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4291 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
-+ which can conflict with char $ac_func (); below. */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
--
--int main() {
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
-+char (*f) ();
-
-+int
-+main ()
-+{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+f = $ac_func;
- #endif
-
--; return 0; }
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4322: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4325: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:4328: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4331: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:4341: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- EOF
--if { (eval echo configure:2892: \"$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
- fi
- done
-
- # we only need one of the following
-+
- for ac_func in \
- nanosleep \
- usleep \
- select \
-
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2924: 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
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:4360: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2929 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4366 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
-+ which can conflict with char $ac_func (); below. */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
--
--int main() {
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
-+char (*f) ();
-
-+int
-+main ()
-+{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+f = $ac_func;
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:2952: \"$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
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4397: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4400: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:4403: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4406: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:4416: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- EOF
- break
--else
-- echo "$ac_t""no" 1>&6
- fi
- done
-
--
--cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define HAVE_STRCHR 1
- EOF
-
--cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define HAVE_MEMCHR 1
- EOF
-
--
--cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define REGEX_MALLOC 1
- EOF
-
--cat >> confdefs.h <<\EOF
-+cat >>confdefs.h <<\EOF
- #define _REGEX_RE_COMP 1
- EOF
-
--ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
--echo "configure:2996: 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 3001 "configure"
--#include "confdefs.h"
--#include <vfork.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3006: \"$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"
-+for ac_header in unistd.h vfork.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:4445: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4451 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:4455: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:4461: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ eval "$as_ac_Header=yes"
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- cat >> confdefs.h <<\EOF
--#define HAVE_VFORK_H 1
-+echo "$as_me:4480: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- EOF
-
--else
-- echo "$ac_t""no" 1>&6
- fi
-+done
-
--echo $ac_n "checking for working vfork""... $ac_c" 1>&6
--echo "configure:3031: 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:3037: checking for vfork" >&5
--if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+for ac_func in fork vfork
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:4493: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3042 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4499 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char vfork(); below. */
-+ which can conflict with char $ac_func (); below. */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char vfork();
--
--int main() {
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
-+char (*f) ();
-
-+int
-+main ()
-+{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_vfork) || defined (__stub___vfork)
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--vfork();
-+f = $ac_func;
- #endif
-
--; return 0; }
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4530: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4533: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:4536: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4539: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:4549: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- EOF
--if { (eval echo configure:3065: \"$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
-+done
-
--if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
-+ac_cv_func_fork_works=$ac_cv_func_fork
-+if test "x$ac_cv_func_fork" = xyes; then
-+ echo "$as_me:4561: checking for working fork" >&5
-+echo $ECHO_N "checking for working fork... $ECHO_C" >&6
-+if test "${ac_cv_func_fork_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then
-+ ac_cv_func_fork_works=cross
- else
-- echo "$ac_t""no" 1>&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* By Rüdiger Kuhlmann. */
-+ #include <sys/types.h>
-+ #if HAVE_UNISTD_H
-+ # include <unistd.h>
-+ #endif
-+ /* Some systems only have a dummy stub for fork() */
-+ int main ()
-+ {
-+ if (fork() < 0)
-+ exit (1);
-+ exit (0);
-+ }
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:4584: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4587: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:4589: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4592: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_fork_works=yes
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_fork_works=no
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+echo "$as_me:4604: result: $ac_cv_func_fork_works" >&5
-+echo "${ECHO_T}$ac_cv_func_fork_works" >&6
-+
-+fi
-+if test "x$ac_cv_func_fork_works" = xcross; then
-+ case $host in
-+ *-*-amigaos* | *-*-msdosdjgpp*)
-+ # Override, as these systems have only a dummy fork() stub
-+ ac_cv_func_fork_works=no
-+ ;;
-+ *)
-+ ac_cv_func_fork_works=yes
-+ ;;
-+ esac
-+ { echo "$as_me:4618: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
--
- ac_cv_func_vfork_works=$ac_cv_func_vfork
-+if test "x$ac_cv_func_vfork" = xyes; then
-+ echo "$as_me:4623: checking for working vfork" >&5
-+echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
-+if test "${ac_cv_func_vfork_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then
-+ ac_cv_func_vfork_works=cross
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3087 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4632 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test. */
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#ifdef HAVE_UNISTD_H
--#include <unistd.h>
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
- #endif
--#ifdef HAVE_VFORK_H
--#include <vfork.h>
-+#if HAVE_VFORK_H
-+# include <vfork.h>
- #endif
- /* On some sparc systems, changes by the child to local and incoming
-- argument registers are propagated back to the parent.
-- The compiler is told about this with #include <vfork.h>,
-- but some compilers (e.g. gcc -O) don't grok <vfork.h>.
-- Test for this by using a static variable whose address
-- is put into a register that is clobbered by the vfork. */
-+ argument registers are propagated back to the parent. The compiler
-+ is told about this with #include <vfork.h>, but some compilers
-+ (e.g. gcc -O) don't grok <vfork.h>. Test for this by using a
-+ static variable whose address is put into a register that is
-+ clobbered by the vfork. */
- static
- #ifdef __cplusplus
- sparc_address_test (int arg)
--#else
-+# else
- sparc_address_test (arg) int arg;
- #endif
- {
-@@ -3122,7 +4668,10 @@
- }
- }
- }
--main() {
-+
-+int
-+main ()
-+{
- pid_t parent = getpid ();
- pid_t child;
-
-@@ -3131,16 +4680,15 @@
- child = vfork ();
-
- if (child == 0) {
-- /* Here is another test for sparc vfork register problems.
-- This test uses lots of local variables, at least
-- as many local variables as main has allocated so far
-- including compiler temporaries. 4 locals are enough for
-- gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
-- A buggy compiler should reuse the register of parent
-- for one of the local variables, since it will think that
-- parent can't possibly be used any more in this routine.
-- Assigning to the local variable will thus munge parent
-- in the parent process. */
-+ /* Here is another test for sparc vfork register problems. This
-+ test uses lots of local variables, at least as many local
-+ variables as main has allocated so far including compiler
-+ temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris
-+ 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should
-+ reuse the register of parent for one of the local variables,
-+ since it will think that parent can't possibly be used any more
-+ in this routine. Assigning to the local variable will thus
-+ munge parent in the parent process. */
- pid_t
- p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
- p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
-@@ -3150,11 +4698,10 @@
- || p != p5 || p != p6 || p != p7)
- _exit(1);
-
-- /* On some systems (e.g. IRIX 3.3),
-- vfork doesn't separate parent from child file descriptors.
-- If the child closes a descriptor before it execs or exits,
-- this munges the parent's descriptor as well.
-- Test for this by closing stdout in the child. */
-+ /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
-+ from child file descriptors. If the child closes a descriptor
-+ before it execs or exits, this munges the parent's descriptor
-+ as well. Test for this by closing stdout in the child. */
- _exit(close(fileno(stdout)) != 0);
- } else {
- int status;
-@@ -3177,182 +4724,278 @@
- );
- }
- }
--EOF
--if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:4729: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4732: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:4734: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4737: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_func_vfork_works=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_func_vfork_works=no
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_vfork_works=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+fi
-+echo "$as_me:4749: result: $ac_cv_func_vfork_works" >&5
-+echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
-
-+fi;
-+if test "x$ac_cv_func_fork_works" = xcross; then
-+ ac_cv_func_vfork_works=ac_cv_func_vfork
-+ { echo "$as_me:4755: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
-
--echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
--if test $ac_cv_func_vfork_works = no; then
-- cat >> confdefs.h <<\EOF
-+if test "x$ac_cv_func_vfork_works" = xyes; then
-+
-+cat >>confdefs.h <<\EOF
-+#define HAVE_WORKING_VFORK 1
-+EOF
-+
-+else
-+
-+cat >>confdefs.h <<\EOF
- #define vfork fork
- EOF
-
- fi
-+if test "x$ac_cv_func_fork_works" = xyes; then
-+
-+cat >>confdefs.h <<\EOF
-+#define HAVE_WORKING_FORK 1
-+EOF
-+
-+fi
-
--echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
--echo "configure:3205: 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
-+echo "$as_me:4780: checking whether closedir returns void" >&5
-+echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6
-+if test "${ac_cv_func_closedir_void+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
- ac_cv_func_closedir_void=yes
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3213 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4789 "configure"
- #include "confdefs.h"
--#include <sys/types.h>
-+$ac_includes_default
- #include <$ac_header_dirent>
--int closedir(); main() { exit(closedir(opendir(".")) != 0); }
--EOF
--if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+#ifndef __cplusplus
-+int closedir ();
-+#endif
-+
-+int
-+main ()
-+{
-+exit (closedir (opendir (".")) != 0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:4806: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4809: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:4811: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4814: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; 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
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_closedir_void=yes
- fi
--rm -fr conftest*
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
--
--echo "$ac_t""$ac_cv_func_closedir_void" 1>&6
-+echo "$as_me:4826: result: $ac_cv_func_closedir_void" >&5
-+echo "${ECHO_T}$ac_cv_func_closedir_void" >&6
- if test $ac_cv_func_closedir_void = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define CLOSEDIR_VOID 1
- EOF
-
- fi
-
--
--
--echo $ac_n "checking for library containing getspnam""... $ac_c" 1>&6
--echo "configure:3244: checking for library containing getspnam" >&5
--if eval "test \"`echo '$''{'ac_cv_search_getspnam'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_getspnam="no"
--cat > conftest.$ac_ext <<EOF
--#line 3251 "configure"
-+echo "$as_me:4836: checking for library containing getspnam" >&5
-+echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6
-+if test "${ac_cv_search_getspnam+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_getspnam=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 4844 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--getspnam()
--; return 0; }
--EOF
--if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char getspnam ();
-+int
-+main ()
-+{
-+getspnam ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4863: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4866: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:4869: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4872: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_getspnam="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_getspnam" = "no" && for i in sec gen; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3273 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_getspnam" = no; then
-+ for ac_lib in sec gen; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4884 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--getspnam()
--; return 0; }
--EOF
--if { (eval echo configure:3284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_getspnam="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char getspnam ();
-+int
-+main ()
-+{
-+getspnam ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4903: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4906: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:4909: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4912: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_getspnam="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_getspnam" 1>&6
--if test "$ac_cv_search_getspnam" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:4925: result: $ac_cv_search_getspnam" >&5
-+echo "${ECHO_T}$ac_cv_search_getspnam" >&6
-+if test "$ac_cv_search_getspnam" != no; then
- test "$ac_cv_search_getspnam" = "none required" || LIBS="$ac_cv_search_getspnam $LIBS"
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define HAVE_GETSPNAM 1
- EOF
-
--else :
--
- fi
-
--echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
--echo "configure:3309: 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
-+echo "$as_me:4935: checking whether utime accepts a null argument" >&5
-+echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
-+if test "${ac_cv_func_utime_null+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- rm -f conftestdata; > conftestdata
-+ rm -f conftest.data; >conftest.data
- # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong.
- if test "$cross_compiling" = yes; then
- ac_cv_func_utime_null=no
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3319 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 4946 "configure"
- #include "confdefs.h"
--#include <sys/types.h>
--#include <sys/stat.h>
--main() {
-+$ac_includes_default
-+int
-+main ()
-+{
- struct stat s, t;
--exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
--&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
--&& t.st_mtime - s.st_mtime < 120));
-+ exit (!(stat ("conftest.data", &s) == 0
-+ && utime ("conftest.data", (long *)0) == 0
-+ && stat ("conftest.data", &t) == 0
-+ && t.st_mtime >= s.st_mtime
-+ && t.st_mtime - s.st_mtime < 120));
-+ ;
-+ return 0;
- }
--EOF
--if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4966: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:4968: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:4971: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; 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
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_utime_null=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core core.* *.core
- fi
--
--echo "$ac_t""$ac_cv_func_utime_null" 1>&6
-+echo "$as_me:4984: result: $ac_cv_func_utime_null" >&5
-+echo "${ECHO_T}$ac_cv_func_utime_null" >&6
- if test $ac_cv_func_utime_null = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_UTIME_NULL 1
- EOF
-
- fi
-+rm -f conftest.data
-
--echo $ac_n "checking for long file names""... $ac_c" 1>&6
--echo "configure:3354: 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
-+echo "$as_me:4995: checking for long file names" >&5
-+echo $ECHO_N "checking for long file names... $ECHO_C" >&6
-+if test "${ac_cv_sys_long_file_names+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_sys_long_file_names=yes
- # Test for long file names in all the places we know might matter:
-@@ -3366,67 +5009,92 @@
- # /var/tmp likewise
- # /usr/tmp likewise
- if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-- ac_tmpdirs="$TMPDIR"
-+ 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
-- (echo 2 > $ac_dir/conftest9012346) 2>/dev/null
-- val=`cat $ac_dir/conftest9012345 2>/dev/null`
-- if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then
-+ ac_xdir=$ac_dir/cf$$
-+ (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
-+ ac_tf1=$ac_xdir/conftest9012345
-+ ac_tf2=$ac_xdir/conftest9012346
-+ (echo 1 >$ac_tf1) 2>/dev/null
-+ (echo 2 >$ac_tf2) 2>/dev/null
-+ ac_val=`cat $ac_tf1 2>/dev/null`
-+ if test ! -f $ac_tf1 || test "$ac_val" != 1; then
- ac_cv_sys_long_file_names=no
-- rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
-+ rm -rf $ac_xdir 2>/dev/null
- break
- fi
-- rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
-+ rm -rf $ac_xdir 2>/dev/null
- done
- fi
--
--echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6
-+echo "$as_me:5034: result: $ac_cv_sys_long_file_names" >&5
-+echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
- if test $ac_cv_sys_long_file_names = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_LONG_FILE_NAMES 1
- EOF
-
- fi
-
--
--echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
--echo "configure:3399: checking for working fnmatch" >&5
--if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:5044: checking for working GNU-style fnmatch" >&5
-+echo $ECHO_N "checking for working GNU-style fnmatch... $ECHO_C" >&6
-+if test "${ac_cv_func_fnmatch_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # Some versions of Solaris or SCO have a broken fnmatch function.
-+ # Some versions of Solaris, SCO, and the GNU C Library
-+# have a broken or incompatible fnmatch.
- # So we run a test program. If we are cross-compiling, take no chance.
--# Thanks to John Oleynick and Franc,ois Pinard for this test.
-+# Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
- if test "$cross_compiling" = yes; then
- ac_cv_func_fnmatch_works=no
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3410 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5057 "configure"
- #include "confdefs.h"
--main() { exit (fnmatch ("a*", "abc", 0) != 0); }
--EOF
--if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+#include <fnmatch.h>
-+int
-+main ()
-+{
-+exit (fnmatch ("a*", "abc", 0) != 0
-+ || fnmatch ("d*/*1", "d/s/1", FNM_FILE_NAME) != FNM_NOMATCH
-+ || fnmatch ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR) != 0
-+ || fnmatch ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR) != 0
-+ || fnmatch ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR) != 0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:5073: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5076: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:5078: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5081: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_func_fnmatch_works=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_func_fnmatch_works=no
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_fnmatch_works=no
- fi
--rm -fr conftest*
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
--
--echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6
-+echo "$as_me:5093: result: $ac_cv_func_fnmatch_works" >&5
-+echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6
- if test $ac_cv_func_fnmatch_works = yes; then
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\EOF
- #define HAVE_FNMATCH 1
- EOF
-
-@@ -3437,232 +5105,344 @@
- fi
-
- # Try to find connect and gethostbyname.
--echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
--echo "configure:3442: checking for main in -lnsl" >&5
--ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:5108: checking for main in -lnsl" >&5
-+echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
-+if test "${ac_cv_lib_nsl_main+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3450 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5116 "configure"
- #include "confdefs.h"
-
--int main() {
--main()
--; return 0; }
--EOF
--if { (eval echo configure:3457: \"$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
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
--
--echo $ac_n "checking for library containing connect""... $ac_c" 1>&6
--echo "configure:3474: checking for library containing connect" >&5
--if eval "test \"`echo '$''{'ac_cv_search_connect'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_connect="no"
--cat > conftest.$ac_ext <<EOF
--#line 3481 "configure"
-+int
-+main ()
-+{
-+main ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5128: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5131: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5134: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5137: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_nsl_main=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_nsl_main=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:5148: result: $ac_cv_lib_nsl_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
-+if test $ac_cv_lib_nsl_main = yes; then
-+ echo "$as_me:5151: checking for library containing connect" >&5
-+echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6
-+if test "${ac_cv_search_connect+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_connect=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5159 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--connect()
--; return 0; }
--EOF
--if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char connect ();
-+int
-+main ()
-+{
-+connect ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5178: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5181: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5184: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5187: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_connect="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_connect" = "no" && for i in xnet socket inet; do
--LIBS="-l$i -lnsl $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3503 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_connect" = no; then
-+ for ac_lib in xnet socket inet; do
-+ LIBS="-l$ac_lib -lnsl $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5199 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--connect()
--; return 0; }
--EOF
--if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_connect="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char connect ();
-+int
-+main ()
-+{
-+connect ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5218: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5221: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5224: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5227: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_connect="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_connect" 1>&6
--if test "$ac_cv_search_connect" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:5240: result: $ac_cv_search_connect" >&5
-+echo "${ECHO_T}$ac_cv_search_connect" >&6
-+if test "$ac_cv_search_connect" != no; then
- test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS"
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define HAVE_CONNECT 1
- EOF
-
--else :
--
- fi
--else
-- echo "$ac_t""no" 1>&6
-
--echo $ac_n "checking for library containing connect""... $ac_c" 1>&6
--echo "configure:3541: checking for library containing connect" >&5
--if eval "test \"`echo '$''{'ac_cv_search_connect'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_connect="no"
--cat > conftest.$ac_ext <<EOF
--#line 3548 "configure"
-+ echo "$as_me:5251: checking for library containing connect" >&5
-+echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6
-+if test "${ac_cv_search_connect+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_connect=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5259 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--connect()
--; return 0; }
--EOF
--if { (eval echo configure:3559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char connect ();
-+int
-+main ()
-+{
-+connect ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5278: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5281: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5284: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5287: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_connect="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_connect" = "no" && for i in xnet socket inet; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3570 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_connect" = no; then
-+ for ac_lib in xnet socket inet; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5299 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--connect()
--; return 0; }
--EOF
--if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_connect="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char connect ();
-+int
-+main ()
-+{
-+connect ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5318: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5321: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5324: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5327: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_connect="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_connect" 1>&6
--if test "$ac_cv_search_connect" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:5340: result: $ac_cv_search_connect" >&5
-+echo "${ECHO_T}$ac_cv_search_connect" >&6
-+if test "$ac_cv_search_connect" != no; then
- test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS"
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define HAVE_CONNECT 1
- EOF
-
--else :
--
--fi
- fi
-
-+fi
-
--echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
--echo "configure:3608: checking for library containing gethostbyname" >&5
--if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_gethostbyname="no"
--cat > conftest.$ac_ext <<EOF
--#line 3615 "configure"
-+echo "$as_me:5352: checking for library containing gethostbyname" >&5
-+echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
-+if test "${ac_cv_search_gethostbyname+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_gethostbyname=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5360 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gethostbyname();
--
--int main() {
--gethostbyname()
--; return 0; }
--EOF
--if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char gethostbyname ();
-+int
-+main ()
-+{
-+gethostbyname ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5382: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5385: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5388: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_gethostbyname="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_gethostbyname" = "no" && for i in netinet nsl; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3637 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_gethostbyname" = no; then
-+ for ac_lib in netinet nsl; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5400 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gethostbyname();
--
--int main() {
--gethostbyname()
--; return 0; }
--EOF
--if { (eval echo configure:3648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_gethostbyname="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char gethostbyname ();
-+int
-+main ()
-+{
-+gethostbyname ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5419: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5422: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5425: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5428: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_gethostbyname="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_gethostbyname" 1>&6
--if test "$ac_cv_search_gethostbyname" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:5441: result: $ac_cv_search_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
-+if test "$ac_cv_search_gethostbyname" != no; then
- test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
--
--else :
--
-+
- fi
-
- KRB4=/usr/kerberos
-@@ -3671,110 +5451,177 @@
- if test "${with_krb4+set}" = set; then
- withval="$with_krb4"
- KRB4=$withval
--fi
--echo "default place for krb4 is $KRB4"
--
-+fi; echo "default place for krb4 is $KRB4"
-
- krb_h=
--echo $ac_n "checking for krb.h""... $ac_c" 1>&6
--echo "configure:3681: checking for krb.h" >&5
-+echo "$as_me:5457: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
- 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 3686 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5463 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:3693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5475: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5478: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5481: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5484: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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 3702 "configure"
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+CFLAGS=$hold_cflags
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5492 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5504: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5507: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5510: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5513: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- krb_h=yes krb_incdir=
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- CFLAGS=$hold_cflags
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3722 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5526 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5538: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5541: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5544: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5547: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- krb_h=yes krb_incdir=
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- if test -z "$krb_h"; then
-- cat > conftest.$ac_ext <<EOF
--#line 3740 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5558 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5570: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5573: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5576: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5579: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+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 3758 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5589 "configure"
- #include "confdefs.h"
- #include <krb.h>
--int main() {
-+int
-+main ()
-+{
- int i;
--; return 0; }
--EOF
--if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5604: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5607: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5610: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- krb_h=yes krb_incdir=$KRB4/include/kerberosIV
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- CFLAGS=$hold_cflags
- fi
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$ac_t""$krb_h" 1>&6
-+echo "$as_me:5623: result: $krb_h" >&5
-+echo "${ECHO_T}$krb_h" >&6
-
- includeopt=
-
-@@ -3783,182 +5630,354 @@
- 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 printf in -lkrb""... $ac_c" 1>&6
--echo "configure:3788: 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
-+ echo "$as_me:5633: checking for printf in -lkrb" >&5
-+echo $ECHO_N "checking for printf in -lkrb... $ECHO_C" >&6
-+if test "${ac_cv_lib_krb_printf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lkrb $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3796 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5641 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--printf()
--; return 0; }
--EOF
--if { (eval echo configure:3807: \"$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
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char printf ();
-+int
-+main ()
-+{
-+printf ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5660: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5663: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5666: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5669: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_krb_printf=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_krb_printf=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:5680: result: $ac_cv_lib_krb_printf" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb_printf" >&6
-+if test $ac_cv_lib_krb_printf = yes; then
- krb_lib=yes krb_libdir=${KRB4}/lib
- else
-- echo "$ac_t""no" 1>&6
--LDFLAGS=$hold_ldflags
-+ 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 open in -lkrb""... $ac_c" 1>&6
--echo "configure:3829: 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
-+ echo "$as_me:5688: checking for open in -lkrb" >&5
-+echo $ECHO_N "checking for open in -lkrb... $ECHO_C" >&6
-+if test "${ac_cv_lib_krb_open+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lkrb $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3837 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5696 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--open()
--; return 0; }
--EOF
--if { (eval echo configure:3848: \"$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
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char open ();
-+int
-+main ()
-+{
-+open ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5715: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5718: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5721: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5724: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_krb_open=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_krb_open=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:5735: result: $ac_cv_lib_krb_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb_open" >&6
-+if test $ac_cv_lib_krb_open = yes; then
- krb_lib=yes krb_libdir=
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-
- LDFLAGS=$hold_ldflags
- else
-- echo $ac_n "checking for printf in -lkrb""... $ac_c" 1>&6
--echo "configure:3873: 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
-+ echo "$as_me:5745: checking for printf in -lkrb" >&5
-+echo $ECHO_N "checking for printf in -lkrb... $ECHO_C" >&6
-+if test "${ac_cv_lib_krb_printf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lkrb $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3881 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5753 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char printf();
-+ builtin and then its argument prototype would still apply. */
-+char printf ();
-+int
-+main ()
-+{
-+printf ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5772: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5775: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5778: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5781: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_krb_printf=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_krb_printf=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:5792: result: $ac_cv_lib_krb_printf" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb_printf" >&6
-+if test $ac_cv_lib_krb_printf = yes; then
-+ krb_lib=yes krb_libdir=
-+fi
-
--int main() {
--printf()
--; return 0; }
--EOF
--if { (eval echo configure:3892: \"$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"
-+ echo "$as_me:5798: checking for krb_recvauth" >&5
-+echo $ECHO_N "checking for krb_recvauth... $ECHO_C" >&6
-+if test "${ac_cv_func_krb_recvauth+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5804 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char krb_recvauth (); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char krb_recvauth ();
-+char (*f) ();
-
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+int
-+main ()
-+{
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_krb_recvauth) || defined (__stub___krb_recvauth)
-+choke me
-+#else
-+f = krb_recvauth;
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5835: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5838: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5841: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5844: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_krb_recvauth=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_krb_recvauth=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:5854: result: $ac_cv_func_krb_recvauth" >&5
-+echo "${ECHO_T}$ac_cv_func_krb_recvauth" >&6
-+if test $ac_cv_func_krb_recvauth = yes; then
- krb_lib=yes krb_libdir=
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
- if test -n "$krb_lib"; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define HAVE_KERBEROS 1
- EOF
-
- test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}"
-- LIBS="${LIBS} -lkrb"
- # Put -L${krb_libdir} in LDFLAGS temporarily so that it appears before
- # -ldes in the command line. Don't do it permanently so that we honor
- # the user's setting for LDFLAGS
- hold_ldflags=$LDFLAGS
- test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
-- echo $ac_n "checking for printf in -ldes""... $ac_c" 1>&6
--echo "configure:3926: 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
-+ echo "$as_me:5872: checking for printf in -ldes" >&5
-+echo $ECHO_N "checking for printf in -ldes... $ECHO_C" >&6
-+if test "${ac_cv_lib_des_printf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldes $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3934 "configure"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5880 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--printf()
--; return 0; }
--EOF
--if { (eval echo configure:3945: \"$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"
-+ builtin and then its argument prototype would still apply. */
-+char printf ();
-+int
-+main ()
-+{
-+printf ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5899: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5902: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5905: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5908: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_des_printf=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_des_printf=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:5919: result: $ac_cv_lib_des_printf" >&5
-+echo "${ECHO_T}$ac_cv_lib_des_printf" >&6
-+if test $ac_cv_lib_des_printf = yes; then
-+ LIBS="${LIBS} -ldes"
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- LIBS="${LIBS} -ldes"
-+echo "$as_me:5925: checking for krb_recvauth in -lkrb" >&5
-+echo $ECHO_N "checking for krb_recvauth in -lkrb... $ECHO_C" >&6
-+if test "${ac_cv_lib_krb_krb_recvauth+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lkrb $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 5933 "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char krb_recvauth ();
-+int
-+main ()
-+{
-+krb_recvauth ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5952: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5955: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:5958: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:5961: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_krb_krb_recvauth=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_krb_krb_recvauth=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:5972: result: $ac_cv_lib_krb_krb_recvauth" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb_krb_recvauth" >&6
-+if test $ac_cv_lib_krb_krb_recvauth = yes; then
-+ cat >>confdefs.h <<EOF
-+#define HAVE_LIBKRB 1
-+EOF
-+
-+ LIBS="-lkrb $LIBS"
-+
- fi
-
- LDFLAGS=$hold_ldflags
-@@ -3967,63 +5986,76 @@
- fi
- fi
- fi
-+
- for ac_func in krb_get_err_text
- do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3974: 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
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:5993: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3979 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 5999 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
-+ which can conflict with char $ac_func (); below. */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func();
--
--int main() {
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
-+char (*f) ();
-
-+int
-+main ()
-+{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+f = $ac_func;
- #endif
-
--; return 0; }
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6030: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6033: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6036: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6039: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:6049: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- EOF
--if { (eval echo configure:4002: \"$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
- fi
- done
-
--
--
- #
- # Use --with-gssapi[=DIR] to enable GSSAPI support.
- #
-@@ -4031,29 +6063,29 @@
- #
- # Search for /SUNHEA/ and read the comments about this default below.
- #
-+
- # Check whether --with-gssapi or --without-gssapi was given.
- if test "${with_gssapi+set}" = set; then
- withval="$with_gssapi"
- acx_gssapi_withgssapi=$withval
- else
- acx_gssapi_withgssapi=yes
--fi
--
-+fi;
- #
- # Try to locate a GSSAPI installation if no location was specified, assuming
- # GSSAPI was enabled (the default).
--#
-+#
- if test -n "$acx_gssapi_cv_gssapi"; then
- # Granted, this is a slightly ugly way to print this info, but the
- # AC_CHECK_HEADER used in the search for a GSSAPI installation makes using
- # AC_CACHE_CHECK worse
-- echo $ac_n "checking for GSSAPI""... $ac_c" 1>&6
--echo "configure:4052: checking for GSSAPI" >&5
-+ echo "$as_me:6082: checking for GSSAPI" >&5
-+echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6
- else :; fi
--if eval "test \"`echo '$''{'acx_gssapi_cv_gssapi'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${acx_gssapi_cv_gssapi+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--
-+
- if test x$acx_gssapi_withgssapi = xyes; then
- # --with but no location specified
- # assume a gssapi.h or gssapi/gssapi.h locates our install.
-@@ -4073,52 +6105,61 @@
- break
- fi
- if test x$acx_gssapi_cv_gssapi = xyes; then
-- echo "checking for GSSAPI" 1>&6
--echo "configure:4078: checking for GSSAPI" >&5
-+ { echo "$as_me:6108: checking for GSSAPI..." >&5
-+echo "$as_me: checking for GSSAPI..." >&6;}
- else
- CPPFLAGS="$acx_gssapi_save_CPPFLAGS -I$acx_gssapi_cv_gssapi/include"
-- echo "checking for GSSAPI in $acx_gssapi_cv_gssapi" 1>&6
--echo "configure:4082: checking for GSSAPI in $acx_gssapi_cv_gssapi" >&5
-+ { echo "$as_me:6112: checking for GSSAPI in $acx_gssapi_cv_gssapi..." >&5
-+echo "$as_me: checking for GSSAPI in $acx_gssapi_cv_gssapi..." >&6;}
- fi
- unset ac_cv_header_gssapi_h
- unset ac_cv_header_gssapi_gssapi_h
-- for ac_hdr in gssapi.h gssapi/gssapi.h
-+
-+for ac_header in gssapi.h gssapi/gssapi.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4090: 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
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:6121: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6127 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:6131: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:6137: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- cat > conftest.$ac_ext <<EOF
--#line 4095 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4100: \"$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"
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ eval "$as_ac_Header=yes"
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
- 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 | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
-+echo "$as_me:6156: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- EOF
--
--else
-- echo "$ac_t""no" 1>&6
-+
- fi
- done
-
-@@ -4131,11 +6172,12 @@
- else
- acx_gssapi_cv_gssapi=$acx_gssapi_withgssapi
- fi
--echo $ac_n "checking for GSSAPI""... $ac_c" 1>&6
--echo "configure:4136: checking for GSSAPI" >&5
-+echo "$as_me:6175: checking for GSSAPI" >&5
-+echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6
-
- fi
--echo "$ac_t""$acx_gssapi_cv_gssapi" 1>&6
-+echo "$as_me:6179: result: $acx_gssapi_cv_gssapi" >&5
-+echo "${ECHO_T}$acx_gssapi_cv_gssapi" >&6
-
- #
- # Set up GSSAPI includes for later use. We don't bother to check for
-@@ -4154,8 +6196,9 @@
- #
- if test x$acx_gssapi_cv_gssapi != xno; then
- # define HAVE_GSSAPI and set up the includes
-- cat >> confdefs.h <<\EOF
--#define HAVE_GSSAPI
-+
-+cat >>confdefs.h <<\EOF
-+#define HAVE_GSSAPI
- EOF
-
- includeopt=$includeopt$GSSAPI_INCLUDES
-@@ -4163,73 +6206,81 @@
- # locate any other headers
- acx_gssapi_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=$CPPFLAGS$GSSAPI_INCLUDES
-- for ac_hdr in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h krb5.h
-+
-+for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h krb5.h
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4171: 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
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:6213: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6219 "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:6223: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ egrep -v '^ *\+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:6229: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- cat > conftest.$ac_ext <<EOF
--#line 4176 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4181: \"$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"
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ eval "$as_ac_Header=yes"
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-+ echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
- 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 | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
-+echo "$as_me:6248: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- EOF
--
--else
-- echo "$ac_t""no" 1>&6
-+
- fi
- done
-
- # And look through them for GSS_C_NT_HOSTBASED_SERVICE or its alternatives
-- echo $ac_n "checking for GSS_C_NT_HOSTBASED_SERVICE""... $ac_c" 1>&6
--echo "configure:4209: checking for GSS_C_NT_HOSTBASED_SERVICE" >&5
--if eval "test \"`echo '$''{'acx_gssapi_cv_gss_c_nt_hostbased_service'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:6259: checking for GSS_C_NT_HOSTBASED_SERVICE" >&5
-+echo $ECHO_N "checking for GSS_C_NT_HOSTBASED_SERVICE... $ECHO_C" >&6
-+if test "${acx_gssapi_cv_gss_c_nt_hostbased_service+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- acx_gssapi_cv_gss_c_nt_hostbased_service=no
- if test "$ac_cv_header_gssapi_h" = "yes"; then
-- cat > conftest.$ac_ext <<EOF
--#line 4216 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6267 "configure"
- #include "confdefs.h"
- #include <gssapi.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-- rm -rf conftest*
- acx_gssapi_cv_gss_c_nt_hostbased_service=yes
- else
-- rm -rf conftest*
-- cat > conftest.$ac_ext <<EOF
--#line 4227 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6277 "configure"
- #include "confdefs.h"
- #include <gssapi.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "gss_nt_service_name" >/dev/null 2>&1; then
-- rm -rf conftest*
- acx_gssapi_cv_gss_c_nt_hostbased_service=gss_nt_service_name
- fi
- rm -f conftest*
-@@ -4240,25 +6291,24 @@
- fi
- if test $acx_gssapi_cv_gss_c_nt_hostbased_service = no &&
- test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
-- cat > conftest.$ac_ext <<EOF
--#line 4245 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6295 "configure"
- #include "confdefs.h"
- #include <gssapi/gssapi.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-- rm -rf conftest*
- acx_gssapi_cv_gss_c_nt_hostbased_service
- else
-- rm -rf conftest*
-- cat > conftest.$ac_ext <<EOF
--#line 4256 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6305 "configure"
- #include "confdefs.h"
- #include <gssapi/gssapi.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "gss_nt_service_name" >/dev/null 2>&1; then
-- rm -rf conftest*
- acx_gssapi_cv_gss_c_nt_hostbased_service=gss_nt_service_name
- fi
- rm -f conftest*
-@@ -4269,25 +6319,24 @@
- fi
- if test $acx_gssapi_cv_gss_c_nt_hostbased_service = no &&
- test "$ac_cv_header_gssapi_gssapi_generic_h" = "yes"; then
-- cat > conftest.$ac_ext <<EOF
--#line 4274 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6323 "configure"
- #include "confdefs.h"
- #include <gssapi/gssapi_generic.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-- rm -rf conftest*
- acx_gssapi_cv_gss_c_nt_hostbased_service
- else
-- rm -rf conftest*
-- cat > conftest.$ac_ext <<EOF
--#line 4285 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6333 "configure"
- #include "confdefs.h"
- #include <gssapi/gssapi_generic.h>
--EOF
-+
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "gss_nt_service_name" >/dev/null 2>&1; then
-- rm -rf conftest*
- acx_gssapi_cv_gss_c_nt_hostbased_service=gss_nt_service_name
- fi
- rm -f conftest*
-@@ -4297,13 +6346,14 @@
-
- fi
- fi
--
--echo "$ac_t""$acx_gssapi_cv_gss_c_nt_hostbased_service" 1>&6
-+echo "$as_me:6349: result: $acx_gssapi_cv_gss_c_nt_hostbased_service" >&5
-+echo "${ECHO_T}$acx_gssapi_cv_gss_c_nt_hostbased_service" >&6
- if test $acx_gssapi_cv_gss_c_nt_hostbased_service != yes &&
- test $acx_gssapi_cv_gss_c_nt_hostbased_service != no; then
- # don't define for yes since that means it already means something and
- # don't define for no since we'd rather the compiler catch the error
-- cat >> confdefs.h <<EOF
-+
-+cat >>confdefs.h <<EOF
- #define GSS_C_NT_HOSTBASED_SERVICE $acx_gssapi_cv_gss_c_nt_hostbased_service
- EOF
-
-@@ -4330,67 +6380,100 @@
- # des Heimdal K 0.3d, but Heimdal seems to be set up such
- # that it could have been installed from elsewhere.
- #
--
--echo $ac_n "checking for library containing des_set_odd_parity""... $ac_c" 1>&6
--echo "configure:4336: checking for library containing des_set_odd_parity" >&5
--if eval "test \"`echo '$''{'ac_cv_search_des_set_odd_parity'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_des_set_odd_parity="no"
--cat > conftest.$ac_ext <<EOF
--#line 4343 "configure"
-+ echo "$as_me:6383: checking for library containing des_set_odd_parity" >&5
-+echo $ECHO_N "checking for library containing des_set_odd_parity... $ECHO_C" >&6
-+if test "${ac_cv_search_des_set_odd_parity+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_des_set_odd_parity=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6391 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char des_set_odd_parity();
--
--int main() {
--des_set_odd_parity()
--; return 0; }
--EOF
--if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char des_set_odd_parity ();
-+int
-+main ()
-+{
-+des_set_odd_parity ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6410: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6413: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6416: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6419: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_des_set_odd_parity="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_des_set_odd_parity" = "no" && for i in des; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4365 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_des_set_odd_parity" = no; then
-+ for ac_lib in des; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6431 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char des_set_odd_parity();
--
--int main() {
--des_set_odd_parity()
--; return 0; }
--EOF
--if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_des_set_odd_parity="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char des_set_odd_parity ();
-+int
-+main ()
-+{
-+des_set_odd_parity ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6450: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6453: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6456: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6459: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_des_set_odd_parity="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_des_set_odd_parity" 1>&6
--if test "$ac_cv_search_des_set_odd_parity" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:6472: result: $ac_cv_search_des_set_odd_parity" >&5
-+echo "${ECHO_T}$ac_cv_search_des_set_odd_parity" >&6
-+if test "$ac_cv_search_des_set_odd_parity" != no; then
- test "$ac_cv_search_des_set_odd_parity" = "none required" || LIBS="$ac_cv_search_des_set_odd_parity $LIBS"
--
--else :
--
-+
- fi
-
- #
-@@ -4398,133 +6481,199 @@
- #
- # com_err MIT K5 v1.2.2-beta1
- #
--
--echo $ac_n "checking for library containing com_err""... $ac_c" 1>&6
--echo "configure:4404: checking for library containing com_err" >&5
--if eval "test \"`echo '$''{'ac_cv_search_com_err'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_com_err="no"
--cat > conftest.$ac_ext <<EOF
--#line 4411 "configure"
-+ echo "$as_me:6484: checking for library containing com_err" >&5
-+echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6
-+if test "${ac_cv_search_com_err+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_com_err=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6492 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char com_err();
--
--int main() {
--com_err()
--; return 0; }
--EOF
--if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char com_err ();
-+int
-+main ()
-+{
-+com_err ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6511: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6514: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6517: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6520: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_com_err="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_com_err" = "no" && for i in com_err; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4433 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_com_err" = no; then
-+ for ac_lib in com_err; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6532 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char com_err();
--
--int main() {
--com_err()
--; return 0; }
--EOF
--if { (eval echo configure:4444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_com_err="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char com_err ();
-+int
-+main ()
-+{
-+com_err ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6551: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6554: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6557: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6560: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_com_err="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_com_err" 1>&6
--if test "$ac_cv_search_com_err" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:6573: result: $ac_cv_search_com_err" >&5
-+echo "${ECHO_T}$ac_cv_search_com_err" >&6
-+if test "$ac_cv_search_com_err" != no; then
- test "$ac_cv_search_com_err" = "none required" || LIBS="$ac_cv_search_com_err $LIBS"
--
--else :
--
-+
- fi
-
- #
- # asn1 Heimdal K 0.3d -lcom_err
- #
--
--echo $ac_n "checking for library containing initialize_asn1_error_table_r""... $ac_c" 1>&6
--echo "configure:4470: checking for library containing initialize_asn1_error_table_r" >&5
--if eval "test \"`echo '$''{'ac_cv_search_initialize_asn1_error_table_r'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_initialize_asn1_error_table_r="no"
--cat > conftest.$ac_ext <<EOF
--#line 4477 "configure"
-+ echo "$as_me:6583: checking for library containing initialize_asn1_error_table_r" >&5
-+echo $ECHO_N "checking for library containing initialize_asn1_error_table_r... $ECHO_C" >&6
-+if test "${ac_cv_search_initialize_asn1_error_table_r+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_initialize_asn1_error_table_r=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6591 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char initialize_asn1_error_table_r();
--
--int main() {
--initialize_asn1_error_table_r()
--; return 0; }
--EOF
--if { (eval echo configure:4488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char initialize_asn1_error_table_r ();
-+int
-+main ()
-+{
-+initialize_asn1_error_table_r ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6610: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6613: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6616: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6619: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_initialize_asn1_error_table_r="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_initialize_asn1_error_table_r" = "no" && for i in asn1; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4499 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_initialize_asn1_error_table_r" = no; then
-+ for ac_lib in asn1; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6631 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char initialize_asn1_error_table_r();
--
--int main() {
--initialize_asn1_error_table_r()
--; return 0; }
--EOF
--if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_initialize_asn1_error_table_r="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char initialize_asn1_error_table_r ();
-+int
-+main ()
-+{
-+initialize_asn1_error_table_r ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6650: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6653: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6656: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6659: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_initialize_asn1_error_table_r="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_initialize_asn1_error_table_r" 1>&6
--if test "$ac_cv_search_initialize_asn1_error_table_r" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:6672: result: $ac_cv_search_initialize_asn1_error_table_r" >&5
-+echo "${ECHO_T}$ac_cv_search_initialize_asn1_error_table_r" >&6
-+if test "$ac_cv_search_initialize_asn1_error_table_r" != no; then
- test "$ac_cv_search_initialize_asn1_error_table_r" = "none required" || LIBS="$ac_cv_search_initialize_asn1_error_table_r $LIBS"
--
--else :
--
-+
- fi
-
- #
-@@ -4533,199 +6682,298 @@
- # resolv MIT K5 1.2.2-beta1
- # Linux 2.2.17
- #
--
--echo $ac_n "checking for library containing __dn_expand""... $ac_c" 1>&6
--echo "configure:4539: checking for library containing __dn_expand" >&5
--if eval "test \"`echo '$''{'ac_cv_search___dn_expand'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search___dn_expand="no"
--cat > conftest.$ac_ext <<EOF
--#line 4546 "configure"
-+ echo "$as_me:6685: checking for library containing __dn_expand" >&5
-+echo $ECHO_N "checking for library containing __dn_expand... $ECHO_C" >&6
-+if test "${ac_cv_search___dn_expand+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search___dn_expand=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6693 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char __dn_expand();
--
--int main() {
--__dn_expand()
--; return 0; }
--EOF
--if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char __dn_expand ();
-+int
-+main ()
-+{
-+__dn_expand ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6712: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6715: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6718: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6721: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search___dn_expand="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search___dn_expand" = "no" && for i in resolv; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4568 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search___dn_expand" = no; then
-+ for ac_lib in resolv; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6733 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char __dn_expand();
--
--int main() {
--__dn_expand()
--; return 0; }
--EOF
--if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search___dn_expand="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char __dn_expand ();
-+int
-+main ()
-+{
-+__dn_expand ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6752: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6755: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6758: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6761: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search___dn_expand="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search___dn_expand" 1>&6
--if test "$ac_cv_search___dn_expand" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:6774: result: $ac_cv_search___dn_expand" >&5
-+echo "${ECHO_T}$ac_cv_search___dn_expand" >&6
-+if test "$ac_cv_search___dn_expand" != no; then
- test "$ac_cv_search___dn_expand" = "none required" || LIBS="$ac_cv_search___dn_expand $LIBS"
--
--else :
--
-+
- fi
-
- #
- # roken Heimdal K 0.3d -lresolv
- #
--
--echo $ac_n "checking for library containing roken_gethostbyaddr""... $ac_c" 1>&6
--echo "configure:4605: checking for library containing roken_gethostbyaddr" >&5
--if eval "test \"`echo '$''{'ac_cv_search_roken_gethostbyaddr'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_roken_gethostbyaddr="no"
--cat > conftest.$ac_ext <<EOF
--#line 4612 "configure"
-+ echo "$as_me:6784: checking for library containing roken_gethostbyaddr" >&5
-+echo $ECHO_N "checking for library containing roken_gethostbyaddr... $ECHO_C" >&6
-+if test "${ac_cv_search_roken_gethostbyaddr+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_roken_gethostbyaddr=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6792 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char roken_gethostbyaddr();
--
--int main() {
--roken_gethostbyaddr()
--; return 0; }
--EOF
--if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char roken_gethostbyaddr ();
-+int
-+main ()
-+{
-+roken_gethostbyaddr ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6811: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6814: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6817: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6820: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_roken_gethostbyaddr="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_roken_gethostbyaddr" = "no" && for i in roken; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4634 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_roken_gethostbyaddr" = no; then
-+ for ac_lib in roken; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6832 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char roken_gethostbyaddr();
--
--int main() {
--roken_gethostbyaddr()
--; return 0; }
--EOF
--if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_roken_gethostbyaddr="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char roken_gethostbyaddr ();
-+int
-+main ()
-+{
-+roken_gethostbyaddr ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6851: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6854: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6857: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6860: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_roken_gethostbyaddr="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_roken_gethostbyaddr" 1>&6
--if test "$ac_cv_search_roken_gethostbyaddr" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:6873: result: $ac_cv_search_roken_gethostbyaddr" >&5
-+echo "${ECHO_T}$ac_cv_search_roken_gethostbyaddr" >&6
-+if test "$ac_cv_search_roken_gethostbyaddr" != no; then
- test "$ac_cv_search_roken_gethostbyaddr" = "none required" || LIBS="$ac_cv_search_roken_gethostbyaddr $LIBS"
--
--else :
--
-+
- fi
-
- #
- # k5crypto MIT K5 v1.2.2-beta1
- #
--
--echo $ac_n "checking for library containing valid_enctype""... $ac_c" 1>&6
--echo "configure:4671: checking for library containing valid_enctype" >&5
--if eval "test \"`echo '$''{'ac_cv_search_valid_enctype'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_valid_enctype="no"
--cat > conftest.$ac_ext <<EOF
--#line 4678 "configure"
-+ echo "$as_me:6883: checking for library containing valid_enctype" >&5
-+echo $ECHO_N "checking for library containing valid_enctype... $ECHO_C" >&6
-+if test "${ac_cv_search_valid_enctype+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_valid_enctype=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6891 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char valid_enctype();
--
--int main() {
--valid_enctype()
--; return 0; }
--EOF
--if { (eval echo configure:4689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char valid_enctype ();
-+int
-+main ()
-+{
-+valid_enctype ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6910: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6913: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6916: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6919: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_valid_enctype="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_valid_enctype" = "no" && for i in k5crypto; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4700 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_valid_enctype" = no; then
-+ for ac_lib in k5crypto; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 6931 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char valid_enctype();
--
--int main() {
--valid_enctype()
--; return 0; }
--EOF
--if { (eval echo configure:4711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_valid_enctype="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char valid_enctype ();
-+int
-+main ()
-+{
-+valid_enctype ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6950: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6953: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:6956: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:6959: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_valid_enctype="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_valid_enctype" 1>&6
--if test "$ac_cv_search_valid_enctype" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:6972: result: $ac_cv_search_valid_enctype" >&5
-+echo "${ECHO_T}$ac_cv_search_valid_enctype" >&6
-+if test "$ac_cv_search_valid_enctype" != no; then
- test "$ac_cv_search_valid_enctype" = "none required" || LIBS="$ac_cv_search_valid_enctype $LIBS"
--
--else :
--
-+
- fi
-
- #
-@@ -4738,67 +6986,100 @@
- # 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 library containing compile""... $ac_c" 1>&6
--echo "configure:4744: checking for library containing compile" >&5
--if eval "test \"`echo '$''{'ac_cv_search_compile'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_compile="no"
--cat > conftest.$ac_ext <<EOF
--#line 4751 "configure"
-+ echo "$as_me:6989: checking for library containing compile" >&5
-+echo $ECHO_N "checking for library containing compile... $ECHO_C" >&6
-+if test "${ac_cv_search_compile+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_compile=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 6997 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--compile()
--; return 0; }
--EOF
--if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char compile ();
-+int
-+main ()
-+{
-+compile ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7016: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7019: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7022: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7025: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_compile="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_compile" = "no" && for i in gen; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4773 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_compile" = no; then
-+ for ac_lib in gen; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7037 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--compile()
--; return 0; }
--EOF
--if { (eval echo configure:4784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_compile="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char compile ();
-+int
-+main ()
-+{
-+compile ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7056: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7059: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7062: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7065: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_compile="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_compile" 1>&6
--if test "$ac_cv_search_compile" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:7078: result: $ac_cv_search_compile" >&5
-+echo "${ECHO_T}$ac_cv_search_compile" >&6
-+if test "$ac_cv_search_compile" != no; then
- test "$ac_cv_search_compile" = "none required" || LIBS="$ac_cv_search_compile $LIBS"
--
--else :
--
-+
- fi
-
- #
-@@ -4814,67 +7095,100 @@
- #
- # krb5 Heimdal K 0.3d -lasn1 -lroken -ldes
- #
--
--echo $ac_n "checking for library containing krb5_free_context""... $ac_c" 1>&6
--echo "configure:4820: checking for library containing krb5_free_context" >&5
--if eval "test \"`echo '$''{'ac_cv_search_krb5_free_context'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_krb5_free_context="no"
--cat > conftest.$ac_ext <<EOF
--#line 4827 "configure"
-+ echo "$as_me:7098: checking for library containing krb5_free_context" >&5
-+echo $ECHO_N "checking for library containing krb5_free_context... $ECHO_C" >&6
-+if test "${ac_cv_search_krb5_free_context+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_krb5_free_context=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 7106 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char krb5_free_context();
--
--int main() {
--krb5_free_context()
--; return 0; }
--EOF
--if { (eval echo configure:4838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char krb5_free_context ();
-+int
-+main ()
-+{
-+krb5_free_context ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7125: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7128: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7131: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7134: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_krb5_free_context="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_krb5_free_context" = "no" && for i in krb5; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4849 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_krb5_free_context" = no; then
-+ for ac_lib in krb5; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7146 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char krb5_free_context();
--
--int main() {
--krb5_free_context()
--; return 0; }
--EOF
--if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_krb5_free_context="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char krb5_free_context ();
-+int
-+main ()
-+{
-+krb5_free_context ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7165: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7168: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7171: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7174: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_krb5_free_context="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_krb5_free_context" 1>&6
--if test "$ac_cv_search_krb5_free_context" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:7187: result: $ac_cv_search_krb5_free_context" >&5
-+echo "${ECHO_T}$ac_cv_search_krb5_free_context" >&6
-+if test "$ac_cv_search_krb5_free_context" != no; then
- test "$ac_cv_search_krb5_free_context" = "none required" || LIBS="$ac_cv_search_krb5_free_context $LIBS"
--
--else :
--
-+
- fi
-
- #
-@@ -4888,70 +7202,103 @@
- #
- # gssapi Heimdal K 0.3d -lkrb5
- #
--
--echo $ac_n "checking for library containing gss_import_name""... $ac_c" 1>&6
--echo "configure:4894: checking for library containing gss_import_name" >&5
--if eval "test \"`echo '$''{'ac_cv_search_gss_import_name'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_gss_import_name="no"
--cat > conftest.$ac_ext <<EOF
--#line 4901 "configure"
-+ echo "$as_me:7205: checking for library containing gss_import_name" >&5
-+echo $ECHO_N "checking for library containing gss_import_name... $ECHO_C" >&6
-+if test "${ac_cv_search_gss_import_name+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_gss_import_name=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 7213 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gss_import_name();
--
--int main() {
--gss_import_name()
--; return 0; }
--EOF
--if { (eval echo configure:4912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char gss_import_name ();
-+int
-+main ()
-+{
-+gss_import_name ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7232: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7235: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7238: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7241: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_gss_import_name="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_gss_import_name" = "no" && for i in gssapi_krb5 gssapi; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4923 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_gss_import_name" = no; then
-+ for ac_lib in gssapi_krb5 gssapi; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7253 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gss_import_name();
--
--int main() {
--gss_import_name()
--; return 0; }
--EOF
--if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_gss_import_name="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char gss_import_name ();
-+int
-+main ()
-+{
-+gss_import_name ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7272: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7275: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7278: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7281: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_gss_import_name="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_gss_import_name" 1>&6
--if test "$ac_cv_search_gss_import_name" != "no"; then
-- test "$ac_cv_search_gss_import_name" = "none required" || LIBS="$ac_cv_search_gss_import_name $LIBS"
--
--else :
--
-+LIBS=$ac_func_search_save_LIBS
- fi
-+echo "$as_me:7294: result: $ac_cv_search_gss_import_name" >&5
-+echo "${ECHO_T}$ac_cv_search_gss_import_name" >&6
-+if test "$ac_cv_search_gss_import_name" != no; then
-+ test "$ac_cv_search_gss_import_name" = "none required" || LIBS="$ac_cv_search_gss_import_name $LIBS"
-+
- fi
-
-+fi
-
- # Check whether --enable-encryption or --disable-encryption was given.
- if test "${enable_encryption+set}" = set; then
-@@ -4959,692 +7306,1179 @@
- case "${enableval}" in
- yes) encryption=true ;;
- no) encryption=false ;;
-- *) { echo "configure: error: bad value ${enableval} for encryption option" 1>&2; exit 1; } ;;
-+ *) { { echo "$as_me:7309: error: bad value ${enableval} for encryption option" >&5
-+echo "$as_me: error: bad value ${enableval} for encryption option" >&2;}
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
- encryption=false
--fi
--
-+fi;
- if test "$encryption" = "true"; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define ENCRYPTION 1
- EOF
-
- fi
-
--echo $ac_n "checking for gethostname""... $ac_c" 1>&6
--echo "configure:4977: checking for gethostname" >&5
--if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:7323: checking for gethostname" >&5
-+echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
-+if test "${ac_cv_func_gethostname+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 4982 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7329 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char gethostname(); below. */
-+ which can conflict with char gethostname (); below. */
- #include <assert.h>
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char gethostname();
--
--int main() {
-+ builtin and then its argument prototype would still apply. */
-+char gethostname ();
-+char (*f) ();
-
-+int
-+main ()
-+{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_gethostname) || defined (__stub___gethostname)
- choke me
- #else
--gethostname();
-+f = gethostname;
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:5005: \"$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
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7360: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7363: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7366: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7369: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_gethostname=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_func_gethostname=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:7379: result: $ac_cv_func_gethostname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostname" >&6
-+if test $ac_cv_func_gethostname = yes; then
- :
- else
-- echo "$ac_t""no" 1>&6
--LIBOBJS="$LIBOBJS hostname.o"
-+ LIBOBJS="$LIBOBJS hostname.o"
- fi
-
--
- # Check for options requesting client and server feature. If none are
- # given and we have connect(), we want the full client & server arrangement.
- # Check whether --enable-client or --disable-client was given.
- if test "${enable_client+set}" = set; then
- enableval="$enable_client"
- if test "$enable_client" = yes; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define CLIENT_SUPPORT 1
- EOF
-
- fi
- else
- if test "$ac_cv_search_connect" != no; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define CLIENT_SUPPORT 1
- EOF
-
- fi
--fi
--
-+fi;
- # Check whether --enable-server or --disable-server was given.
- if test "${enable_server+set}" = set; then
- enableval="$enable_server"
- if test "$enable_server" = yes; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define SERVER_SUPPORT 1
- EOF
-
- fi
- else
- if test "$ac_cv_search_connect" != no; then
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define SERVER_SUPPORT 1
- EOF
-
- enable_server=yes
- fi
--fi
--
--
-+fi;
-
- if test "$enable_server" = yes; then
--
--echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6
--echo "configure:5070: checking for library containing crypt" >&5
--if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_func_search_save_LIBS="$LIBS"
--ac_cv_search_crypt="no"
--cat > conftest.$ac_ext <<EOF
--#line 5077 "configure"
-+echo "$as_me:7426: checking for library containing crypt" >&5
-+echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
-+if test "${ac_cv_search_crypt+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_crypt=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 7434 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--crypt()
--; return 0; }
--EOF
--if { (eval echo configure:5088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ builtin and then its argument prototype would still apply. */
-+char crypt ();
-+int
-+main ()
-+{
-+crypt ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7453: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7456: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7459: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7462: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_search_crypt="none required"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--test "$ac_cv_search_crypt" = "no" && for i in crypt; do
--LIBS="-l$i $ac_func_search_save_LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 5099 "configure"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_crypt" = no; then
-+ for ac_lib in crypt; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7474 "configure"
- #include "confdefs.h"
-+
- /* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
- /* 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() {
--crypt()
--; return 0; }
--EOF
--if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_search_crypt="-l$i"
-+ builtin and then its argument prototype would still apply. */
-+char crypt ();
-+int
-+main ()
-+{
-+crypt ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7493: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7496: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:7499: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7502: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_crypt="-l$ac_lib"
- break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
--rm -f conftest*
--done
--LIBS="$ac_func_search_save_LIBS"
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--
--echo "$ac_t""$ac_cv_search_crypt" 1>&6
--if test "$ac_cv_search_crypt" != "no"; then
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:7515: result: $ac_cv_search_crypt" >&5
-+echo "${ECHO_T}$ac_cv_search_crypt" >&6
-+if test "$ac_cv_search_crypt" != no; then
- test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define HAVE_CRYPT 1
- EOF
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define AUTH_SERVER_SUPPORT 1
- EOF
-
--else :
--
- fi
--fi # enable_server
-
-+fi # enable_server
-
--echo $ac_n "checking for cygwin32""... $ac_c" 1>&6
--echo "configure:5140: checking for cygwin32" >&5
--if eval "test \"`echo '$''{'ccvs_cv_sys_cygwin32'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:7530: checking for cygwin32" >&5
-+echo $ECHO_N "checking for cygwin32... $ECHO_C" >&6
-+if test "${ccvs_cv_sys_cygwin32+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 5145 "configure"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line 7536 "configure"
- #include "confdefs.h"
-
--int main() {
-+int
-+main ()
-+{
- return __CYGWIN32__;
--; return 0; }
--EOF
--if { (eval echo configure:5152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7548: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7551: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:7554: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:7557: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- 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
-+ echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ccvs_cv_sys_cygwin32=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ccvs_cv_sys_cygwin32" 1>&6
-+echo "$as_me:7567: result: $ccvs_cv_sys_cygwin32" >&5
-+echo "${ECHO_T}$ccvs_cv_sys_cygwin32" >&6
- if test $ccvs_cv_sys_cygwin32 = yes; then
- LIBOBJS="$LIBOBJS fncase.o"
- LIBS="$LIBS -ladvapi32"
-
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define UTIME_EXPECTS_WRITABLE 1
- EOF
-
--
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define USE_SETMODE_STDOUT 1
- EOF
-
-- cat >> confdefs.h <<\EOF
-+ cat >>confdefs.h <<\EOF
- #define HAVE_SETMODE 1
- EOF
-
- fi
-
- test -f src/options.h && (
-- echo "configure: warning: saving ./src/options.h in ./src/options.h-SAVED" 1>&2
-- echo "configure: warning: You may wish to check that local options have not been lost." 1>&2
-- echo "configure: warning: Do not re-run ./configure or ./config.status until you have...." 1>&2
-+ { echo "$as_me:7588: WARNING: saving ./src/options.h in ./src/options.h-SAVED" >&5
-+echo "$as_me: WARNING: saving ./src/options.h in ./src/options.h-SAVED" >&2;}
-+ { echo "$as_me:7590: WARNING: You may wish to check that local options have not been lost." >&5
-+echo "$as_me: WARNING: You may wish to check that local options have not been lost." >&2;}
-+ { echo "$as_me:7592: WARNING: Do not re-run ./configure or ./config.status until you have...." >&5
-+echo "$as_me: WARNING: Do not re-run ./configure or ./config.status until you have...." >&2;}
- cp ./src/options.h ./src/options.h-SAVED
- )
-
--trap '' 1 2 15
--cat > confcache <<\EOF
-+ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/clmerge contrib/cln_hist contrib/commit_prep contrib/cvs_acls contrib/log contrib/log_accum contrib/mfpipe contrib/rcslock contrib/sccs2rcs diff/Makefile doc/Makefile emx/Makefile lib/Makefile man/Makefile os2/Makefile src/Makefile src/cvsbug tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile"
-+ac_config_commands="$ac_config_commands default"
-+cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
--# scripts and configure runs. It is not useful on other systems.
--# If it contains results you don't want to keep, you may remove or edit it.
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems. If it contains results you don't
-+# want to keep, you may remove or edit it.
- #
--# By default, configure uses ./config.cache as the cache file,
--# creating it if it does not exist already. You can give configure
--# the --cache-file=FILE option to use a different cache file; that is
--# what configure does when it calls configure scripts in
--# subdirectories, so they share the cache.
--# Giving --cache-file=/dev/null disables caching, for debugging configure.
--# config.status only pays attention to the cache file if you give it the
--# --recheck option to rerun configure.
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
- #
--EOF
-+# `ac_cv_env_foo' variables (set or unset) will be overriden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
- # 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 |
-- 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
-+{
-+ (set) 2>&1 |
-+ 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 \
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ ;;
-+ *)
-+ # `set' quotes correctly as required by POSIX, so do not add quotes.
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+} |
-+ sed '
-+ t clear
-+ : clear
-+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+ t end
-+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ : end' >>confcache
-+if cmp -s $cache_file confcache; then :; else
- if test -w $cache_file; then
-- echo "updating cache $cache_file"
-- cat confcache > $cache_file
-+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ cat confcache >$cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
- fi
- rm -f confcache
-
--trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
--
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# Any assignment to VPATH causes Sun make to only execute
--# the first set of double-colon rules, so remove it if not needed.
--# If there is a colon in the path, we need to keep it.
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/;
-+s/:*\${srcdir}:*/:/;
-+s/:*@srcdir@:*/:/;
-+s/^\([^=]*=[ ]*\):*/\1/;
-+s/:*$//;
-+s/^[^=]*=[ ]*$//;
-+}'
- fi
-
--trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
--
- DEFS=-DHAVE_CONFIG_H
-
--# Without the "./", some shells look in PATH for config.status.
- : ${CONFIG_STATUS=./config.status}
--
--echo creating $CONFIG_STATUS
--rm -f $CONFIG_STATUS
--cat > $CONFIG_STATUS <<EOF
--#! /bin/sh
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:7678: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
- # Generated automatically by configure.
- # Run this file to recreate the current configuration.
--# This directory was configured as follows,
--# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--#
--# $0 $ac_configure_args
--#
- # Compiler output produced by configure, useful for debugging
--# configure, is in ./config.log if it exists.
-+# configure, is in config.log if it exists.
-
--ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
--for ac_option
-+debug=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+ac_cs_invocation="\$0 \$@"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+
-+# Name of the executable.
-+as_me=`echo "$0" |sed 's,.*[\\/],,'`
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+as_executable_p="test -f"
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+# NLS nuisances.
-+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-+
-+exec 6>&1
-+
-+_ACEOF
-+
-+# Files that config.status was made for.
-+if test -n "$ac_config_files"; then
-+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_headers"; then
-+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_links"; then
-+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_commands"; then
-+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-+fi
-+
-+cat >>$CONFIG_STATUS <<\EOF
-+
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
-+ -d, --debug don't remove temporary files
-+ --recheck update $as_me by reconfiguring in the same conditions
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+ --header=FILE[:TEMPLATE]
-+ instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+EOF
-+
-+cat >>$CONFIG_STATUS <<EOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.52,
-+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+srcdir=$srcdir
-+INSTALL="$INSTALL"
-+EOF
-+
-+cat >>$CONFIG_STATUS <<\EOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
- do
-- case "\$ac_option" in
-+ case $1 in
-+ --*=*)
-+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ shift
-+ set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
-+ shift
-+ ;;
-+ -*);;
-+ *) # This is not an option, so the user has probably given explicit
-+ # arguments.
-+ ac_need_defaults=false;;
-+ esac
-+
-+ case $1 in
-+ # Handling of the options.
-+EOF
-+cat >>$CONFIG_STATUS <<EOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-- 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.13"
-- exit 0 ;;
-- -help | --help | --hel | --he | --h)
-- echo "\$ac_cs_usage"; exit 0 ;;
-- *) echo "\$ac_cs_usage"; exit 1 ;;
-+ echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-+ exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-+EOF
-+cat >>$CONFIG_STATUS <<\EOF
-+ --version | --vers* | -V )
-+ echo "$ac_cs_version"; exit 0 ;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { { echo "$as_me:7854: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit 0 ;;
-+ --debug | --d* | -d )
-+ debug=: ;;
-+ --file | --fil | --fi | --f )
-+ shift
-+ CONFIG_FILES="$CONFIG_FILES $1"
-+ ac_need_defaults=false;;
-+ --header | --heade | --head | --hea )
-+ shift
-+ CONFIG_HEADERS="$CONFIG_HEADERS $1"
-+ ac_need_defaults=false;;
-+
-+ # This is an error.
-+ -*) { { echo "$as_me:7873: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+
-+ *) ac_config_targets="$ac_config_targets $1" ;;
-+
- esac
-+ shift
- done
-
--ac_given_srcdir=$srcdir
--ac_given_INSTALL="$INSTALL"
-+exec 5>>config.log
-+cat >&5 << _ACEOF
-
--trap 'rm -fr `echo "Makefile \
-- contrib/Makefile \
-- contrib/clmerge \
-- contrib/cln_hist \
-- contrib/commit_prep \
-- contrib/cvs_acls \
-- contrib/log \
-- contrib/log_accum \
-- contrib/mfpipe \
-- contrib/rcslock \
-- contrib/sccs2rcs \
-- diff/Makefile \
-- doc/Makefile \
-- emx/Makefile \
-- lib/Makefile \
-- man/Makefile \
-- os2/Makefile \
-- src/Makefile \
-- src/cvsbug \
-- tools/Makefile \
-- vms/Makefile \
-- windows-NT/Makefile \
-- windows-NT/SCC/Makefile \
-- zlib/Makefile config.h src/options.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
--EOF
--cat >> $CONFIG_STATUS <<EOF
--
--# Protect against being on the right side of a sed subst in config.status.
--sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-- 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
--s%@exec_prefix@%$exec_prefix%g
--s%@prefix@%$prefix%g
--s%@program_transform_name@%$program_transform_name%g
--s%@bindir@%$bindir%g
--s%@sbindir@%$sbindir%g
--s%@libexecdir@%$libexecdir%g
--s%@datadir@%$datadir%g
--s%@sysconfdir@%$sysconfdir%g
--s%@sharedstatedir@%$sharedstatedir%g
--s%@localstatedir@%$localstatedir%g
--s%@libdir@%$libdir%g
--s%@includedir@%$includedir%g
--s%@oldincludedir@%$oldincludedir%g
--s%@infodir@%$infodir%g
--s%@mandir@%$mandir%g
--s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
--s%@INSTALL_DATA@%$INSTALL_DATA%g
--s%@PACKAGE@%$PACKAGE%g
--s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
--s%@MAKEINFO@%$MAKEINFO%g
--s%@AMTAR@%$AMTAR%g
--s%@install_sh@%$install_sh%g
--s%@STRIP@%$STRIP%g
--s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
--s%@INSTALL_STRIP_PROGRAM_ENV@%$INSTALL_STRIP_PROGRAM_ENV%g
--s%@AWK@%$AWK%g
--s%@SET_MAKE@%$SET_MAKE%g
--s%@ETAGS@%$ETAGS%g
--s%@ETAGS_INCLUDE_OPTION@%$ETAGS_INCLUDE_OPTION%g
--s%@AMDEP_TRUE@%$AMDEP_TRUE%g
--s%@AMDEP_FALSE@%$AMDEP_FALSE%g
--s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
--s%@DEPDIR@%$DEPDIR%g
--s%@CVS@%$CVS%g
--s%@CC@%$CC%g
--s%@CPP@%$CPP%g
--s%@_am_include@%$_am_include%g
--s%@_am_quote@%$_am_quote%g
--s%@CCDEPMODE@%$CCDEPMODE%g
--s%@RANLIB@%$RANLIB%g
--s%@YACC@%$YACC%g
--s%@LN_S@%$LN_S%g
--s%@PERL@%$PERL%g
--s%@CSH@%$CSH%g
--s%@PR@%$PR%g
--s%@ROFF@%$ROFF%g
--s%@PS2PDF@%$PS2PDF%g
--s%@TEXI2DVI@%$TEXI2DVI%g
--s%@MAKE_TARGETS_IN_VPATH_TRUE@%$MAKE_TARGETS_IN_VPATH_TRUE%g
--s%@MAKE_TARGETS_IN_VPATH_FALSE@%$MAKE_TARGETS_IN_VPATH_FALSE%g
--s%@LIBOBJS@%$LIBOBJS%g
--s%@KRB4@%$KRB4%g
--s%@includeopt@%$includeopt%g
-+## ----------------------- ##
-+## Running config.status. ##
-+## ----------------------- ##
-
--CEOF
-+This file was extended by $as_me 2.52, executed with
-+ CONFIG_FILES = $CONFIG_FILES
-+ CONFIG_HEADERS = $CONFIG_HEADERS
-+ CONFIG_LINKS = $CONFIG_LINKS
-+ CONFIG_COMMANDS = $CONFIG_COMMANDS
-+ > $ac_cs_invocation
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+_ACEOF
- EOF
-
--cat >> $CONFIG_STATUS <<\EOF
-+cat >>$CONFIG_STATUS <<EOF
-+#
-+# INIT-COMMANDS section.
-+#
-
--# 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
-+AMDEP_TRUE="$AMDEP_TRUE"
-+ac_aux_dir="$ac_aux_dir"
-+
-+EOF
-+
-+cat >>$CONFIG_STATUS <<\EOF
-+for ac_config_target in $ac_config_targets
-+do
-+ case "$ac_config_target" in
-+ # Handling of arguments.
-+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
-+ "contrib/clmerge" ) CONFIG_FILES="$CONFIG_FILES contrib/clmerge" ;;
-+ "contrib/cln_hist" ) CONFIG_FILES="$CONFIG_FILES contrib/cln_hist" ;;
-+ "contrib/commit_prep" ) CONFIG_FILES="$CONFIG_FILES contrib/commit_prep" ;;
-+ "contrib/cvs_acls" ) CONFIG_FILES="$CONFIG_FILES contrib/cvs_acls" ;;
-+ "contrib/log" ) CONFIG_FILES="$CONFIG_FILES contrib/log" ;;
-+ "contrib/log_accum" ) CONFIG_FILES="$CONFIG_FILES contrib/log_accum" ;;
-+ "contrib/mfpipe" ) CONFIG_FILES="$CONFIG_FILES contrib/mfpipe" ;;
-+ "contrib/rcslock" ) CONFIG_FILES="$CONFIG_FILES contrib/rcslock" ;;
-+ "contrib/sccs2rcs" ) CONFIG_FILES="$CONFIG_FILES contrib/sccs2rcs" ;;
-+ "diff/Makefile" ) CONFIG_FILES="$CONFIG_FILES diff/Makefile" ;;
-+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+ "emx/Makefile" ) CONFIG_FILES="$CONFIG_FILES emx/Makefile" ;;
-+ "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+ "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-+ "os2/Makefile" ) CONFIG_FILES="$CONFIG_FILES os2/Makefile" ;;
-+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-+ "src/cvsbug" ) CONFIG_FILES="$CONFIG_FILES src/cvsbug" ;;
-+ "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-+ "vms/Makefile" ) CONFIG_FILES="$CONFIG_FILES vms/Makefile" ;;
-+ "windows-NT/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/Makefile" ;;
-+ "windows-NT/SCC/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/SCC/Makefile" ;;
-+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+ "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "src/options.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/options.h" ;;
-+ *) { { echo "$as_me:7945: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
- done
--if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used. Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
- fi
-+
-+# Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-+ test -n "$tmp" && test -d "$tmp"
-+} ||
-+{
-+ tmp=$TMPDIR/cs$$-$RANDOM
-+ (umask 077 && mkdir $tmp)
-+} ||
-+{
-+ echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+ { (exit 1); exit 1; }
-+}
-+
- EOF
-
--cat >> $CONFIG_STATUS <<EOF
-+cat >>$CONFIG_STATUS <<EOF
-+
-+#
-+# CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "\$CONFIG_FILES"; then
-+ # Protect against being on the right side of a sed subst in config.status.
-+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-+s,@SHELL@,$SHELL,;t t
-+s,@exec_prefix@,$exec_prefix,;t t
-+s,@prefix@,$prefix,;t t
-+s,@program_transform_name@,$program_transform_name,;t t
-+s,@bindir@,$bindir,;t t
-+s,@sbindir@,$sbindir,;t t
-+s,@libexecdir@,$libexecdir,;t t
-+s,@datadir@,$datadir,;t t
-+s,@sysconfdir@,$sysconfdir,;t t
-+s,@sharedstatedir@,$sharedstatedir,;t t
-+s,@localstatedir@,$localstatedir,;t t
-+s,@libdir@,$libdir,;t t
-+s,@includedir@,$includedir,;t t
-+s,@oldincludedir@,$oldincludedir,;t t
-+s,@infodir@,$infodir,;t t
-+s,@mandir@,$mandir,;t t
-+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-+s,@build_alias@,$build_alias,;t t
-+s,@host_alias@,$host_alias,;t t
-+s,@target_alias@,$target_alias,;t t
-+s,@ECHO_C@,$ECHO_C,;t t
-+s,@ECHO_N@,$ECHO_N,;t t
-+s,@ECHO_T@,$ECHO_T,;t t
-+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-+s,@DEFS@,$DEFS,;t t
-+s,@LIBS@,$LIBS,;t t
-+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@PACKAGE@,$PACKAGE,;t t
-+s,@VERSION@,$VERSION,;t t
-+s,@EXEEXT@,$EXEEXT,;t t
-+s,@OBJEXT@,$OBJEXT,;t t
-+s,@ACLOCAL@,$ACLOCAL,;t t
-+s,@AUTOCONF@,$AUTOCONF,;t t
-+s,@AUTOMAKE@,$AUTOMAKE,;t t
-+s,@AUTOHEADER@,$AUTOHEADER,;t t
-+s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@AMTAR@,$AMTAR,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@AWK@,$AWK,;t t
-+s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@DEPDIR@,$DEPDIR,;t t
-+s,@CVS@,$CVS,;t t
-+s,@CC@,$CC,;t t
-+s,@CFLAGS@,$CFLAGS,;t t
-+s,@LDFLAGS@,$LDFLAGS,;t t
-+s,@CPPFLAGS@,$CPPFLAGS,;t t
-+s,@ac_ct_CC@,$ac_ct_CC,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@RANLIB@,$RANLIB,;t t
-+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+s,@YACC@,$YACC,;t t
-+s,@LN_S@,$LN_S,;t t
-+s,@PERL@,$PERL,;t t
-+s,@CSH@,$CSH,;t t
-+s,@PR@,$PR,;t t
-+s,@ROFF@,$ROFF,;t t
-+s,@PS2PDF@,$PS2PDF,;t t
-+s,@TEXI2DVI@,$TEXI2DVI,;t t
-+s,@MAKE_TARGETS_IN_VPATH_TRUE@,$MAKE_TARGETS_IN_VPATH_TRUE,;t t
-+s,@MAKE_TARGETS_IN_VPATH_FALSE@,$MAKE_TARGETS_IN_VPATH_FALSE,;t t
-+s,@CPP@,$CPP,;t t
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@KRB4@,$KRB4,;t t
-+s,@includeopt@,$includeopt,;t t
-+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_lines=48
-+ ac_sed_frag=1 # Number of current file.
-+ ac_beg=1 # First line for current file.
-+ ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-+ else
-+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ fi
-+ if test ! -s $tmp/subs.frag; then
-+ ac_more_lines=false
-+ else
-+ # The purpose of the label and of the branching condition is to
-+ # speed up the sed processing (if there are no `@' at all, there
-+ # is no need to browse any of the substitutions).
-+ # These are the two extra sed commands mentioned above.
-+ (echo ':t
-+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+ else
-+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+ fi
-+ ac_sed_frag=`expr $ac_sed_frag + 1`
-+ ac_beg=$ac_end
-+ ac_end=`expr $ac_end + $ac_max_sed_lines`
-+ fi
-+ done
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds=cat
-+ fi
-+fi # test -n "$CONFIG_FILES"
-
--CONFIG_FILES=\${CONFIG_FILES-"Makefile \
-- contrib/Makefile \
-- contrib/clmerge \
-- contrib/cln_hist \
-- contrib/commit_prep \
-- contrib/cvs_acls \
-- contrib/log \
-- contrib/log_accum \
-- contrib/mfpipe \
-- contrib/rcslock \
-- contrib/sccs2rcs \
-- diff/Makefile \
-- doc/Makefile \
-- emx/Makefile \
-- lib/Makefile \
-- man/Makefile \
-- os2/Makefile \
-- src/Makefile \
-- src/cvsbug \
-- tools/Makefile \
-- vms/Makefile \
-- windows-NT/Makefile \
-- windows-NT/SCC/Makefile \
-- zlib/Makefile"}
- EOF
--cat >> $CONFIG_STATUS <<\EOF
--for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+cat >>$CONFIG_STATUS <<\EOF
-+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case "$ac_file" in
-- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- *) ac_file_in="${ac_file}.in" ;;
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`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 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%/[^/][^/]*$%%'`
-+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-- # The file is in a subdirectory.
-- test ! -d "$ac_dir" && mkdir "$ac_dir"
-- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-+ { case "$ac_dir" in
-+ [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-+ *) as_incr_dir=.;;
-+esac
-+as_dummy="$ac_dir"
-+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-+ case $as_mkdir_dir in
-+ # Skip DOS drivespec
-+ ?:) as_incr_dir=$as_mkdir_dir ;;
-+ *)
-+ as_incr_dir=$as_incr_dir/$as_mkdir_dir
-+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-+ ;;
-+ esac
-+done; }
-+
-+ ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
- # A "../" for each directory in $ac_dir_suffix.
-- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-+ ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
- else
- ac_dir_suffix= ac_dots=
- fi
-
-- case "$ac_given_srcdir" in
-- .) srcdir=.
-- if test -z "$ac_dots"; then top_srcdir=.
-- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-+ case $srcdir in
-+ .) ac_srcdir=.
-+ if test -z "$ac_dots"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* )
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
- *) # Relative path.
-- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-- top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+ ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_dots$srcdir ;;
- esac
-
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+ case $INSTALL in
-+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+ *) ac_INSTALL=$ac_dots$INSTALL ;;
- esac
-
-- echo creating "$ac_file"
-- rm -f "$ac_file"
-- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-- case "$ac_file" in
-- *Makefile*) ac_comsub="1i\\
--# $configure_input" ;;
-- *) ac_comsub= ;;
-- esac
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:8187: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated automatically by config.status. */
-+ configure_input="Generated automatically from `echo $ac_file_in |
-+ sed 's,.*/,,'` by configure."
-+
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:8205: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ echo $f;;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo $f
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo $srcdir/$f
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:8218: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+EOF
-+cat >>$CONFIG_STATUS <<EOF
-+ sed "$ac_vpsub
-+$extrasub
-+EOF
-+cat >>$CONFIG_STATUS <<\EOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s,@configure_input@,$configure_input,;t t
-+s,@srcdir@,$ac_srcdir,;t t
-+s,@top_srcdir@,$ac_top_srcdir,;t t
-+s,@INSTALL@,$ac_INSTALL,;t t
-+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-+ rm -f $tmp/stdin
-+ if test x"$ac_file" != x-; then
-+ mv $tmp/out $ac_file
-+ else
-+ cat $tmp/out
-+ rm -f $tmp/out
-+ fi
-
-- 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
--" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
--fi; done
--rm -f conftest.s*
-+done
-+EOF
-+cat >>$CONFIG_STATUS <<\EOF
-+
-+#
-+# CONFIG_HEADER section.
-+#
-
- # 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.
- #
- # ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
--ac_dC='\3'
--ac_dD='%g'
--# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
--ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='\([ ]\)%\1#\2define\3'
-+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-+ac_dB='[ ].*$,\1#\2'
-+ac_dC=' '
-+ac_dD=',;t'
-+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-+ac_uB='$,\1#\2define\3'
- ac_uC=' '
--ac_uD='\4%g'
--# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_eB='$%\1#\2define\3'
--ac_eC=' '
--ac_eD='%g'
-+ac_uD=',;t'
-
--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
-+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case "$ac_file" in
-- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- *) ac_file_in="${ac_file}.in" ;;
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`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
-
-- echo creating $ac_file
-+ test x"$ac_file" != x- && { echo "$as_me:8279: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-
-- rm -f conftest.frag conftest.in conftest.out
-- 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
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:8290: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ echo $f;;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo $f
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo $srcdir/$f
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:8303: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+ # Remove the trailing spaces.
-+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
- EOF
-
--# Transform confdefs.h into a sed script conftest.vals that substitutes
--# the proper values into config.h.in to produce config.h. And first:
--# Protect against being on the right side of a sed subst in config.status.
--# Protect against being in an unquoted here document in config.status.
--rm -f conftest.vals
--cat > conftest.hdr <<\EOF
--s/[\\&%]/\\&/g
--s%[\\$`]%\\&%g
--s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
--s%ac_d%ac_u%gp
--s%ac_u%ac_e%gp
--EOF
--sed -n -f conftest.hdr confdefs.h > conftest.vals
--rm -f conftest.hdr
-+# Transform confdefs.h into two sed scripts, `conftest.defines' and
-+# `conftest.undefs', that substitutes the proper values into
-+# config.h.in to produce config.h. The first handles `#define'
-+# templates, and the second `#undef' templates.
-+# And first: Protect against being on the right side of a sed subst in
-+# config.status. Protect against being in an unquoted here document
-+# in config.status.
-+rm -f conftest.defines conftest.undefs
-+# Using a here document instead of a string reduces the quoting nightmare.
-+# Putting comments in sed scripts is not portable.
-+#
-+# `end' is used to avoid that the second main sed command (meant for
-+# 0-ary CPP macros) applies to n-ary macro definitions.
-+# See the Autoconf documentation for `clear'.
-+cat >confdef2sed.sed <<\EOF
-+s/[\\&,]/\\&/g
-+s,[\\$`],\\&,g
-+t clear
-+: clear
-+s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
-+t end
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-+: end
-+EOF
-+# If some macros were called several times there might be several times
-+# the same #defines, which is useless. Nevertheless, we may not want to
-+# sort them, since we want the *last* AC-DEFINE to be honored.
-+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-+rm -f confdef2sed.sed
-
- # This sed command replaces #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >> conftest.vals <<\EOF
--s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-+cat >>conftest.undefs <<\EOF
-+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
- EOF
-
--# Break up conftest.vals because some shells have a limit on
--# the size of here documents, and old seds have small limits too.
--
-+# Break up conftest.defines because some shells have a limit on the size
-+# of here documents, and old seds have small limits too (100 cmds).
-+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-+echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-+echo ' :' >>$CONFIG_STATUS
-+rm -f conftest.tail
-+while grep . conftest.defines >/dev/null
-+do
-+ # Write a limited-size here document to $tmp/defines.sed.
-+ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-+ # Speed up: don't consider the non `#define' lines.
-+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-+ # Work around the forget-to-reset-the-flag bug.
-+ echo 't clr' >>$CONFIG_STATUS
-+ echo ': clr' >>$CONFIG_STATUS
-+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+ echo 'CEOF
-+ sed -f $tmp/defines.sed $tmp/in >$tmp/out
-+ rm -f $tmp/in
-+ mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ rm -f conftest.defines
-+ mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines
-+echo ' fi # egrep' >>$CONFIG_STATUS
-+echo >>$CONFIG_STATUS
-+
-+# Break up conftest.undefs because some shells have a limit on the size
-+# of here documents, and old seds have small limits too (100 cmds).
-+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
- rm -f conftest.tail
--while :
-+while grep . conftest.undefs >/dev/null
- do
-- ac_lines=`grep -c . conftest.vals`
-- # grep -c gives empty output for an empty file on some AIX systems.
-- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-- # Write a limited-size here document to conftest.frag.
-- echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-+ # Write a limited-size here document to $tmp/undefs.sed.
-+ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-+ # Speed up: don't consider the non `#undef'
-+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-+ # Work around the forget-to-reset-the-flag bug.
-+ echo 't clr' >>$CONFIG_STATUS
-+ echo ': clr' >>$CONFIG_STATUS
-+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
-- sed -f conftest.frag conftest.in > conftest.out
-- rm -f conftest.in
-- mv conftest.out conftest.in
--' >> $CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-- rm -f conftest.vals
-- mv conftest.tail conftest.vals
--done
--rm -f conftest.vals
--
--cat >> $CONFIG_STATUS <<\EOF
-- rm -f conftest.frag conftest.h
-- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
-- cat conftest.in >> conftest.h
-- rm -f conftest.in
-- if cmp -s $ac_file conftest.h 2>/dev/null; then
-- echo "$ac_file is unchanged"
-- rm -f conftest.h
-+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-+ rm -f $tmp/in
-+ mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-+ rm -f conftest.undefs
-+ mv conftest.tail conftest.undefs
-+done
-+rm -f conftest.undefs
-+
-+cat >>$CONFIG_STATUS <<\EOF
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated automatically by config.status. */
-+ if test x"$ac_file" = x-; then
-+ echo "/* Generated automatically by configure. */" >$tmp/config.h
- else
-- # Remove last slash and all that follows it. Not all systems have dirname.
-- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-- # The file is in a subdirectory.
-- test ! -d "$ac_dir" && mkdir "$ac_dir"
-- fi
-- rm -f $ac_file
-- mv conftest.h $ac_file
-+ echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h
- fi
--fi; done
-+ cat $tmp/in >>$tmp/config.h
-+ rm -f $tmp/in
-+ if test x"$ac_file" != x-; then
-+ if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-+ { echo "$as_me:8420: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-+ else
-+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+ { case "$ac_dir" in
-+ [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-+ *) as_incr_dir=.;;
-+esac
-+as_dummy="$ac_dir"
-+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-+ case $as_mkdir_dir in
-+ # Skip DOS drivespec
-+ ?:) as_incr_dir=$as_mkdir_dir ;;
-+ *)
-+ as_incr_dir=$as_incr_dir/$as_mkdir_dir
-+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-+ ;;
-+ esac
-+done; }
-
--EOF
--cat >> $CONFIG_STATUS <<EOF
--am_indx=1
--for am_file in config.h src/options.h; do
-- case " \$CONFIG_HEADERS " in
-- *" \$am_file "*)
-- am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
-- if test -n "\$am_dir"; then
-- am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
-- for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
-- am_tmpdir=\$am_tmpdir\$am_subdir/
-- if test ! -d \$am_tmpdir; then
-- mkdir \$am_tmpdir
-- fi
-- done
-+ fi
-+ rm -f $ac_file
-+ mv $tmp/config.h $ac_file
- fi
-- echo timestamp > "\$am_dir"stamp-h\$am_indx
-- ;;
-+ else
-+ cat $tmp/config.h
-+ rm -f $tmp/config.h
-+ fi
-+ # Run the commands associated with the file.
-+ case $ac_file in
-+ config.h ) # update the timestamp
-+echo timestamp >"./stamp-h1"
-+ ;;
-+ src/options.h ) # update the timestamp
-+echo timestamp >"src/stamp-h2"
-+ ;;
- esac
-- am_indx=\`expr \$am_indx + 1\`
- done
--AMDEP="$AMDEP"
--ac_aux_dir="$ac_aux_dir"
--
- EOF
--cat >> $CONFIG_STATUS <<\EOF
--
-+cat >>$CONFIG_STATUS <<\EOF
-
--test x"$AMDEP" != x"" ||
-+#
-+# CONFIG_COMMANDS section.
-+#
-+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+
-+ case $ac_dest in
-+ default-1 )
-+test x"$AMDEP_TRUE" != x"" ||
- for mf in $CONFIG_FILES; do
- case "$mf" in
- Makefile) dirpart=.;;
-@@ -5681,8 +8515,8 @@
- echo '# dummy' > "$dirpart/$file"
- done
- done
--
--chmod -f +x \
-+ ;;
-+ default ) chmod -f +x \
- contrib/clmerge \
- contrib/cln_hist \
- contrib/commit_prep \
-@@ -5692,10 +8526,33 @@
- contrib/mfpipe \
- contrib/rcslock \
- contrib/sccs2rcs \
-- src/cvsbug
--exit 0
-+ src/cvsbug ;;
-+ esac
-+done
-+EOF
-+
-+cat >>$CONFIG_STATUS <<\EOF
-+
-+{ (exit 0); exit 0; }
- EOF
- chmod +x $CONFIG_STATUS
--rm -fr confdefs* $ac_clean_files
--test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+ac_clean_files=$ac_clean_files_save
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded. So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status. When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+ ac_cs_success=:
-+ exec 5>/dev/null
-+ $SHELL $CONFIG_STATUS || ac_cs_success=false
-+ exec 5>>config.log
-+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+ # would make configure fail if this is the last instruction.
-+ $ac_cs_success || { (exit 1); exit 1; }
-+fi
-
-diff -uNr cvs-1.11.1p1/contrib/Makefile.in cvs-1.11.1p1/contrib/Makefile.in
---- cvs-1.11.1p1/contrib/Makefile.in Fri Apr 27 16:02:44 2001
-+++ cvs-1.11.1p1/contrib/Makefile.in Tue Feb 19 10:52:44 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -39,7 +39,6 @@
- #
- # CONTRIB_FILES = README intro.doc cvscheck.man
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -60,11 +59,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -78,7 +75,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -90,25 +86,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -163,8 +156,6 @@
- CLEANFILES = $(bin_SCRIPTS) $(contrib_SCRIPTS)
-
- SUFFIXES = .sh
--EXEEXT =
--OBJEXT = o
- subdir = contrib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -182,11 +173,9 @@
-
- .SUFFIXES:
- .SUFFIXES: .sh
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -230,6 +219,7 @@
- echo " rm -f $(DESTDIR)$(contribdir)/$$f"; \
- rm -f $(DESTDIR)$(contribdir)/$$f; \
- done
-+uninstall-info-am:
- install-contribDATA: $(contrib_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(contribdir)
-@@ -258,7 +248,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -284,24 +278,21 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-generic mostlyclean-am
-@@ -310,11 +301,11 @@
-
- distclean-am: clean-am distclean-generic
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -323,7 +314,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -338,23 +329,24 @@
- mostlyclean-am: mostlyclean-generic
-
- uninstall-am: uninstall-contribDATA uninstall-contribSCRIPTS \
-- uninstall-local
-+ uninstall-info-am uninstall-local
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-contribDATA install-contribSCRIPTS \
- install-data install-data-am install-data-local install-exec \
-- install-exec-am install-info install-man install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- uninstall uninstall-am uninstall-contribDATA \
-- uninstall-contribSCRIPTS uninstall-local
-+ install-exec-am install-info install-info-am install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic uninstall uninstall-am \
-+ uninstall-contribDATA uninstall-contribSCRIPTS \
-+ uninstall-info-am uninstall-local
-
-
- # we'd rather have a link here rather than two copies of a script
- install-data-local:
-- # FIXME - this path should be determined dynamically from bindir
-- # & contribdir
-+ : FIXME - this path should be determined dynamically from bindir
-+ : and contribdir
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_LINKS)'; for p in $$list; do \
-@@ -385,7 +377,6 @@
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/diff/Makefile.in cvs-1.11.1p1/diff/Makefile.in
---- cvs-1.11.1p1/diff/Makefile.in Fri Apr 27 16:02:22 2001
-+++ cvs-1.11.1p1/diff/Makefile.in Tue Feb 19 10:52:44 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -13,7 +13,6 @@
-
- @SET_MAKE@
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -34,11 +33,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -52,7 +49,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -64,25 +60,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -96,8 +89,6 @@
-
-
- EXTRA_DIST = ChangeLog build_diff.com diagmeet.note libdiff.dsp
--EXEEXT =
--OBJEXT = o
- subdir = diff
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -111,19 +102,12 @@
- normal.$(OBJEXT) ifdef.$(OBJEXT) util.$(OBJEXT) dir.$(OBJEXT) \
- version.$(OBJEXT) side.$(OBJEXT)
- libdiff_a_OBJECTS = $(am_libdiff_a_OBJECTS)
--AR = ar
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CFLAGS = @CFLAGS@
--CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src
- DEFS = @DEFS@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--DIST_SOURCES = $(libdiff_a_SOURCES)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/analyze.Po $(DEPDIR)/cmpbuf.Po \
- @AMDEP_TRUE@ $(DEPDIR)/context.Po $(DEPDIR)/diff.Po \
-@@ -131,28 +115,32 @@
- @AMDEP_TRUE@ $(DEPDIR)/ifdef.Po $(DEPDIR)/io.Po \
- @AMDEP_TRUE@ $(DEPDIR)/normal.Po $(DEPDIR)/side.Po \
- @AMDEP_TRUE@ $(DEPDIR)/util.Po $(DEPDIR)/version.Po
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CFLAGS = @CFLAGS@
-+DIST_SOURCES = $(libdiff_a_SOURCES)
- DIST_COMMON = ChangeLog Makefile.am Makefile.in
- SOURCES = $(libdiff_a_SOURCES)
--OBJECTS = $(am_libdiff_a_OBJECTS)
-
- all: all-am
-
- .SUFFIXES:
- .SUFFIXES: .c .o .obj
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu diff/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-
-+AR = ar
-+
- clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
--
--libdiff.a: $(libdiff_a_OBJECTS) $(libdiff_a_DEPENDENCIES)
-+libdiff.a: $(libdiff_a_OBJECTS) $(libdiff_a_DEPENDENCIES)
- -rm -f libdiff.a
- $(libdiff_a_AR) libdiff.a $(libdiff_a_OBJECTS) $(libdiff_a_LIBADD)
- $(RANLIB) libdiff.a
-@@ -163,6 +151,37 @@
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/analyze.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cmpbuf.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/context.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff3.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dir.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ed.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ifdef.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/io.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/normal.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/side.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/version.Po@am__quote@
-+
-+distclean-depend:
-+ -rm -rf $(DEPDIR)
-+
-+.c.o:
-+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
-+
-+.c.obj:
-+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(COMPILE) -c `cygpath -w $<`
-+CCDEPMODE = @CCDEPMODE@
-+uninstall-info-am:
-+
- tags: TAGS
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -179,53 +198,21 @@
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-- unique=`for i in $$list @CONFIG@; do \
-+ unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-- || $(ETAGS) $(ETAGS_ARGS) $$tags $$unique $(LISP)
-+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
-
- GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
-- && gtags -i $$here
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
-- -rm -f TAGS ID
--
--@_am_include@ @_am_quote@$(DEPDIR)/analyze.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/cmpbuf.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/context.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/diff.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/diff3.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/dir.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/ed.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/ifdef.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/io.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/normal.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/side.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/util.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/version.Po@_am_quote@
--
--distclean-depend:
-- -rm -rf $(DEPDIR)
--
--CCDEPMODE = @CCDEPMODE@
--
--.c.o:
-- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
--
--.c.obj:
-- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(COMPILE) -c -o $@ `cygpath -w $<`
--
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-@@ -234,7 +221,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -259,23 +250,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-@@ -285,11 +273,11 @@
- distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -297,7 +285,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -311,16 +299,18 @@
-
- mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
--.PHONY: all all-am check check-am clean clean-generic \
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
-- install-man install-strip installcheck installcheck-am \
-- installdirs maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-compile mostlyclean-generic tags \
-- uninstall uninstall-am
--
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic tags uninstall uninstall-am \
-+ uninstall-info-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -uNr cvs-1.11.1p1/doc/Makefile.in cvs-1.11.1p1/doc/Makefile.in
---- cvs-1.11.1p1/doc/Makefile.in Fri Apr 27 16:02:33 2001
-+++ cvs-1.11.1p1/doc/Makefile.in Tue Feb 19 10:52:45 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -38,7 +38,6 @@
- # (see the CVSvn.texi target below) now, but fixing the two info_TEXINFOS
- # targets below is probably going to require work on Automake
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -59,11 +58,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -77,7 +74,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -89,25 +85,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -159,8 +152,6 @@
-
-
- SUFFIXES = .aux .txt .pdf
--EXEEXT =
--OBJEXT = o
- subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -180,11 +171,9 @@
-
- .SUFFIXES:
- .SUFFIXES: .aux .txt .pdf .dvi .info .ps .texi .texinfo .txi
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -199,38 +188,47 @@
- .texi.info:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
-- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+ `echo $< | sed 's,.*/,,'`
-
- .texi.dvi:
- TEXINPUTS=$(srcdir):$$TEXINPUTS \
-- MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-+ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-+ $(TEXI2DVI) $<
-
- .texi:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
-- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+ `echo $< | sed 's,.*/,,'`
-
- .texinfo.info:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
-- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+ `echo $< | sed 's,.*/,,'`
-
- .texinfo.dvi:
- TEXINPUTS=$(srcdir):$$TEXINPUTS \
-- MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-+ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-+ $(TEXI2DVI) $<
-
- .texinfo:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- cd $(srcdir) \
-- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
-+ `echo $< | sed 's,.*/,,'`
-
-+MAKEINFO = @MAKEINFO@
-+TEXI2DVI = texi2dvi
- DVIPS = dvips
- .dvi.ps:
- $(DVIPS) $< -o $@
-
- uninstall-info-am:
- $(PRE_UNINSTALL)
-- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+ @if (install-info --version && \
-+ install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
- for file in $$list; do \
- echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
-@@ -282,7 +280,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -311,11 +313,10 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-@@ -323,13 +324,11 @@
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- clean: clean-am
-
-@@ -367,7 +366,8 @@
- done; \
- done
- @$(POST_INSTALL)
-- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+ @if (install-info --version && \
-+ install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
- for file in $$list; do \
- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-@@ -389,8 +389,6 @@
-
- uninstall-am: uninstall-info-am
-
--uninstall-info: uninstall-info-am
--
- .PHONY: all all-am check check-am clean clean-generic dist-info \
- distclean distclean-generic distdir dvi dvi-am info info-am \
- install install-am install-data install-data-am install-exec \
-@@ -475,7 +473,7 @@
- # - They should be disabled on systems without the bug and in environments
- # where $(srcdir) = $(builddir)
- @MAKE_TARGETS_IN_VPATH_FALSE@CVSvn.texi: $(srcdir)/CVSvn.texi
--@MAKE_TARGETS_IN_VPATH_FALSE@ # use cat so the time stamp gets set properly
-+@MAKE_TARGETS_IN_VPATH_FALSE@ : use cat so the time stamp gets set properly
- @MAKE_TARGETS_IN_VPATH_FALSE@ cat $(srcdir)/CVSvn.texi >$@
- @MAKE_TARGETS_IN_VPATH_FALSE@$(srcdir)/CVSvn.texi: $(srcdir)/CVSvn.texi.in $(top_srcdir)/configure.in
- @MAKE_TARGETS_IN_VPATH_FALSE@ sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/CVSvn.texi.in >$(srcdir)/CVSvn.ttexi
-@@ -484,7 +482,6 @@
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/lib/Makefile.in cvs-1.11.1p1/lib/Makefile.in
---- cvs-1.11.1p1/lib/Makefile.in Fri Apr 27 16:02:17 2001
-+++ cvs-1.11.1p1/lib/Makefile.in Tue Feb 19 10:52:45 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -39,7 +39,6 @@
- #
- # $(includeopt) is CVS specific and set by configure
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -60,11 +59,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -78,7 +75,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -90,25 +86,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -159,8 +152,6 @@
- build_lib.com \
- xgssapi.h
-
--EXEEXT =
--OBJEXT = o
- subdir = lib
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -175,19 +166,12 @@
- savecwd.$(OBJEXT) sighandle.$(OBJEXT) stripslash.$(OBJEXT) \
- xgetwd.$(OBJEXT) yesno.$(OBJEXT)
- libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS)
--AR = ar
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CFLAGS = @CFLAGS@
--CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src
- DEFS = @DEFS@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--DIST_SOURCES = $(libcvs_a_SOURCES)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/argmatch.Po $(DEPDIR)/dup2.Po \
- @AMDEP_TRUE@ $(DEPDIR)/fncase.Po $(DEPDIR)/fnmatch.Po \
-@@ -202,36 +186,89 @@
- @AMDEP_TRUE@ $(DEPDIR)/strtoul.Po $(DEPDIR)/valloc.Po \
- @AMDEP_TRUE@ $(DEPDIR)/waitpid.Po $(DEPDIR)/xgetwd.Po \
- @AMDEP_TRUE@ $(DEPDIR)/yesno.Po
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CFLAGS = @CFLAGS@
-+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-+DIST_SOURCES = $(libcvs_a_SOURCES)
- DIST_COMMON = ChangeLog Makefile.am Makefile.in dup2.c fncase.c \
- fnmatch.c getdate.c hostname.c memmove.c mkdir.c rename.c \
- strerror.c strstr.c strtoul.c valloc.c waitpid.c
- SOURCES = $(libcvs_a_SOURCES)
--OBJECTS = $(am_libcvs_a_OBJECTS)
-
- all: all-am
-
- .SUFFIXES:
- .SUFFIXES: .c .o .obj .y
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu lib/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-
-+AR = ar
-+
- clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
--
--libcvs.a: $(libcvs_a_OBJECTS) $(libcvs_a_DEPENDENCIES)
-+libcvs.a: $(libcvs_a_OBJECTS) $(libcvs_a_DEPENDENCIES)
- -rm -f libcvs.a
- $(libcvs_a_AR) libcvs.a $(libcvs_a_OBJECTS) $(libcvs_a_LIBADD)
- $(RANLIB) libcvs.a
-
-+mostlyclean-compile:
-+ -rm -f *.$(OBJEXT) core *.core
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/argmatch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fncase.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getline.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hostname.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rename.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/savecwd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sighandle.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stripslash.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/valloc.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/waitpid.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xgetwd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yesno.Po@am__quote@
-+
-+distclean-depend:
-+ -rm -rf $(DEPDIR)
-+
-+.c.o:
-+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
-+
-+.c.obj:
-+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(COMPILE) -c `cygpath -w $<`
-+CCDEPMODE = @CCDEPMODE@
-+
- .y.c:
-- $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
-+ $(YACCCOMPILE) $< && mv y.tab.c $@
- if test -f y.tab.h; then \
- if cmp -s y.tab.h $*.h; then \
- rm -f y.tab.h; \
-@@ -239,13 +276,7 @@
- mv y.tab.h $*.h; \
- fi; \
- fi
--
--
--mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
--
--distclean-compile:
-- -rm -f *.tab.c
-+uninstall-info-am:
-
- tags: TAGS
-
-@@ -263,65 +294,21 @@
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-- unique=`for i in $$list @CONFIG@; do \
-+ unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-- || $(ETAGS) $(ETAGS_ARGS) $$tags $$unique $(LISP)
-+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
-
- GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
-- && gtags -i $$here
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
-- -rm -f TAGS ID
--
--@_am_include@ @_am_quote@$(DEPDIR)/argmatch.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/dup2.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/fncase.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/fnmatch.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/ftruncate.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/getdate.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/getline.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/getopt.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/getopt1.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/hostname.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/md5.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/memmove.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/mkdir.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/regex.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/rename.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/savecwd.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/sighandle.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/strerror.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/stripslash.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/strstr.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/strtoul.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/valloc.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/waitpid.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/xgetwd.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/yesno.Po@_am_quote@
--
--distclean-depend:
-- -rm -rf $(DEPDIR)
--
--CCDEPMODE = @CCDEPMODE@
--
--.c.o:
-- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
--
--.c.obj:
-- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(COMPILE) -c -o $@ `cygpath -w $<`
--
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-@@ -330,7 +317,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -355,24 +346,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
-- -test -z "getdate.c" || rm -f getdate.c
- clean: clean-am
-
- clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-@@ -382,11 +369,11 @@
- distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -394,7 +381,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -408,21 +395,23 @@
-
- mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
--.PHONY: all all-am check check-am clean clean-generic \
-+uninstall-am: uninstall-info-am
-+
-+.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
-- install-man install-strip installcheck installcheck-am \
-- installdirs maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-compile mostlyclean-generic tags \
-- uninstall uninstall-am
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic tags uninstall uninstall-am \
-+ uninstall-info-am
-
-
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/man/Makefile.in cvs-1.11.1p1/man/Makefile.in
---- cvs-1.11.1p1/man/Makefile.in Fri Apr 27 16:02:30 2001
-+++ cvs-1.11.1p1/man/Makefile.in Tue Feb 19 10:52:45 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -26,7 +26,6 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -47,11 +46,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -65,7 +62,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -77,25 +73,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -104,8 +97,6 @@
- .cvsignore \
- $(man_MANS)
-
--EXEEXT =
--OBJEXT = o
- subdir = man
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -118,22 +109,22 @@
- all: all-am
-
- .SUFFIXES:
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu man/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-+uninstall-info-am:
-
- man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-- @list='$(man1_MANS)'; \
-- l2='$(man_MANS)'; for i in $$l2; do \
-+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
-@@ -148,11 +139,11 @@
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
- done
--
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-- @list='$(man1_MANS)'; \
-- l2='$(man_MANS)'; for i in $$l2; do \
-+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
-@@ -170,8 +161,9 @@
- install-man5: $(man5_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(man5dir)
-- @list='$(man5_MANS)'; \
-- l2='$(man_MANS)'; for i in $$l2; do \
-+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
- case "$$i" in \
- *.5*) list="$$list $$i" ;; \
- esac; \
-@@ -186,11 +178,11 @@
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \
- done
--
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS)'; \
-- l2='$(man_MANS)'; for i in $$l2; do \
-+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
- case "$$i" in \
- *.5*) list="$$list $$i" ;; \
- esac; \
-@@ -208,8 +200,9 @@
- install-man8: $(man8_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(man8dir)
-- @list='$(man8_MANS)'; \
-- l2='$(man_MANS)'; for i in $$l2; do \
-+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
- case "$$i" in \
- *.8*) list="$$list $$i" ;; \
- esac; \
-@@ -224,11 +217,11 @@
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
- done
--
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS)'; \
-- l2='$(man_MANS)'; for i in $$l2; do \
-+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
- case "$$i" in \
- *.8*) list="$$list $$i" ;; \
- esac; \
-@@ -252,7 +245,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -278,23 +275,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-generic mostlyclean-am
-@@ -303,11 +297,11 @@
-
- distclean-am: clean-am distclean-generic
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -315,7 +309,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man: install-man1 install-man5 install-man8
-
-@@ -329,25 +323,24 @@
-
- mostlyclean-am: mostlyclean-generic
-
--uninstall-am: uninstall-man
-+uninstall-am: uninstall-info-am uninstall-man
-
- uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-man install-man1 \
-- install-man5 install-man8 install-strip installcheck \
-- installcheck-am installdirs maintainer-clean \
-+ install-exec-am install-info install-info-am install-man \
-+ install-man1 install-man5 install-man8 install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- uninstall uninstall-am uninstall-man uninstall-man1 \
-- uninstall-man5 uninstall-man8
-+ uninstall uninstall-am uninstall-info-am uninstall-man \
-+ uninstall-man1 uninstall-man5 uninstall-man8
-
-
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/src/Makefile.in cvs-1.11.1p1/src/Makefile.in
---- cvs-1.11.1p1/src/Makefile.in Fri Apr 27 16:02:25 2001
-+++ cvs-1.11.1p1/src/Makefile.in Tue Feb 19 10:52:45 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -45,11 +45,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -63,7 +61,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -75,25 +72,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -104,7 +98,7 @@
- # some namespace hackery going on that maybe shouldn't be. Long term fix is to
- # try and remove naming ocnflicts and fix Automake to allow particular includes
- # to be attached only to particular object files. Short term fix is either or.
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
-
- bin_PROGRAMS = cvs
- bin_SCRIPTS = cvsbug
-@@ -180,7 +174,7 @@
- cvs_LDADD = \
- ../diff/libdiff.a \
- ../lib/libcvs.a \
-- ../zlib/libz.a \
-+ -lz \
- version.o
-
- cvs_EXTRA_DIST = version.c
-@@ -202,8 +196,6 @@
- version.c \
- version.c.in
-
--EXEEXT =
--OBJEXT = o
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h options.h
-@@ -229,23 +221,16 @@
- update.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
- wrapper.$(OBJEXT) zlib.$(OBJEXT)
- cvs_OBJECTS = $(am_cvs_OBJECTS)
--cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a \
-- version.o
-+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a version.o
- cvs_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
-
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CFLAGS = @CFLAGS@
--CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I.
- DEFS = @DEFS@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I.
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--DIST_SOURCES = $(cvs_SOURCES)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/add.Po $(DEPDIR)/admin.Po \
- @AMDEP_TRUE@ $(DEPDIR)/annotate.Po $(DEPDIR)/buffer.Po \
-@@ -274,26 +259,28 @@
- @AMDEP_TRUE@ $(DEPDIR)/update.Po $(DEPDIR)/vers_ts.Po \
- @AMDEP_TRUE@ $(DEPDIR)/watch.Po $(DEPDIR)/wrapper.Po \
- @AMDEP_TRUE@ $(DEPDIR)/zlib.Po
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CFLAGS = @CFLAGS@
-+DIST_SOURCES = $(cvs_SOURCES)
- DIST_COMMON = ./stamp-h2.in ChangeLog Makefile.am Makefile.in cvsbug.in \
- options.h.in
- SOURCES = $(cvs_SOURCES)
--OBJECTS = $(am_cvs_OBJECTS)
-
- all: options.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
- .SUFFIXES:
- .SUFFIXES: .c .o .obj
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
--
- options.h: stamp-h2
- @if test ! -f $@; then \
- rm -f stamp-h2; \
-@@ -325,8 +312,10 @@
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
-- if test -f $$p; then \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ if test -f $$p \
-+ ; then \
-+ f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
- else :; fi; \
-@@ -342,8 +331,7 @@
-
- clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
--
--cvs$(EXEEXT): $(cvs_OBJECTS) $(cvs_DEPENDENCIES)
-+cvs$(EXEEXT): $(cvs_OBJECTS) $(cvs_DEPENDENCIES)
- @rm -f cvs$(EXEEXT)
- $(LINK) $(cvs_LDFLAGS) $(cvs_OBJECTS) $(cvs_LDADD) $(LIBS)
- install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -374,6 +362,77 @@
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/add.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/admin.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/annotate.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/buffer.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/checkin.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/checkout.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/classify.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/commit.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/create_adm.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cvsrc.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/edit.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/entries.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/expand_path.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fileattr.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filesubr.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/find_names.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hardlink.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/history.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ignore.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/import.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lock.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/log.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/login.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logmsg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkmodules.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/modules.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/myndbm.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/no_diff.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/parseinfo.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/patch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rcs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rcscmds.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/recurse.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/release.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/remove.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/repos.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/root.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/run.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/scramble.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/server.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/status.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/subr.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tag.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/update.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vers_ts.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/watch.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrapper.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/zlib.Po@am__quote@
-+
-+distclean-depend:
-+ -rm -rf $(DEPDIR)
-+
-+.c.o:
-+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
-+
-+.c.obj:
-+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ $(COMPILE) -c `cygpath -w $<`
-+CCDEPMODE = @CCDEPMODE@
-+uninstall-info-am:
-+
- tags: TAGS
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -390,93 +449,21 @@
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-- unique=`for i in $$list @CONFIG@; do \
-+ unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)options.h.in$$unique$(LISP)$$tags" \
-- || $(ETAGS) $(ETAGS_ARGS) $$tags options.h.in $$unique $(LISP)
-+ || etags $(ETAGS_ARGS) $$tags options.h.in $$unique $(LISP)
-
- GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
-- && gtags -i $$here
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
-- -rm -f TAGS ID
--
--@_am_include@ @_am_quote@$(DEPDIR)/add.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/admin.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/annotate.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/buffer.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/checkin.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/checkout.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/classify.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/client.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/commit.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/create_adm.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/cvsrc.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/diff.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/edit.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/entries.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/error.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/expand_path.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/fileattr.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/filesubr.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/find_names.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/hardlink.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/hash.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/history.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/ignore.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/import.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/lock.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/log.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/login.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/logmsg.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/main.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/mkmodules.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/modules.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/myndbm.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/no_diff.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/parseinfo.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/patch.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/rcs.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/rcscmds.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/recurse.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/release.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/remove.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/repos.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/root.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/run.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/scramble.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/server.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/status.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/subr.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/tag.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/update.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/vers_ts.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/watch.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/wrapper.Po@_am_quote@
--@_am_include@ @_am_quote@$(DEPDIR)/zlib.Po@_am_quote@
--
--distclean-depend:
-- -rm -rf $(DEPDIR)
--
--CCDEPMODE = @CCDEPMODE@
--
--.c.o:
-- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
--
--.c.obj:
-- source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(COMPILE) -c -o $@ `cygpath -w $<`
--
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-@@ -485,7 +472,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -512,24 +503,21 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-@@ -539,11 +527,11 @@
- distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-hdr distclean-tags
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -551,7 +539,7 @@
-
- install-exec-am: install-binPROGRAMS install-binSCRIPTS
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -565,18 +553,20 @@
-
- mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
--uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
-+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-+ uninstall-info-am
-
--.PHONY: all all-am check check-am check-local clean clean-binPROGRAMS \
-- clean-generic distclean distclean-compile distclean-depend \
-- distclean-generic distclean-hdr distclean-tags distdir dvi \
-- dvi-am info info-am install install-am install-binPROGRAMS \
-- install-binSCRIPTS install-data install-data-am install-exec \
-- install-exec-am install-info install-man install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-+.PHONY: GTAGS all all-am check check-am check-local clean \
-+ clean-binPROGRAMS clean-generic distclean distclean-compile \
-+ distclean-depend distclean-generic distclean-hdr distclean-tags \
-+ distdir dvi dvi-am info info-am install install-am \
-+ install-binPROGRAMS install-binSCRIPTS install-data \
-+ install-data-am install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
-- uninstall-binPROGRAMS uninstall-binSCRIPTS
-+ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am
-
-
- check-local:
-@@ -603,7 +593,6 @@
- # for backwards compatibility with the old makefiles
- .PHONY: realclean
- realclean: maintainer-clean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/tools/Makefile.in cvs-1.11.1p1/tools/Makefile.in
---- cvs-1.11.1p1/tools/Makefile.in Fri Apr 27 16:02:46 2001
-+++ cvs-1.11.1p1/tools/Makefile.in Tue Feb 19 10:52:45 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -27,7 +27,6 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -48,11 +47,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -66,7 +63,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -78,33 +74,28 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
- EXTRA_DIST = \
- README .cvsignore
-
--EXEEXT =
--OBJEXT = o
- subdir = tools
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -114,15 +105,14 @@
- all: all-am
-
- .SUFFIXES:
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tools/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-+uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -134,7 +124,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -159,23 +153,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-generic mostlyclean-am
-@@ -184,11 +175,11 @@
-
- distclean-am: clean-am distclean-generic
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -196,7 +187,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -210,19 +201,20 @@
-
- mostlyclean-am: mostlyclean-generic
-
-+uninstall-am: uninstall-info-am
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-man install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- uninstall uninstall-am
-+ install-exec-am install-info install-info-am install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic uninstall uninstall-am uninstall-info-am
-
-
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/vms/Makefile.in cvs-1.11.1p1/vms/Makefile.in
---- cvs-1.11.1p1/vms/Makefile.in Fri Apr 27 16:02:54 2001
-+++ cvs-1.11.1p1/vms/Makefile.in Tue Feb 19 10:52:45 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -30,7 +30,6 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -51,11 +50,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -69,7 +66,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -81,25 +77,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -140,8 +133,6 @@
- vmsmunch_private.h \
- waitpid.c
-
--EXEEXT =
--OBJEXT = o
- subdir = vms
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -151,15 +142,14 @@
- all: all-am
-
- .SUFFIXES:
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu vms/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-+uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -171,7 +161,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -196,23 +190,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-generic mostlyclean-am
-@@ -221,11 +212,11 @@
-
- distclean-am: clean-am distclean-generic
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -233,7 +224,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -247,19 +238,20 @@
-
- mostlyclean-am: mostlyclean-generic
-
-+uninstall-am: uninstall-info-am
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-man install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- uninstall uninstall-am
-+ install-exec-am install-info install-info-am install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic uninstall uninstall-am uninstall-info-am
-
-
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/windows-NT/Makefile.in cvs-1.11.1p1/windows-NT/Makefile.in
---- cvs-1.11.1p1/windows-NT/Makefile.in Fri Apr 27 16:02:48 2001
-+++ cvs-1.11.1p1/windows-NT/Makefile.in Tue Feb 19 10:52:46 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -30,7 +30,6 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -51,11 +50,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ..
-
- ACLOCAL = @ACLOCAL@
-@@ -69,7 +66,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -81,25 +77,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -124,15 +117,14 @@
-
-
- SUBDIRS = SCC
--EXEEXT =
--OBJEXT = o
- subdir = windows-NT
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
-
--RECURSIVE_TARGETS = all-recursive install-data-recursive \
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+ uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README ChangeLog Makefile.am Makefile.in
-@@ -140,15 +132,14 @@
- all: all-recursive
-
- .SUFFIXES:
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu windows-NT/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-+uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -222,25 +213,25 @@
- here=`pwd`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
-- test -f $$subdir/TAGS && tags="$$tags $(ETAGS_INCLUDE_OPTION)$$here/$$subdir/TAGS"; \
-+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
-- unique=`for i in $$list @CONFIG@; do \
-+ unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-- || $(ETAGS) $(ETAGS_ARGS) $$tags $$unique $(LISP)
-+ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
-
- GTAGS:
- here=`CDPATH=: && cd $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
-- && gtags -i $$here
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
-- -rm -f TAGS ID
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-@@ -249,7 +240,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -275,7 +270,6 @@
- check-am: all-am
- check: check-recursive
- all-am: Makefile
--
- installdirs: installdirs-recursive
- installdirs-am:
-
-@@ -288,23 +282,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-recursive
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-recursive
-
- clean-am: clean-generic mostlyclean-am
-@@ -313,11 +304,11 @@
-
- distclean-am: clean-am distclean-generic distclean-tags
-
--dvi:
-+dvi: dvi-recursive
-
- dvi-am:
-
--info:
-+info: info-recursive
-
- info-am:
-
-@@ -325,7 +316,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-recursive
-
- install-man:
-
-@@ -339,24 +330,29 @@
-
- mostlyclean-am: mostlyclean-generic
-
--.PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
-- distclean-recursive distclean-tags distdir dvi dvi-am info \
-- info-am install install-am install-data install-data-am \
-- install-data-recursive install-exec install-exec-am \
-- install-exec-recursive install-info install-man \
-+ distclean-recursive distclean-tags distdir dvi dvi-am \
-+ dvi-recursive info info-am info-recursive install install-am \
-+ install-data install-data-am install-data-recursive \
-+ install-exec install-exec-am install-exec-recursive \
-+ install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
-- uninstall-am uninstall-recursive
-+ uninstall-am uninstall-info-am uninstall-info-recursive \
-+ uninstall-recursive
-
-
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -uNr cvs-1.11.1p1/windows-NT/SCC/Makefile.in cvs-1.11.1p1/windows-NT/SCC/Makefile.in
---- cvs-1.11.1p1/windows-NT/SCC/Makefile.in Fri Apr 27 16:02:50 2001
-+++ cvs-1.11.1p1/windows-NT/SCC/Makefile.in Tue Feb 19 10:52:46 2002
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4e from Makefile.am.
-+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -30,7 +30,6 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
--
- SHELL = @SHELL@
-
- srcdir = @srcdir@
-@@ -51,11 +50,9 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--
- top_builddir = ../..
-
- ACLOCAL = @ACLOCAL@
-@@ -69,7 +66,6 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = @program_transform_name@
--
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
-@@ -81,25 +77,22 @@
- CC = @CC@
- CSH = @CSH@
- DEPDIR = @DEPDIR@
--ETAGS = @ETAGS@
--ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@
-+EXEEXT = @EXEEXT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
- KRB4 = @KRB4@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- PR = @PR@
- PS2PDF = @PS2PDF@
- RANLIB = @RANLIB@
- ROFF = @ROFF@
--STRIP = @STRIP@
- TEXI2DVI = @TEXI2DVI@
- VERSION = @VERSION@
- YACC = @YACC@
--_am_include = @_am_include@
--_am_quote = @_am_quote@
-+am__include = @am__include@
-+am__quote = @am__quote@
- includeopt = @includeopt@
- install_sh = @install_sh@
-
-@@ -112,8 +105,6 @@
- scc.def \
- pubscc.h
-
--EXEEXT =
--OBJEXT = o
- subdir = windows-NT/SCC
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h
-@@ -123,15 +114,14 @@
- all: all-am
-
- .SUFFIXES:
--
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu windows-NT/SCC/Makefile
--
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && \
- CONFIG_HEADERS= CONFIG_LINKS= \
- CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-+uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -143,7 +133,11 @@
-
- distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
-- d=$(srcdir); \
-+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ $(mkinstalldirs) "$(distdir)/$$dir"; \
-+ fi; \
- if test -d $$d/$$file; then \
- cp -pR $$d/$$file $(distdir) \
- || exit 1; \
-@@ -168,23 +162,20 @@
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
--
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-
- distclean-generic:
-- -rm -f Makefile $(CONFIG_CLEAN_FILES)
-- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-- -rm -f Makefile.in
- clean: clean-am
-
- clean-am: clean-generic mostlyclean-am
-@@ -193,11 +184,11 @@
-
- distclean-am: clean-am distclean-generic
-
--dvi:
-+dvi: dvi-am
-
- dvi-am:
-
--info:
-+info: info-am
-
- info-am:
-
-@@ -205,7 +196,7 @@
-
- install-exec-am:
-
--install-info:
-+install-info: install-info-am
-
- install-man:
-
-@@ -219,19 +210,20 @@
-
- mostlyclean-am: mostlyclean-generic
-
-+uninstall-am: uninstall-info-am
-+
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-man install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- uninstall uninstall-am
-+ install-exec-am install-info install-info-am install-man \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic uninstall uninstall-am uninstall-info-am
-
-
- # for backwards compatibility with the old makefiles
- realclean: maintainer-clean
- .PHONY: realclean
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/dev-util/cvs/files/digest-cvs-1.11-r1 b/dev-util/cvs/files/digest-cvs-1.11-r1
deleted file mode 100644
index caf969d7daf3..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd67a990423a0e9fa2fa1c3cf10f4356 cvs-1.11.tar.gz 2343288
diff --git a/dev-util/cvs/files/digest-cvs-1.11.1_p1 b/dev-util/cvs/files/digest-cvs-1.11.1_p1
deleted file mode 100644
index f10f101d8398..000000000000
--- a/dev-util/cvs/files/digest-cvs-1.11.1_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c914923c3847ca914c521559d3747cf cvs-1.11.1p1.tar.gz 2622418