a4263808c4
I like to maintain incremental revisions of system configuration files and find rcs the easiest way to do so. To use rcs in OpenWrt, I created a package, following the OpenWrt package standards: http://cgi.sfu.ca/~jdbates/openwrt/brcm-2.4/packages/rcs_5.7-1_mipsel.ipk A diff against OpenWrt Subversion is inline below. I'd be delighted to be able to contribute this package to OpenWrt. https://dev.openwrt.org/ticket/2370 Signed-off-by: Jack Bates <ms419@freezone.co.uk> git-svn-id: svn://svn.openwrt.org/openwrt/packages@10359 3c298f89-4303-0410-b956-a3cf2f4a3e73
4880 lines
151 KiB
Diff
4880 lines
151 KiB
Diff
--- rcs-5.7.orig/debian/rules
|
|
+++ rcs-5.7/debian/rules
|
|
@@ -0,0 +1,91 @@
|
|
+#!/usr/bin/make -f
|
|
+# Derived from: Sample debian.rules file - for GNU Hello (1.3).
|
|
+# Copyright 1994,1995 by Ian Jackson.
|
|
+# I hereby give you perpetual unlimited permission to copy,
|
|
+# modify and relicense this file, provided that you do not remove
|
|
+# my name from the file itself. (I assert my moral right of
|
|
+# paternity under the Copyright, Designs and Patents Act 1988.)
|
|
+# This file may have to be extensively modified
|
|
+
|
|
+# There used to be `source' and `diff' targets in this file, and many
|
|
+# packages also had `changes' and `dist' targets. These functions
|
|
+# have been taken over by dpkg-source, dpkg-genchanges and
|
|
+# dpkg-buildpackage in a package-independent way, and so these targets
|
|
+# are obsolete.
|
|
+
|
|
+package=rcs
|
|
+
|
|
+CFLAGS = -g
|
|
+
|
|
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
|
+CFLAGS += -O0
|
|
+else
|
|
+CFLAGS += -O2
|
|
+endif
|
|
+
|
|
+# The next section may have to be extensively modified
|
|
+
|
|
+build:
|
|
+ $(checkdir)
|
|
+ ./configure --prefix=/usr --with-diffutils
|
|
+ $(MAKE) CFLAGS="$(CFLAGS)"
|
|
+ groff -t -p -Tps -ms rcs.ms >rcs.ps
|
|
+ touch build
|
|
+
|
|
+clean:
|
|
+ $(checkdir)
|
|
+ -rm -f build
|
|
+ [ ! -f Makefile ] || $(MAKE) -i distclean
|
|
+ -rm -f *.ps man/index.db man/rcsfile.5
|
|
+ -rm -rf debian/tmp debian/*~ debian/files autom4te.cache \
|
|
+ debian/substvars
|
|
+
|
|
+binary-indep: checkroot build
|
|
+ $(checkdir)
|
|
+# There are no architecture-independent files to be uploaded
|
|
+# generated by this package. If there were any they would be
|
|
+# made here.
|
|
+
|
|
+binary-arch: checkroot build
|
|
+ -rm -rf debian/tmp
|
|
+ install -d debian/tmp/DEBIAN
|
|
+ install -d debian/tmp/usr/share/doc/$(package)
|
|
+ $(MAKE) prefix=`pwd`/debian/tmp/usr install
|
|
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
|
|
+ for f in debian/tmp/usr/bin/*; do \
|
|
+ strip -s -R.comment $$f; \
|
|
+ done
|
|
+endif
|
|
+ cp debian/copyright debian/tmp/usr/share/doc/$(package)/
|
|
+ cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
|
|
+ cp ChangeLog debian/tmp/usr/share/doc/$(package)/changelog
|
|
+ gzip -9f debian/tmp/usr/share/doc/$(package)/changelog*
|
|
+ cp *.ps debian/tmp/usr/share/doc/$(package)/
|
|
+ gzip -9f debian/tmp/usr/share/doc/$(package)/*.ps
|
|
+ mv debian/tmp/usr/man debian/tmp/usr/share/man
|
|
+ gzip -9f debian/tmp/usr/share/man/man*/*
|
|
+ (cd debian/tmp; find . -type f ! -regex '.*/DEBIAN/.*' \
|
|
+ -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums)
|
|
+ dpkg-shlibdeps src/rcs
|
|
+ dpkg-gencontrol -isp
|
|
+ chown -R root.root debian/tmp
|
|
+ chmod -R u+w debian/tmp
|
|
+ chmod -R g-ws debian/tmp
|
|
+ dpkg --build debian/tmp ..
|
|
+
|
|
+define checkdir
|
|
+ test -f man/rcs.1
|
|
+endef
|
|
+
|
|
+# Below here is fairly generic really
|
|
+
|
|
+binary: binary-indep binary-arch
|
|
+
|
|
+source diff:
|
|
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
|
|
+
|
|
+checkroot:
|
|
+ $(checkdir)
|
|
+ test root = "`whoami`"
|
|
+
|
|
+.PHONY: binary binary-arch binary-indep clean checkroot
|
|
--- rcs-5.7.orig/debian/control
|
|
+++ rcs-5.7/debian/control
|
|
@@ -0,0 +1,16 @@
|
|
+Source: rcs
|
|
+Section: devel
|
|
+Priority: optional
|
|
+Maintainer: Romain Francoise <rfrancoise@debian.org>
|
|
+Standards-Version: 3.7.2
|
|
+Build-Depends: groff, autoconf
|
|
+
|
|
+Package: rcs
|
|
+Architecture: any
|
|
+Depends: ${shlibs:Depends}
|
|
+Description: The GNU Revision Control System
|
|
+ The Revision Control System (RCS) manages multiple
|
|
+ revisions of files. RCS automates the storing, retrieval,
|
|
+ logging, identification, and merging of revisions. RCS is
|
|
+ useful for text that is revised frequently, for example
|
|
+ programs, documentation, graphics, papers, and form letters.
|
|
--- rcs-5.7.orig/debian/copyright
|
|
+++ rcs-5.7/debian/copyright
|
|
@@ -0,0 +1,28 @@
|
|
+This is Debian GNU/Linux's prepackaged version of the FSF's Revision
|
|
+Control System (RCS) utilities. These utilities allow you to keep
|
|
+multiple revisions of one or more files in a very compact manner. RCS
|
|
+is similar to, and in most respects better than, the non-free Source
|
|
+Code Control System (SCCS).
|
|
+
|
|
+This package was assembled by Sven Rudolph <sr1@inf.tu-dresden.de>
|
|
+from the GNU sources available from prep.ai.mit.edu (and its numerous
|
|
+mirrors) as /pub/gnu/rcs-5.7.tar.gz. It is currently maintained by
|
|
+Romain Francoise <rfrancoise@debian.org>.
|
|
+
|
|
+The upstream URL is: http://www.gnu.org/software/rcs/
|
|
+
|
|
+Copyright (C) 1991,1992,1993 Free Software Foundation, Inc.
|
|
+
|
|
+RCS is free software; you can redistribute it and/or modify
|
|
+it under the terms of the GNU General Public License as published by
|
|
+the Free Software Foundation; either version 2, or (at your option)
|
|
+any later version.
|
|
+
|
|
+RCS is distributed in the hope that it will be useful,
|
|
+but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+GNU General Public License for more details.
|
|
+
|
|
+On Debian GNU/Linux systems, the complete text of the GNU General
|
|
+Public License can be found in `/usr/share/common-licenses/GPL'.
|
|
+
|
|
--- rcs-5.7.orig/debian/changelog
|
|
+++ rcs-5.7/debian/changelog
|
|
@@ -0,0 +1,216 @@
|
|
+rcs (5.7-20) unstable; urgency=low
|
|
+
|
|
+ * debian/control: Add support for DEB_BUILD_OPTIONS (closes: #437885).
|
|
+
|
|
+ -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Aug 2007 21:24:54 +0200
|
|
+
|
|
+rcs (5.7-19) unstable; urgency=low
|
|
+
|
|
+ * debian/control: Bump Standards-Version to 3.7.2, no changes needed.
|
|
+ * debian/copyright: Mention the current upstream URL (closes: #436739).
|
|
+ * debian/rules:
|
|
+ + Don't ignore errors from 'make distclean'.
|
|
+ + Generate DEBIAN/md5sums.
|
|
+ * Apply patch from Brendan O'Dea <bod@debian.org> adding support for
|
|
+ diff's '-U' option to rcsdiff (closes: #428445).
|
|
+
|
|
+ -- Romain Francoise <rfrancoise@debian.org> Sun, 12 Aug 2007 18:40:04 +0200
|
|
+
|
|
+rcs (5.7-18) unstable; urgency=low
|
|
+
|
|
+ * Apply patch from Mark D. Baushke <mdb@gnu.org> adding support for the
|
|
+ new 'commitid' phrase used by newer version of CVS and CVSNT. Note
|
|
+ that this patch does not include support for *generating* the ids at
|
|
+ check in time; it only makes RCS recognize them (closes: #352527).
|
|
+
|
|
+ -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Feb 2006 22:41:33 +0100
|
|
+
|
|
+rcs (5.7-17) unstable; urgency=low
|
|
+
|
|
+ * Apply patch from Aaron S. Hawley making the diff strategy of rcsdiff a
|
|
+ bit more subtle: previously rcsdiff considered any long option as a
|
|
+ case where diff(1) can produce output when the revisions are
|
|
+ identical, when in fact it is only the case if either the
|
|
+ --side-by-side or --ifdef options are used (closes: #334004).
|
|
+
|
|
+ * Patch man/co.1 to not use 'asteriskmath', thanks to LI Daobing
|
|
+ (closes: #345507).
|
|
+
|
|
+ * debian/control: Bump Standards-Version to 3.6.2.2, no changes needed.
|
|
+ * debian/changelog: Change formatting of entries from 1995 and 1996 to
|
|
+ avoid lintian warnings.
|
|
+ * debian/rules: `install' no longer strips .comment sections from
|
|
+ binaries (since version 5.93-1), so revert previous fix and strip these
|
|
+ sections manually.
|
|
+
|
|
+ -- Romain Francoise <rfrancoise@debian.org> Sun, 5 Feb 2006 16:34:21 +0100
|
|
+
|
|
+rcs (5.7-16) unstable; urgency=low
|
|
+
|
|
+ * Tenth anniversary release: RCS 5.7 was released on June 16th, 1995.
|
|
+
|
|
+ * rcs.c: Check delta pointer in scanlogtext() before dereferencing it to
|
|
+ prevent a segmentation fault in some rare cases (discovered while
|
|
+ investigating #69193).
|
|
+
|
|
+ * Ship docs in PostScript format (instead of DVI). Drop the ``Functions
|
|
+ of RCS'' paper since it's quite obsolete nowadays.
|
|
+
|
|
+ * debian/rules: Delete substvars file in clean target.
|
|
+ * debian/changelog: Facelift previous entry.
|
|
+
|
|
+ -- Romain Francoise <rfrancoise@debian.org> Thu, 16 Jun 2005 08:14:01 +0200
|
|
+
|
|
+rcs (5.7-15) unstable; urgency=low
|
|
+
|
|
+ * Adopting this package with Mark's blessing.
|
|
+ * debian/control:
|
|
+ + Bump Standard-Version to 3.6.1.0.
|
|
+ + Update maintainer contact info.
|
|
+ * debian/copyright: Ditto.
|
|
+ * debian/rules:
|
|
+ + Adjust CFLAGS to include -g and remove useless -I directive.
|
|
+ + Remove LDFLAGS.
|
|
+
|
|
+ * Patch upstream Makefile.in to use install -s (which has the nice
|
|
+ effect of also deleting .comment sections from the binaries).
|
|
+
|
|
+ * Patch man/rlog.1 to document option -q which does nothing, it's
|
|
+ provided for consistency with other commands (closes: #69257).
|
|
+
|
|
+ * Remove a few unneeded files from the Debian diff (.orig files, Emacs
|
|
+ lock files).
|
|
+
|
|
+ -- Romain Francoise <rfrancoise@debian.org> Wed, 11 May 2005 17:51:01 +0200
|
|
+
|
|
+rcs (5.7-14) unstable; urgency=high
|
|
+
|
|
+ * Fixes tmp file race (patch from OpenBSD) (Closes: #291542)
|
|
+
|
|
+ -- Mark Baker <mark@mnb.org.uk> Fri, 21 Jan 2005 18:16:20 +0000
|
|
+
|
|
+rcs (5.7-13.3) unstable; urgency=high
|
|
+
|
|
+ * NMU
|
|
+ * Add build-dep on autoconf. Closes: #246566.
|
|
+ * Fix up quoting in src/Makefile.in to make $SHELL not complain, as \"
|
|
+ is not interpolated inside single-quoted strings.
|
|
+ * Make ident accept numbers as well as letters in identifiers.
|
|
+ Closes: #157891
|
|
+ * Remove emacs variables from the changelog as they are no longer
|
|
+ needed.
|
|
+ * Add -isp to the dpkg-gencontrol call in debian/rules to get Section
|
|
+ and Priority included. Closes: #190383.
|
|
+
|
|
+ -- Tollef Fog Heen <tfheen@debian.org> Thu, 29 Jul 2004 19:09:32 +0200
|
|
+
|
|
+rcs (5.7-13.2) unstable; urgency=low
|
|
+
|
|
+ * NMU
|
|
+ * can build now as root. Closes: #249106
|
|
+ * priority dumped down to optional. Closes: #64438
|
|
+ * fixed spelling error in debian/copyright, and location of the GPL.
|
|
+
|
|
+ -- Andreas Barth <aba@not.so.argh.org> Wed, 26 May 2004 22:21:05 +0200
|
|
+
|
|
+rcs (5.7-13.1) unstable; urgency=low
|
|
+
|
|
+ * NMU.
|
|
+ * Rebuild so that the .dsc file will have Build-Depends.
|
|
+ Closes: #187853, #176344.
|
|
+ * Remove /usr/doc symlink.
|
|
+
|
|
+ -- Daniel Schepler <schepler@debian.org> Mon, 28 Jul 2003 16:28:32 -0700
|
|
+
|
|
+rcs (5.7-13) unstable; urgency=low
|
|
+
|
|
+ * debian/rules: install docs and manpages in /usr/share, as in FHS
|
|
+ * debian/control: standards version 3.1.0
|
|
+ * debian/rules: format docs into dvi instead of leaving groff source. I
|
|
+ chose dvi as it is easier to view on screen than PS (Closes: 42277)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Sun, 28 Nov 1999 18:31:21 +0000
|
|
+
|
|
+rcs (5.7-12) unstable; urgency=low
|
|
+
|
|
+ * man/Makefile: use sed filter to fix .lf requests on output of pic,
|
|
+ so zsoelim doesn't complain about them (#26150)
|
|
+ * debian/rules: clean target deletes rcsfile.5 so it is always rebuilt
|
|
+ using fix above
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Mon, 5 Jul 1999 23:24:17 +0100
|
|
+
|
|
+rcs (5.7-11) unstable; urgency=low
|
|
+
|
|
+ * Fixed temp file security hole in rcsfreeze script (#27845)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Wed, 14 Oct 1998 22:43:47 +0100
|
|
+
|
|
+rcs (5.7-10) unstable; urgency=low
|
|
+
|
|
+ * Included rcsfreeze script (#26743)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Wed, 16 Sep 1998 20:57:00 +0000
|
|
+
|
|
+rcs (5.7-9) unstable; urgency=low
|
|
+
|
|
+ * Fixed permissions
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Mon, 16 Feb 1998 00:07:52 +0000
|
|
+
|
|
+rcs (5.7-8) unstable; urgency=low
|
|
+
|
|
+ * Updated standards-version to 2.4.0.0 (no changes)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Tue, 10 Feb 1998 10:54:36 +0000
|
|
+
|
|
+rcs (5.7-7) unstable; urgency=low
|
|
+
|
|
+ * Corrected maintainer field in debian/control
|
|
+ * Flushed configure cache and recompiled, to fix bug #11305/#11308)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Thu, 17 Jul 1997 10:54:36 +0100
|
|
+
|
|
+rcs (5.7-6) unstable; urgency=low
|
|
+
|
|
+ * Renamed changelog.upstream to changelog, as per policy (fixes #9657)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Sat, 12 Jul 1997 16:55:37 +0100
|
|
+
|
|
+rcs (5.7-5) unstable; urgency=low
|
|
+
|
|
+ * New maintainer
|
|
+ * Compiled with libc6
|
|
+ * Use canonical path for sendmail (configure.in changed)
|
|
+
|
|
+ -- Mark Baker <mbaker@iee.org> Fri, 11 Jul 1997 21:24:48 +0100
|
|
+
|
|
+rcs (5.7-4) unstable; urgency=low
|
|
+
|
|
+ * Updated to Standards-Version 2.1.2.2.
|
|
+
|
|
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Sun, 26 Jan 1997 22:34:57 +0100
|
|
+
|
|
+rcs (5.7-3) unstable; urgency=low
|
|
+
|
|
+ * debian.rules: added multi-architecture support
|
|
+
|
|
+ * debian.control: added Priority: and Section:
|
|
+
|
|
+ * debian.control: corrected extended description (Bug#3619)
|
|
+
|
|
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Wed, 24 Jul 1996 23:48:20 +0100
|
|
+
|
|
+rcs (5.7-2) unstable; urgency=low
|
|
+
|
|
+ * rebuilt for elf
|
|
+
|
|
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Thu, 23 Nov 1995 23:27:13 +0100
|
|
+
|
|
+rcs (5.7-1) unstable; urgency=low
|
|
+
|
|
+ * created new Debian GNU/Linux package maintenance system files
|
|
+ * updated from rcs5.6.0.1 to rcs-5.7
|
|
+ * received this package from Robert Sanders <Robert.Sanders@linux.org>
|
|
+
|
|
+ -- Sven Rudolph <sr1@inf.tu-dresden.de> Tue, 5 Sep 1995 04:38:07 +0100
|
|
--- rcs-5.7.orig/man/co.1
|
|
+++ rcs-5.7/man/co.1
|
|
@@ -597,7 +597,7 @@
|
|
.RB \*(lq "//\ " \*(rq.
|
|
This is useful for languages with comments that go to the end of the line.
|
|
The convention for other languages is to use a
|
|
-.RB \*(lq " \(** " \(rq
|
|
+.RB \*(lq " * " \(rq
|
|
prefix inside a multiline comment.
|
|
For example, the initial log comment of a C program
|
|
conventionally is of the following form:
|
|
@@ -606,19 +606,19 @@
|
|
.nf
|
|
.ft 3
|
|
.ne 3
|
|
-/\(**
|
|
+/*
|
|
.in +\w'/'u
|
|
-\(** $\&Log$
|
|
-\(**/
|
|
+* $\&Log$
|
|
+*/
|
|
.in
|
|
.ft
|
|
.fi
|
|
.RE
|
|
.LP
|
|
For backwards compatibility with older versions of \*r, if the log prefix is
|
|
-.B /\(**
|
|
+.B /*
|
|
or
|
|
-.B (\(**
|
|
+.B (*
|
|
surrounded by optional white space, inserted log lines contain a space
|
|
instead of
|
|
.B /
|
|
--- rcs-5.7.orig/man/rlog.1
|
|
+++ rcs-5.7/man/rlog.1
|
|
@@ -187,6 +187,10 @@
|
|
.I logins
|
|
is omitted, the user's login is assumed.
|
|
.TP
|
|
+.B \-q
|
|
+This option has no effect;
|
|
+it is provided for consistency with other commands.
|
|
+.TP
|
|
.B \-T
|
|
This option has no effect;
|
|
it is present for compatibility with other \*r commands.
|
|
--- rcs-5.7.orig/man/rcsfile.5in
|
|
+++ rcs-5.7/man/rcsfile.5in
|
|
@@ -68,6 +68,7 @@
|
|
\f3state\fP {\f2id\fP}\f3;\fP
|
|
\f3branches\fP {\f2num\fP}*\f3;\fP
|
|
\f3next\fP {\f2num\fP}\f3;\fP
|
|
+ { \f3commitid\fP \f2id\fP\f3;\fP }
|
|
{ \f2newphrase\fP }*
|
|
.LP
|
|
\f2desc\fP ::= \f3desc\fP \f2string\fP
|
|
@@ -127,6 +128,18 @@
|
|
Dates use the Gregorian calendar; times use UTC.
|
|
.PP
|
|
The
|
|
+.I commitid
|
|
+is followed by an
|
|
+.I id
|
|
+token. This token is intended to be unique across
|
|
+multiple files and is used to help group files as
|
|
+being a part of the same logical commit.
|
|
+This token must uniquely identify the commit
|
|
+operation that was applied to a set of RCS files.
|
|
+In particular, it must be unique among all the
|
|
+commitids in this file.
|
|
+.PP
|
|
+The
|
|
.I newphrase
|
|
productions in the grammar are reserved for future extensions
|
|
to the format of \*r files.
|
|
--- rcs-5.7.orig/man/Makefile.in
|
|
+++ rcs-5.7/man/Makefile.in
|
|
@@ -44,14 +44,16 @@
|
|
all default :: rcsfile.5
|
|
|
|
rcsfile.5 : rcsfile.5in
|
|
- $(PIC) $(PICFLAGS) $(srcdir)/$@in >$@
|
|
+ $(PIC) $(PICFLAGS) $(srcdir)/$@in \
|
|
+ | sed "s%\.lf \([0-9]*\)%\.lf \1 foo%" >$@
|
|
|
|
check dvi info TAGS ::
|
|
|
|
installdirs :: ../mkinstalldirs
|
|
-$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
|
|
|
|
-man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
|
|
+man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \
|
|
+ rcsfreeze
|
|
|
|
install :: installdirs
|
|
-for m in $(man1pages); do \
|
|
--- rcs-5.7.orig/configure
|
|
+++ rcs-5.7/configure
|
|
@@ -1,28 +1,288 @@
|
|
#! /bin/sh
|
|
-
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated automatically using autoconf version 2.4
|
|
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
|
|
+# Generated by GNU Autoconf 2.59.
|
|
#
|
|
+# Copyright (C) 2003 Free Software Foundation, Inc.
|
|
# This configure script is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy, distribute and modify it.
|
|
+## --------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## --------------------- ##
|
|
+
|
|
+# Be Bourne compatible
|
|
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+ emulate sh
|
|
+ NULLCMD=:
|
|
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
+ # is contrary to our usage. Disable this feature.
|
|
+ alias -g '${1+"$@"}'='"$@"'
|
|
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
+ set -o posix
|
|
+fi
|
|
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
+
|
|
+# Support unset when possible.
|
|
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
+ as_unset=unset
|
|
+else
|
|
+ as_unset=false
|
|
+fi
|
|
+
|
|
+
|
|
+# Work around bugs in pre-3.0 UWIN ksh.
|
|
+$as_unset ENV MAIL MAILPATH
|
|
+PS1='$ '
|
|
+PS2='> '
|
|
+PS4='+ '
|
|
+
|
|
+# NLS nuisances.
|
|
+for as_var in \
|
|
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
+ LC_TELEPHONE LC_TIME
|
|
+do
|
|
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
+ eval $as_var=C; export $as_var
|
|
+ else
|
|
+ $as_unset $as_var
|
|
+ fi
|
|
+done
|
|
+
|
|
+# Required to use basename.
|
|
+if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
+ as_expr=expr
|
|
+else
|
|
+ as_expr=false
|
|
+fi
|
|
+
|
|
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
|
+ as_basename=basename
|
|
+else
|
|
+ as_basename=false
|
|
+fi
|
|
+
|
|
+
|
|
+# Name of the executable.
|
|
+as_me=`$as_basename "$0" ||
|
|
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)$' \| \
|
|
+ . : '\(.\)' 2>/dev/null ||
|
|
+echo X/"$0" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
|
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
|
|
+ /^X\/\(\/\).*/{ s//\1/; q; }
|
|
+ s/.*/./; q'`
|
|
+
|
|
+
|
|
+# PATH needs CR, and LINENO needs CR and PATH.
|
|
+# 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
|
|
+
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ echo "#! /bin/sh" >conf$$.sh
|
|
+ echo "exit 0" >>conf$$.sh
|
|
+ chmod +x conf$$.sh
|
|
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
+ PATH_SEPARATOR=';'
|
|
+ else
|
|
+ PATH_SEPARATOR=:
|
|
+ fi
|
|
+ rm -f conf$$.sh
|
|
+fi
|
|
+
|
|
+
|
|
+ as_lineno_1=$LINENO
|
|
+ as_lineno_2=$LINENO
|
|
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
|
|
+ # Find who we are. Look in the path if we contain no path at all
|
|
+ # relative or not.
|
|
+ case $0 in
|
|
+ *[\\/]* ) as_myself=$0 ;;
|
|
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+done
|
|
+
|
|
+ ;;
|
|
+ esac
|
|
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
+ # in which case we are not to be found in the path.
|
|
+ if test "x$as_myself" = x; then
|
|
+ as_myself=$0
|
|
+ fi
|
|
+ if test ! -f "$as_myself"; then
|
|
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
|
|
+ { (exit 1); exit 1; }; }
|
|
+ fi
|
|
+ case $CONFIG_SHELL in
|
|
+ '')
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for as_base in sh bash ksh sh5; do
|
|
+ case $as_dir in
|
|
+ /*)
|
|
+ if ("$as_dir/$as_base" -c '
|
|
+ as_lineno_1=$LINENO
|
|
+ as_lineno_2=$LINENO
|
|
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
|
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
|
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
|
+ CONFIG_SHELL=$as_dir/$as_base
|
|
+ export CONFIG_SHELL
|
|
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
|
+ fi;;
|
|
+ esac
|
|
+ done
|
|
+done
|
|
+;;
|
|
+ esac
|
|
+
|
|
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
+ # uniformly replaced by the line number. The first 'sed' inserts a
|
|
+ # line-number line before each line; the second 'sed' does the real
|
|
+ # work. The second script uses 'N' to pair each line-number line
|
|
+ # with the numbered line, and appends trailing '-' during
|
|
+ # substitution so that $LINENO is not a special case at line end.
|
|
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
|
+ sed '=' <$as_myself |
|
|
+ sed '
|
|
+ N
|
|
+ s,$,-,
|
|
+ : loop
|
|
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
|
+ t loop
|
|
+ s,-$,,
|
|
+ s,^['$as_cr_digits']*\n,,
|
|
+ ' >$as_me.lineno &&
|
|
+ chmod +x $as_me.lineno ||
|
|
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
+ { (exit 1); exit 1; }; }
|
|
+
|
|
+ # Don't try to exec as it changes $[0], causing all sort of problems
|
|
+ # (the dirname of $[0] is not the place where we might find the
|
|
+ # original and so on. Autoconf is especially sensible to this).
|
|
+ . ./$as_me.lineno
|
|
+ # Exit status is that of the last command.
|
|
+ exit
|
|
+}
|
|
+
|
|
+
|
|
+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
|
|
+
|
|
+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
|
|
+
|
|
+if mkdir -p . 2>/dev/null; then
|
|
+ as_mkdir_p=:
|
|
+else
|
|
+ test -d ./-p && rmdir ./-p
|
|
+ as_mkdir_p=false
|
|
+fi
|
|
+
|
|
+as_executable_p="test -f"
|
|
+
|
|
+# Sed expression to map a string onto a valid CPP name.
|
|
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
+
|
|
+# Sed expression to map a string onto a valid variable name.
|
|
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
+
|
|
+
|
|
+# IFS
|
|
+# We need space, tab and new line, in precisely that order.
|
|
+as_nl='
|
|
+'
|
|
+IFS=" $as_nl"
|
|
+
|
|
+# CDPATH.
|
|
+$as_unset CDPATH
|
|
|
|
-# Defaults:
|
|
-ac_help=
|
|
+
|
|
+# 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
|
|
- --with-diffutils assume GNU diffutils is similarly installed"
|
|
+ac_config_libobj_dir=.
|
|
+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}
|
|
+
|
|
+# Identity of this package.
|
|
+PACKAGE_NAME=
|
|
+PACKAGE_TARNAME=
|
|
+PACKAGE_VERSION=
|
|
+PACKAGE_STRING=
|
|
+PACKAGE_BUGREPORT=
|
|
+
|
|
+ac_unique_file="src/rcsbase.h"
|
|
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DIFF DIFF_SUCCESS DIFF_FAILURE DIFF_TROUBLE DIFFFLAGS DIFF_L DIFF3 DIFF3_BIN ED SENDMAIL PIC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE LIBOBJS LTLIBOBJS'
|
|
+ac_subst_files=''
|
|
|
|
# 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
|
|
@@ -31,18 +291,31 @@
|
|
silent=
|
|
site=
|
|
srcdir=
|
|
-target=NONE
|
|
verbose=
|
|
x_includes=NONE
|
|
x_libraries=NONE
|
|
|
|
-# Initialize some other variables.
|
|
-subdirs=
|
|
+# 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'
|
|
+datadir='${prefix}/share'
|
|
+sysconfdir='${prefix}/etc'
|
|
+sharedstatedir='${prefix}/com'
|
|
+localstatedir='${prefix}/var'
|
|
+libdir='${exec_prefix}/lib'
|
|
+includedir='${prefix}/include'
|
|
+oldincludedir='/usr/include'
|
|
+infodir='${prefix}/info'
|
|
+mandir='${prefix}/man'
|
|
|
|
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"
|
|
@@ -50,48 +323,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
|
|
|
|
- -build | --build | --buil | --bui | --bu | --b)
|
|
- ac_prev=build ;;
|
|
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
|
|
- build="$ac_optarg" ;;
|
|
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
|
|
+ ac_prev=bindir ;;
|
|
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
|
|
+ bindir=$ac_optarg ;;
|
|
+
|
|
+ -build | --build | --buil | --bui | --bu)
|
|
+ ac_prev=build_alias ;;
|
|
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
|
|
+ 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 ;;
|
|
|
|
-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- \
|
|
@@ -100,83 +384,101 @@
|
|
-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=PREFIX install architecture-dependent files in PREFIX
|
|
- [same as prefix]
|
|
- --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
|
|
-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
|
|
---enable and --with options recognized:$ac_help
|
|
-EOF
|
|
- 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 ;;
|
|
+
|
|
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
|
|
+ ac_prev=infodir ;;
|
|
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
|
|
+ infodir=$ac_optarg ;;
|
|
+
|
|
+ -libdir | --libdir | --libdi | --libd)
|
|
+ ac_prev=libdir ;;
|
|
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
|
|
+ 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 ;;
|
|
+
|
|
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
|
|
+ | --localstate | --localstat | --localsta | --localst \
|
|
+ | --locals | --local | --loca | --loc | --lo)
|
|
+ ac_prev=localstatedir ;;
|
|
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
|
|
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
|
|
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
|
|
+ localstatedir=$ac_optarg ;;
|
|
+
|
|
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
|
|
+ ac_prev=mandir ;;
|
|
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
|
|
+ mandir=$ac_optarg ;;
|
|
|
|
-nfp | --nfp | --nf)
|
|
# Obsolete; use --without-fp.
|
|
with_fp=no ;;
|
|
|
|
-no-create | --no-create | --no-creat | --no-crea | --no-cre \
|
|
- | --no-cr | --no-c)
|
|
+ | --no-cr | --no-c | -n)
|
|
no_create=yes ;;
|
|
|
|
-no-recursion | --no-recursion | --no-recursio | --no-recursi \
|
|
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
|
|
no_recursion=yes ;;
|
|
|
|
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
|
|
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
|
|
+ | --oldin | --oldi | --old | --ol | --o)
|
|
+ ac_prev=oldincludedir ;;
|
|
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
|
|
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
|
|
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
|
|
+ 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 \
|
|
@@ -193,55 +495,78 @@
|
|
| --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)
|
|
silent=yes ;;
|
|
|
|
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
|
+ ac_prev=sbindir ;;
|
|
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
|
+ | --sbi=* | --sb=*)
|
|
+ sbindir=$ac_optarg ;;
|
|
+
|
|
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
|
|
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
|
|
+ | --sharedst | --shareds | --shared | --share | --shar \
|
|
+ | --sha | --sh)
|
|
+ ac_prev=sharedstatedir ;;
|
|
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
|
|
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
|
|
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
|
|
+ | --sha=* | --sh=*)
|
|
+ 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 ;;
|
|
|
|
-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.4"
|
|
- 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.
|
|
@@ -252,96 +577,110 @@
|
|
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; }; }
|
|
;;
|
|
|
|
- *)
|
|
- 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"
|
|
+ *=*)
|
|
+ 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 ;;
|
|
+
|
|
+ *)
|
|
+ # 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 directory name 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 directory name for --$ac_var: $ac_val" >&2
|
|
+ { (exit 1); exit 1; }; };;
|
|
esac
|
|
done
|
|
|
|
-# NLS nuisances.
|
|
-# Only set LANG and LC_ALL to C if already set.
|
|
-# These must not be set unconditionally because not all systems understand
|
|
-# e.g. LANG=C (notably SCO).
|
|
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
|
|
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
|
|
+# There might be people who depend on the old broken behavior: `$host'
|
|
+# used to hold the argument of --host etc.
|
|
+# FIXME: To remove some day.
|
|
+build=$build_alias
|
|
+host=$host_alias
|
|
+target=$target_alias
|
|
+
|
|
+# FIXME: To remove some day.
|
|
+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-
|
|
+
|
|
+test "$silent" = yes && exec 6>/dev/null
|
|
|
|
-# 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/rcsbase.h
|
|
|
|
# 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%/[^/][^/]*$%%'`
|
|
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
|
|
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
|
|
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$0" : 'X\(//\)[^/]' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)' \| \
|
|
+ . : '\(.\)' 2>/dev/null ||
|
|
+echo X"$0" |
|
|
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
+ s/.*/./; q'`
|
|
srcdir=$ac_confdir
|
|
if test ! -r $srcdir/$ac_unique_file; then
|
|
srcdir=..
|
|
@@ -351,13 +690,454 @@
|
|
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 ($ac_unique_file) 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 ($ac_unique_file) in $srcdir" >&2
|
|
+ { (exit 1); exit 1; }; }
|
|
fi
|
|
fi
|
|
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
|
|
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
|
|
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
|
|
+ { (exit 1); exit 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
|
|
+
|
|
+#
|
|
+# 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 <<_ACEOF
|
|
+\`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 \`..']
|
|
+
|
|
+_ACEOF
|
|
+
|
|
+ cat <<_ACEOF
|
|
+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]
|
|
+_ACEOF
|
|
+
|
|
+ cat <<\_ACEOF
|
|
+_ACEOF
|
|
+fi
|
|
+
|
|
+if test -n "$ac_init_help"; then
|
|
+
|
|
+ cat <<\_ACEOF
|
|
+
|
|
+Optional Packages:
|
|
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
|
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
|
+ --with-diffutils assume GNU diffutils is similarly installed
|
|
+
|
|
+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>
|
|
+
|
|
+Use these variables to override the choices made by `configure' or to help
|
|
+it to find libraries and programs with nonstandard names/locations.
|
|
+
|
|
+_ACEOF
|
|
+fi
|
|
+
|
|
+if test "$ac_init_help" = "recursive"; then
|
|
+ # If there are subdirs, report their specific --help.
|
|
+ ac_popdir=`pwd`
|
|
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
|
+ test -d $ac_dir || continue
|
|
+ ac_builddir=.
|
|
+
|
|
+if test "$ac_dir" != .; then
|
|
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
+ # A "../" for each directory in $ac_dir_suffix.
|
|
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
+else
|
|
+ ac_dir_suffix= ac_top_builddir=
|
|
+fi
|
|
+
|
|
+case $srcdir in
|
|
+ .) # No --srcdir option. We are building in place.
|
|
+ ac_srcdir=.
|
|
+ if test -z "$ac_top_builddir"; then
|
|
+ ac_top_srcdir=.
|
|
+ else
|
|
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
+ fi ;;
|
|
+ [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
+ ac_srcdir=$srcdir$ac_dir_suffix;
|
|
+ ac_top_srcdir=$srcdir ;;
|
|
+ *) # Relative path.
|
|
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
|
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
+esac
|
|
+
|
|
+# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
+# the directories may not exist.
|
|
+case `pwd` in
|
|
+.) ac_abs_builddir="$ac_dir";;
|
|
+*)
|
|
+ case "$ac_dir" in
|
|
+ .) ac_abs_builddir=`pwd`;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
+ esac;;
|
|
+esac
|
|
+case $ac_abs_builddir in
|
|
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
+*)
|
|
+ case ${ac_top_builddir}. in
|
|
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
+ esac;;
|
|
+esac
|
|
+case $ac_abs_builddir in
|
|
+.) ac_abs_srcdir=$ac_srcdir;;
|
|
+*)
|
|
+ case $ac_srcdir in
|
|
+ .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
+ esac;;
|
|
+esac
|
|
+case $ac_abs_builddir in
|
|
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
+*)
|
|
+ case $ac_top_srcdir in
|
|
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
+ esac;;
|
|
+esac
|
|
+
|
|
+ cd $ac_dir
|
|
+ # Check for guested configure; otherwise get Cygnus style configure.
|
|
+ if test -f $ac_srcdir/configure.gnu; then
|
|
+ echo
|
|
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
|
|
+ elif test -f $ac_srcdir/configure; then
|
|
+ echo
|
|
+ $SHELL $ac_srcdir/configure --help=recursive
|
|
+ elif test -f $ac_srcdir/configure.ac ||
|
|
+ test -f $ac_srcdir/configure.in; then
|
|
+ echo
|
|
+ $ac_configure --help
|
|
+ else
|
|
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
+ fi
|
|
+ cd "$ac_popdir"
|
|
+ done
|
|
+fi
|
|
+
|
|
+test -n "$ac_init_help" && exit 0
|
|
+if $ac_init_version; then
|
|
+ cat <<\_ACEOF
|
|
+
|
|
+Copyright (C) 2003 Free Software Foundation, Inc.
|
|
+This configure script is free software; the Free Software Foundation
|
|
+gives unlimited permission to copy, distribute and modify it.
|
|
+_ACEOF
|
|
+ exit 0
|
|
+fi
|
|
+exec 5>config.log
|
|
+cat >&5 <<_ACEOF
|
|
+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.59. Invocation command line was
|
|
+
|
|
+ $ $0 $@
|
|
+
|
|
+_ACEOF
|
|
+{
|
|
+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`
|
|
+
|
|
+_ASUNAME
|
|
+
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ echo "PATH: $as_dir"
|
|
+done
|
|
+
|
|
+} >&5
|
|
+
|
|
+cat >&5 <<_ACEOF
|
|
+
|
|
+
|
|
+## ----------- ##
|
|
+## Core tests. ##
|
|
+## ----------- ##
|
|
+
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+# Keep a trace of the command line.
|
|
+# Strip out --no-create and --no-recursion so they do not pile up.
|
|
+# Strip out --silent because we don't want to record it for future runs.
|
|
+# Also quote any args containing shell meta-characters.
|
|
+# Make two passes to allow for proper duplicate-argument suppression.
|
|
+ac_configure_args=
|
|
+ac_configure_args0=
|
|
+ac_configure_args1=
|
|
+ac_sep=
|
|
+ac_must_keep_next=false
|
|
+for ac_pass in 1 2
|
|
+do
|
|
+ for ac_arg
|
|
+ do
|
|
+ case $ac_arg in
|
|
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
|
|
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
+ | -silent | --silent | --silen | --sile | --sil)
|
|
+ continue ;;
|
|
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
|
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ esac
|
|
+ case $ac_pass in
|
|
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
|
+ 2)
|
|
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
|
|
+ if test $ac_must_keep_next = true; then
|
|
+ ac_must_keep_next=false # Got value, back to normal.
|
|
+ else
|
|
+ case $ac_arg in
|
|
+ *=* | --config-cache | -C | -disable-* | --disable-* \
|
|
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
|
|
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
|
|
+ | -with-* | --with-* | -without-* | --without-* | --x)
|
|
+ case "$ac_configure_args0 " in
|
|
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
|
|
+ esac
|
|
+ ;;
|
|
+ -* ) ac_must_keep_next=true ;;
|
|
+ esac
|
|
+ fi
|
|
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
|
|
+ # Get rid of the leading space.
|
|
+ ac_sep=" "
|
|
+ ;;
|
|
+ esac
|
|
+ done
|
|
+done
|
|
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
|
|
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
|
|
+
|
|
+# 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.
|
|
+# WARNING: Be sure not to use single quotes in there, as some shells,
|
|
+# such as our DU 5.0 friend, will then `close' the trap.
|
|
+trap 'exit_status=$?
|
|
+ # Save into config.log some information that might help in debugging.
|
|
+ {
|
|
+ echo
|
|
+
|
|
+ cat <<\_ASBOX
|
|
+## ---------------- ##
|
|
+## Cache variables. ##
|
|
+## ---------------- ##
|
|
+_ASBOX
|
|
+ echo
|
|
+ # 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;
|
|
+}
|
|
+ echo
|
|
+
|
|
+ cat <<\_ASBOX
|
|
+## ----------------- ##
|
|
+## Output variables. ##
|
|
+## ----------------- ##
|
|
+_ASBOX
|
|
+ echo
|
|
+ for ac_var in $ac_subst_vars
|
|
+ do
|
|
+ eval ac_val=$`echo $ac_var`
|
|
+ echo "$ac_var='"'"'$ac_val'"'"'"
|
|
+ done | sort
|
|
+ echo
|
|
+
|
|
+ if test -n "$ac_subst_files"; then
|
|
+ cat <<\_ASBOX
|
|
+## ------------- ##
|
|
+## Output files. ##
|
|
+## ------------- ##
|
|
+_ASBOX
|
|
+ echo
|
|
+ for ac_var in $ac_subst_files
|
|
+ do
|
|
+ eval ac_val=$`echo $ac_var`
|
|
+ echo "$ac_var='"'"'$ac_val'"'"'"
|
|
+ done | sort
|
|
+ echo
|
|
+ fi
|
|
+
|
|
+ if test -s confdefs.h; then
|
|
+ cat <<\_ASBOX
|
|
+## ----------- ##
|
|
+## confdefs.h. ##
|
|
+## ----------- ##
|
|
+_ASBOX
|
|
+ echo
|
|
+ sed "/^$/d" confdefs.h | sort
|
|
+ echo
|
|
+ fi
|
|
+ test "$ac_signal" != 0 &&
|
|
+ echo "$as_me: caught signal $ac_signal"
|
|
+ echo "$as_me: exit $exit_status"
|
|
+ } >&5
|
|
+ rm -f core *.core &&
|
|
+ rm -rf conftest* confdefs* 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
|
|
+
|
|
+# Predefined preprocessor variables.
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_NAME "$PACKAGE_NAME"
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
|
|
+_ACEOF
|
|
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_STRING "$PACKAGE_STRING"
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+# 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
|
|
@@ -368,36 +1148,103 @@
|
|
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:$LINENO: loading site script $ac_site_file" >&5
|
|
+echo "$as_me: loading site script $ac_site_file" >&6;}
|
|
+ sed 's/^/| /' "$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:$LINENO: 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:$LINENO: 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:$LINENO: 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:$LINENO: 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:$LINENO: 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:$LINENO: former value: $ac_old_val" >&5
|
|
+echo "$as_me: former value: $ac_old_val" >&2;}
|
|
+ { echo "$as_me:$LINENO: 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.
|
|
+ if test "$ac_new_set" = set; then
|
|
+ case $ac_new_val in
|
|
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
|
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
+ *) ac_arg=$ac_var=$ac_new_val ;;
|
|
+ esac
|
|
+ case " $ac_configure_args " in
|
|
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
|
|
+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
|
|
+ esac
|
|
+ fi
|
|
+done
|
|
+if $ac_cache_corrupted; then
|
|
+ { echo "$as_me:$LINENO: 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:$LINENO: 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 2>&5'
|
|
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
|
|
+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 (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
|
|
-else
|
|
- ac_n= ac_c='\c' ac_t=
|
|
-fi
|
|
|
|
|
|
|
|
@@ -411,15 +1258,15 @@
|
|
1
|
|
EOF
|
|
|
|
+
|
|
# Check whether --with-diffutils or --without-diffutils was given.
|
|
-withval="$with_diffutils"
|
|
-if test -n "$withval"; then
|
|
+if test "${with_diffutils+set}" = set; then
|
|
+ withval="$with_diffutils"
|
|
with_diffutils=$withval
|
|
else
|
|
with_diffutils=no
|
|
|
|
-fi
|
|
-
|
|
+fi;
|
|
|
|
case $with_diffutils in
|
|
yes)
|
|
@@ -437,11 +1284,12 @@
|
|
# On some systems, the RCS-compatible diff program is called `rdiff';
|
|
# use it if it works and `diff' doesn't.
|
|
|
|
-echo $ac_n "checking diff basename""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_prog_diff'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff basename" >&5
|
|
+echo $ECHO_N "checking diff basename... $ECHO_C" >&6
|
|
+if test "${rcs_cv_prog_diff+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_prog_diff=$DIFF
|
|
case $rcs_cv_prog_diff in
|
|
'')
|
|
@@ -463,49 +1311,62 @@
|
|
|
|
DIFF=$rcs_cv_prog_diff
|
|
case $DIFF in
|
|
-'') { echo "configure: error: cannot find RCS-compatible diff" 1>&2; exit 1; };;
|
|
+'') { { echo "$as_me:$LINENO: error: cannot find RCS-compatible diff" >&5
|
|
+echo "$as_me: error: cannot find RCS-compatible diff" >&2;}
|
|
+ { (exit 1); exit 1; }; };;
|
|
esac
|
|
-echo "$ac_t""$DIFF" 1>&6
|
|
+echo "$as_me:$LINENO: result: $DIFF" >&5
|
|
+echo "${ECHO_T}$DIFF" >&6
|
|
# Extract the first word of "$DIFF", so it can be a program name with args.
|
|
set dummy $DIFF; ac_word=$2
|
|
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_path_DIFF'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
+if test "${ac_cv_path_DIFF+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
- case "$DIFF" in
|
|
- /*)
|
|
+ case $DIFF in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
|
|
;;
|
|
*)
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- ac_cv_path_DIFF="$ac_dir/$ac_word"
|
|
- break
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
test -z "$ac_cv_path_DIFF" && ac_cv_path_DIFF="$DIFF"
|
|
;;
|
|
esac
|
|
fi
|
|
-DIFF="$ac_cv_path_DIFF"
|
|
+DIFF=$ac_cv_path_DIFF
|
|
+
|
|
if test -n "$DIFF"; then
|
|
- echo "$ac_t""$DIFF" 1>&6
|
|
+ echo "$as_me:$LINENO: result: $DIFF" >&5
|
|
+echo "${ECHO_T}$DIFF" >&6
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
|
|
# Set DIFF_SUCCESS, DIFF_FAILURE, DIFF_TROUBLE to diff's exit status
|
|
# when it finds no differences, some differences, or trouble.
|
|
|
|
-echo $ac_n "checking diff success status""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_status_diff_success'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff success status" >&5
|
|
+echo $ECHO_N "checking diff success status... $ECHO_C" >&6
|
|
+if test "${rcs_cv_status_diff_success+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_status_diff_success=$DIFF_SUCCESS
|
|
case $rcs_cv_status_diff_success in
|
|
'')
|
|
@@ -519,14 +1380,16 @@
|
|
fi
|
|
|
|
DIFF_SUCCESS=$rcs_cv_status_diff_success
|
|
-echo "$ac_t""$DIFF_SUCCESS" 1>&6
|
|
+echo "$as_me:$LINENO: result: $DIFF_SUCCESS" >&5
|
|
+echo "${ECHO_T}$DIFF_SUCCESS" >&6
|
|
#
|
|
|
|
-echo $ac_n "checking diff failure status""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_status_diff_failure'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff failure status" >&5
|
|
+echo $ECHO_N "checking diff failure status... $ECHO_C" >&6
|
|
+if test "${rcs_cv_status_diff_failure+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_status_diff_failure=$DIFF_FAILURE
|
|
case $rcs_cv_status_diff_failure in
|
|
'')
|
|
@@ -538,14 +1401,16 @@
|
|
fi
|
|
|
|
DIFF_FAILURE=$rcs_cv_status_diff_failure
|
|
-echo "$ac_t""$DIFF_FAILURE" 1>&6
|
|
+echo "$as_me:$LINENO: result: $DIFF_FAILURE" >&5
|
|
+echo "${ECHO_T}$DIFF_FAILURE" >&6
|
|
#
|
|
|
|
-echo $ac_n "checking diff trouble status""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_status_diff_trouble'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff trouble status" >&5
|
|
+echo $ECHO_N "checking diff trouble status... $ECHO_C" >&6
|
|
+if test "${rcs_cv_status_diff_trouble+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_status_diff_trouble=$DIFF_TROUBLE
|
|
case $rcs_cv_status_diff_trouble in
|
|
'')
|
|
@@ -557,16 +1422,18 @@
|
|
fi
|
|
|
|
DIFF_TROUBLE=$rcs_cv_status_diff_trouble
|
|
-echo "$ac_t""$DIFF_TROUBLE" 1>&6
|
|
+echo "$as_me:$LINENO: result: $DIFF_TROUBLE" >&5
|
|
+echo "${ECHO_T}$DIFF_TROUBLE" >&6
|
|
|
|
# Set DIFFFLAGS to the options of the `diff' program to be run.
|
|
# Use -an if possible, -n otherwise.
|
|
|
|
-echo $ac_n "checking diff options for RCS""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_options_diff'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff options for RCS" >&5
|
|
+echo $ECHO_N "checking diff options for RCS... $ECHO_C" >&6
|
|
+if test "${rcs_cv_options_diff+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_options_diff=$DIFFFLAGS
|
|
case $rcs_cv_options_diff in
|
|
'')
|
|
@@ -585,15 +1452,17 @@
|
|
fi
|
|
|
|
DIFFFLAGS=$rcs_cv_options_diff
|
|
-echo "$ac_t""$DIFFFLAGS" 1>&6
|
|
+echo "$as_me:$LINENO: result: $DIFFFLAGS" >&5
|
|
+echo "${ECHO_T}$DIFFFLAGS" >&6
|
|
|
|
# Set DIFF_L to 1 if diff understands the L option, 0 otherwise.
|
|
|
|
-echo $ac_n "checking diff -L""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_options_diff_l'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff -L" >&5
|
|
+echo $ECHO_N "checking diff -L... $ECHO_C" >&6
|
|
+if test "${rcs_cv_options_diff_l+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_options_diff_l=$DIFF_L
|
|
case $rcs_cv_options_diff_l in
|
|
'')
|
|
@@ -621,19 +1490,22 @@
|
|
|
|
DIFF_L=$rcs_cv_options_diff_l
|
|
case $DIFF_L in
|
|
-1) echo "$ac_t""yes" 1>&6;;
|
|
-*) echo "$ac_t""no" 1>&6;;
|
|
+1) echo "$as_me:$LINENO: result: yes" >&5
|
|
+echo "${ECHO_T}yes" >&6;;
|
|
+*) echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6;;
|
|
esac
|
|
|
|
# Set DIFF3 to the name of the diff3 program.
|
|
# In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec.
|
|
diff3PATH=$PATH:/usr/libexec
|
|
|
|
-echo $ac_n "checking diff3 -m""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'rcs_cv_prog_diff3_bin'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking diff3 -m" >&5
|
|
+echo $ECHO_N "checking diff3 -m... $ECHO_C" >&6
|
|
+if test "${rcs_cv_prog_diff3_bin+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
rcs_cv_prog_diff3_bin=$DIFF3
|
|
case $rcs_cv_prog_diff3_bin in
|
|
'')
|
|
@@ -657,49 +1529,61 @@
|
|
|
|
case $rcs_cv_prog_diff3_bin in
|
|
?*)
|
|
- echo "$ac_t""yes" 1>&6
|
|
+ echo "$as_me:$LINENO: result: yes" >&5
|
|
+echo "${ECHO_T}yes" >&6
|
|
ac_save_path=$PATH
|
|
PATH=$diff3PATH
|
|
# Extract the first word of "$rcs_cv_prog_diff3_bin", so it can be a program name with args.
|
|
set dummy $rcs_cv_prog_diff3_bin; ac_word=$2
|
|
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_path_DIFF3'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
+if test "${ac_cv_path_DIFF3+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
- case "$DIFF3" in
|
|
- /*)
|
|
+ case $DIFF3 in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
ac_cv_path_DIFF3="$DIFF3" # Let the user override the test with a path.
|
|
;;
|
|
*)
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- ac_cv_path_DIFF3="$ac_dir/$ac_word"
|
|
- break
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_path_DIFF3="$as_dir/$ac_word$ac_exec_ext"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
test -z "$ac_cv_path_DIFF3" && ac_cv_path_DIFF3="$rcs_cv_prog_diff3_bin"
|
|
;;
|
|
esac
|
|
fi
|
|
-DIFF3="$ac_cv_path_DIFF3"
|
|
+DIFF3=$ac_cv_path_DIFF3
|
|
+
|
|
if test -n "$DIFF3"; then
|
|
- echo "$ac_t""$DIFF3" 1>&6
|
|
+ echo "$as_me:$LINENO: result: $DIFF3" >&5
|
|
+echo "${ECHO_T}$DIFF3" >&6
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
PATH=$ac_save_path
|
|
;;
|
|
'')
|
|
- echo "$ac_t""no" 1>&6
|
|
- echo $ac_n "checking diff3 library program""... $ac_c" 1>&6
|
|
- if eval "test \"`echo '$''{'rcs_cv_path_diff3_lib'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
+ echo "$as_me:$LINENO: checking diff3 library program" >&5
|
|
+echo $ECHO_N "checking diff3 library program... $ECHO_C" >&6
|
|
+ if test "${rcs_cv_path_diff3_lib+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
-
|
|
+
|
|
$DIFF conftest0 conftest1 >conftest01
|
|
$DIFF /dev/null conftest1 >conftestn1
|
|
for i in /usr/*lib*/*diff3*; do
|
|
@@ -714,13 +1598,16 @@
|
|
break
|
|
fi
|
|
done
|
|
-
|
|
+
|
|
fi
|
|
|
|
DIFF3=$rcs_cv_path_diff3_lib
|
|
case $DIFF3 in
|
|
- '') { echo "configure: error: cannot find a working diff3 library program" 1>&2; exit 1; };;
|
|
- ?*) echo "$ac_t""$DIFF3" 1>&6;;
|
|
+ '') { { echo "$as_me:$LINENO: error: cannot find a working diff3 library program" >&5
|
|
+echo "$as_me: error: cannot find a working diff3 library program" >&2;}
|
|
+ { (exit 1); exit 1; }; };;
|
|
+ ?*) echo "$as_me:$LINENO: result: $DIFF3" >&5
|
|
+echo "${ECHO_T}$DIFF3" >&6;;
|
|
esac
|
|
;;
|
|
esac
|
|
@@ -740,71 +1627,89 @@
|
|
|
|
# Extract the first word of "ed", so it can be a program name with args.
|
|
set dummy ed; ac_word=$2
|
|
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_path_ED'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
+if test "${ac_cv_path_ED+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
- case "$ED" in
|
|
- /*)
|
|
+ case $ED in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
ac_cv_path_ED="$ED" # Let the user override the test with a path.
|
|
;;
|
|
*)
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- ac_cv_path_ED="$ac_dir/$ac_word"
|
|
- break
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_path_ED="$as_dir/$ac_word$ac_exec_ext"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
test -z "$ac_cv_path_ED" && ac_cv_path_ED="ed"
|
|
;;
|
|
esac
|
|
fi
|
|
-ED="$ac_cv_path_ED"
|
|
+ED=$ac_cv_path_ED
|
|
+
|
|
if test -n "$ED"; then
|
|
- echo "$ac_t""$ED" 1>&6
|
|
+ echo "$as_me:$LINENO: result: $ED" >&5
|
|
+echo "${ECHO_T}$ED" >&6
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
|
|
ac_save_path=$PATH
|
|
-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
|
|
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH
|
|
for ac_prog in sendmail mail mailx
|
|
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
|
|
-if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
+if test "${ac_cv_path_SENDMAIL+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
- case "$SENDMAIL" in
|
|
- /*)
|
|
+ case $SENDMAIL in
|
|
+ [\\/]* | ?:[\\/]*)
|
|
ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
|
|
;;
|
|
*)
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
|
|
- break
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
;;
|
|
esac
|
|
fi
|
|
-SENDMAIL="$ac_cv_path_SENDMAIL"
|
|
+SENDMAIL=$ac_cv_path_SENDMAIL
|
|
+
|
|
if test -n "$SENDMAIL"; then
|
|
- echo "$ac_t""$SENDMAIL" 1>&6
|
|
+ echo "$as_me:$LINENO: result: $SENDMAIL" >&5
|
|
+echo "${ECHO_T}$SENDMAIL" >&6
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
-test -n "$SENDMAIL" && break
|
|
+ test -n "$SENDMAIL" && break
|
|
done
|
|
|
|
PATH=$ac_save_path
|
|
@@ -817,110 +1722,969 @@
|
|
# Similarly, if using traditional pic, use its -D option.
|
|
for ac_prog in "pic -n" "gpic -n" "pic -D" "pic"
|
|
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
|
|
-if eval "test \"`echo '$''{'ac_cv_prog_PIC'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
+if test "${ac_cv_prog_PIC+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
if test -n "$PIC"; then
|
|
ac_cv_prog_PIC="$PIC" # Let the user override the test.
|
|
else
|
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- test -z "$ac_dir" && ac_dir=.
|
|
- if test -f $ac_dir/$ac_word; then
|
|
- ac_cv_prog_PIC="$ac_prog"
|
|
- break
|
|
- fi
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_PIC="$ac_prog"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
fi
|
|
fi
|
|
-PIC="$ac_cv_prog_PIC"
|
|
+PIC=$ac_cv_prog_PIC
|
|
if test -n "$PIC"; then
|
|
- echo "$ac_t""$PIC" 1>&6
|
|
+ echo "$as_me:$LINENO: result: $PIC" >&5
|
|
+echo "${ECHO_T}$PIC" >&6
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
-test -n "$PIC" && break
|
|
+ test -n "$PIC" && break
|
|
done
|
|
test -n "$PIC" || PIC="pic"
|
|
|
|
|
|
-# Extract the first word of "gcc", so it can be a program name with args.
|
|
+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:$LINENO: 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
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
+fi
|
|
+fi
|
|
+CC=$ac_cv_prog_CC
|
|
+if test -n "$CC"; then
|
|
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
+echo "${ECHO_T}$CC" >&6
|
|
+else
|
|
+ echo "$as_me:$LINENO: 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
|
|
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+echo "$as_me:$LINENO: 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
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_ac_ct_CC="gcc"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
+fi
|
|
+fi
|
|
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
+if test -n "$ac_ct_CC"; then
|
|
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
+else
|
|
+ echo "$as_me:$LINENO: 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:$LINENO: 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="${IFS}:"
|
|
- for ac_dir in $PATH; 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"
|
|
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+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:$LINENO: result: $CC" >&5
|
|
+echo "${ECHO_T}$CC" >&6
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: 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:$LINENO: 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
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_ac_ct_CC="cc"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
|
|
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+fi
|
|
+fi
|
|
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
+if test -n "$ac_ct_CC"; then
|
|
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
else
|
|
- cat > conftest.c <<EOF
|
|
-#ifdef __GNUC__
|
|
- yes;
|
|
-#endif
|
|
-EOF
|
|
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
|
|
- ac_cv_prog_gcc=yes
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
+fi
|
|
+
|
|
+ CC=$ac_ct_CC
|
|
else
|
|
- ac_cv_prog_gcc=no
|
|
+ CC="$ac_cv_prog_CC"
|
|
fi
|
|
+
|
|
fi
|
|
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
|
|
-if test $ac_cv_prog_gcc = yes; then
|
|
- GCC=yes
|
|
- if test "${CFLAGS+set}" != set; then
|
|
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
+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 "$as_me:$LINENO: 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
|
|
- echo 'void f(){}' > conftest.c
|
|
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
|
|
- ac_cv_prog_gcc_g=yes
|
|
+ if test -n "$CC"; then
|
|
+ ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
+else
|
|
+ ac_prog_rejected=no
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
+ ac_prog_rejected=yes
|
|
+ continue
|
|
+ fi
|
|
+ ac_cv_prog_CC="cc"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+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 $# != 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
|
|
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
|
|
+ fi
|
|
+fi
|
|
+fi
|
|
+fi
|
|
+CC=$ac_cv_prog_CC
|
|
+if test -n "$CC"; then
|
|
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
+echo "${ECHO_T}$CC" >&6
|
|
else
|
|
- ac_cv_prog_gcc_g=no
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
+fi
|
|
+
|
|
+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:$LINENO: 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
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
+fi
|
|
+fi
|
|
+CC=$ac_cv_prog_CC
|
|
+if test -n "$CC"; then
|
|
+ echo "$as_me:$LINENO: result: $CC" >&5
|
|
+echo "${ECHO_T}$CC" >&6
|
|
+else
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
+fi
|
|
+
|
|
+ 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:$LINENO: 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
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
+fi
|
|
+fi
|
|
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
|
+if test -n "$ac_ct_CC"; then
|
|
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
+echo "${ECHO_T}$ac_ct_CC" >&6
|
|
+else
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
+fi
|
|
+
|
|
+ test -n "$ac_ct_CC" && break
|
|
+done
|
|
+
|
|
+ CC=$ac_ct_CC
|
|
fi
|
|
-rm -f conftest*
|
|
|
|
fi
|
|
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
|
|
- if test $ac_cv_prog_gcc_g = yes; then
|
|
- CFLAGS="-g -O"
|
|
+
|
|
+
|
|
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
|
+See \`config.log' for more details." >&5
|
|
+echo "$as_me: error: no acceptable C compiler found in \$PATH
|
|
+See \`config.log' for more details." >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+
|
|
+# Provide some information about the compiler.
|
|
+echo "$as_me:$LINENO:" \
|
|
+ "checking for C compiler version" >&5
|
|
+ac_compiler=`set X $ac_compile; echo $2`
|
|
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
|
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }
|
|
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
|
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }
|
|
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
|
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }
|
|
+
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+ac_clean_files_save=$ac_clean_files
|
|
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
|
+# 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:$LINENO: checking for C compiler default output file name" >&5
|
|
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
|
|
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
|
|
+ (eval $ac_link_default) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $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.
|
|
+
|
|
+# Be careful to initialize this variable, since it used to be cached.
|
|
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
|
|
+ac_cv_exeext=
|
|
+# b.out is created by i960 compilers.
|
|
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
|
|
+do
|
|
+ test -f "$ac_file" || continue
|
|
+ case $ac_file in
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
|
|
+ ;;
|
|
+ conftest.$ac_ext )
|
|
+ # This is the source file.
|
|
+ ;;
|
|
+ [ab].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,
|
|
+ # but it would be cool to find out if it's true. Does anybody
|
|
+ # maintain Libtool? --akim.
|
|
+ export ac_cv_exeext
|
|
+ break;;
|
|
+ * )
|
|
+ break;;
|
|
+ esac
|
|
+done
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
|
+See \`config.log' for more details." >&5
|
|
+echo "$as_me: error: C compiler cannot create executables
|
|
+See \`config.log' for more details." >&2;}
|
|
+ { (exit 77); exit 77; }; }
|
|
+fi
|
|
+
|
|
+ac_exeext=$ac_cv_exeext
|
|
+echo "$as_me:$LINENO: 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:$LINENO: 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:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ cross_compiling=no
|
|
+ else
|
|
+ if test "$cross_compiling" = maybe; then
|
|
+ cross_compiling=yes
|
|
else
|
|
- CFLAGS="-O"
|
|
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
|
+If you meant to cross compile, use \`--host'.
|
|
+See \`config.log' for more details." >&5
|
|
+echo "$as_me: error: cannot run C compiled programs.
|
|
+If you meant to cross compile, use \`--host'.
|
|
+See \`config.log' for more details." >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
fi
|
|
fi
|
|
+fi
|
|
+echo "$as_me:$LINENO: result: yes" >&5
|
|
+echo "${ECHO_T}yes" >&6
|
|
+
|
|
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
|
+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:$LINENO: checking whether we are cross compiling" >&5
|
|
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
+echo "${ECHO_T}$cross_compiling" >&6
|
|
+
|
|
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
|
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ (eval $ac_link) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $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 conftest.exe conftest conftest.*; do
|
|
+ test -f "$ac_file" || continue
|
|
+ case $ac_file in
|
|
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
|
|
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
+ export ac_cv_exeext
|
|
+ break;;
|
|
+ * ) break;;
|
|
+ esac
|
|
+done
|
|
+else
|
|
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
|
+See \`config.log' for more details." >&5
|
|
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
|
+See \`config.log' for more details." >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+fi
|
|
+
|
|
+rm -f conftest$ac_cv_exeext
|
|
+echo "$as_me:$LINENO: 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:$LINENO: checking for suffix of object files" >&5
|
|
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
|
|
+if test "${ac_cv_objext+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.o conftest.obj
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $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 | *.xSYM | *.bb | *.bbg ) ;;
|
|
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
|
+ break;;
|
|
+ esac
|
|
+done
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
|
+See \`config.log' for more details." >&5
|
|
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
|
+See \`config.log' for more details." >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+fi
|
|
+
|
|
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
|
+fi
|
|
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
+echo "${ECHO_T}$ac_cv_objext" >&6
|
|
+OBJEXT=$ac_cv_objext
|
|
+ac_objext=$OBJEXT
|
|
+echo "$as_me:$LINENO: 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
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+#ifndef __GNUC__
|
|
+ choke me
|
|
+#endif
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; } &&
|
|
+ { ac_try='test -s conftest.$ac_objext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ ac_compiler_gnu=yes
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ac_compiler_gnu=no
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
+
|
|
+fi
|
|
+echo "$as_me:$LINENO: 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:$LINENO: 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
|
|
+ cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; } &&
|
|
+ { ac_try='test -s conftest.$ac_objext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ ac_cv_prog_cc_g=yes
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ac_cv_prog_cc_g=no
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+echo "$as_me:$LINENO: 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
|
|
+elif test $ac_cv_prog_cc_g = yes; then
|
|
+ if test "$GCC" = yes; then
|
|
+ CFLAGS="-g -O2"
|
|
+ else
|
|
+ CFLAGS="-g"
|
|
+ fi
|
|
+else
|
|
+ if test "$GCC" = yes; then
|
|
+ CFLAGS="-O2"
|
|
+ else
|
|
+ CFLAGS=
|
|
+ fi
|
|
+fi
|
|
+echo "$as_me:$LINENO: 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
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end 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;
|
|
+}
|
|
+
|
|
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
|
+ function prototypes and stuff, but not '\xHH' hex character constants.
|
|
+ These don't provoke an error unfortunately, instead are silently treated
|
|
+ as 'x'. The following induces an error, until -std1 is added to get
|
|
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
|
+ array size at least. It's necessary to write '\x00'==0 to get something
|
|
+ that's true only with -std1. */
|
|
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
|
+
|
|
+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:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; } &&
|
|
+ { ac_try='test -s conftest.$ac_objext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ ac_cv_prog_cc_stdc=$ac_arg
|
|
+break
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_objext
|
|
+done
|
|
+rm -f conftest.$ac_ext conftest.$ac_objext
|
|
+CC=$ac_save_CC
|
|
+
|
|
+fi
|
|
+
|
|
+case "x$ac_cv_prog_cc_stdc" in
|
|
+ x|xno)
|
|
+ echo "$as_me:$LINENO: result: none needed" >&5
|
|
+echo "${ECHO_T}none needed" >&6 ;;
|
|
+ *)
|
|
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
|
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
|
|
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
|
|
+esac
|
|
+
|
|
+# 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:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; } &&
|
|
+ { ac_try='test -s conftest.$ac_objext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ for ac_declaration in \
|
|
+ '' \
|
|
+ '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
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+$ac_declaration
|
|
+#include <stdlib.h>
|
|
+int
|
|
+main ()
|
|
+{
|
|
+exit (42);
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; } &&
|
|
+ { ac_try='test -s conftest.$ac_objext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ :
|
|
else
|
|
- GCC=
|
|
- test "${CFLAGS+set}" = set || CFLAGS="-g"
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+continue
|
|
fi
|
|
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+ cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+$ac_declaration
|
|
+int
|
|
+main ()
|
|
+{
|
|
+exit (42);
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } &&
|
|
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; } &&
|
|
+ { ac_try='test -s conftest.$ac_objext'
|
|
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
+ (eval $ac_try) 2>&5
|
|
+ ac_status=$?
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; }; then
|
|
+ break
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+done
|
|
+rm -f conftest*
|
|
+if test -n "$ac_declaration"; then
|
|
+ echo '#ifdef __cplusplus' >>confdefs.h
|
|
+ echo $ac_declaration >>confdefs.h
|
|
+ echo '#endif' >>confdefs.h
|
|
+fi
|
|
+
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+fi
|
|
+rm -f conftest.err 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_aux_dir=
|
|
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
|
@@ -932,14 +2696,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:$LINENO: 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
|
|
@@ -948,274 +2718,1036 @@
|
|
# 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"
|
|
+# OS/2's system install, which has a completely different semantic
|
|
# ./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 "$as_me:$LINENO: 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="${IFS}:"
|
|
- for ac_dir in $PATH; do
|
|
- # Account for people who put trailing slashes in PATH elements.
|
|
- case "$ac_dir/" in
|
|
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
|
|
- *)
|
|
- # OSF1 and SCO ODT 3.0 have their own names for install.
|
|
- for ac_prog in ginstall installbsd scoinst install; do
|
|
- if test -f $ac_dir/$ac_prog; then
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ # Account for people who put trailing slashes in PATH elements.
|
|
+case $as_dir/ in
|
|
+ ./ | .// | /cC/* | \
|
|
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
|
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
|
+ /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
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
|
if test $ac_prog = install &&
|
|
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
|
|
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
# AIX install. It has an incompatible calling convention.
|
|
- # OSF/1 installbsd also uses dspmsg, but is usable.
|
|
+ :
|
|
+ elif test $ac_prog = install &&
|
|
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/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
|
|
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
|
+ break 3
|
|
fi
|
|
fi
|
|
done
|
|
- ;;
|
|
- esac
|
|
- done
|
|
- IFS="$ac_save_ifs"
|
|
- # As a last resort, use the slow shell script.
|
|
- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
|
|
+ done
|
|
+ ;;
|
|
+esac
|
|
+done
|
|
+
|
|
+
|
|
fi
|
|
- INSTALL="$ac_cv_path_install"
|
|
+ if test "${ac_cv_path_install+set}" = set; then
|
|
+ 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
|
|
+ fi
|
|
fi
|
|
-echo "$ac_t""$INSTALL" 1>&6
|
|
+echo "$as_me:$LINENO: 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}'
|
|
+
|
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
|
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
|
-set dummy ${MAKE-make}; ac_make=$2
|
|
-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:$LINENO: 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 <<\_ACEOF
|
|
all:
|
|
- @echo 'ac_maketemp="${MAKE}"'
|
|
-EOF
|
|
+ @echo 'ac_maketemp="$(MAKE)"'
|
|
+_ACEOF
|
|
# 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:$LINENO: result: yes" >&5
|
|
+echo "${ECHO_T}yes" >&6
|
|
SET_MAKE=
|
|
else
|
|
- echo "$ac_t""no" 1>&6
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
SET_MAKE="MAKE=${MAKE-make}"
|
|
fi
|
|
|
|
|
|
-trap '' 1 2 15
|
|
-cat > confcache <<\EOF
|
|
+ ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile"
|
|
+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 overridden 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 |
|
|
- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
|
|
- >> 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 diff $cache_file confcache >/dev/null 2>&1; 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
|
|
-
|
|
# Transform confdefs.h into DEFS.
|
|
# Protect against shell expansion while executing Makefile rules.
|
|
# Protect against Makefile macro expansion.
|
|
-cat > conftest.defs <<\EOF
|
|
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
|
|
-s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
|
|
-s%\[%\\&%g
|
|
-s%\]%\\&%g
|
|
-s%\$%$$%g
|
|
-EOF
|
|
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
|
|
-rm -f conftest.defs
|
|
+#
|
|
+# If the first sed substitution is executed (which looks for macros that
|
|
+# take arguments), then we branch to the quote section. Otherwise,
|
|
+# look for a macro that doesn't take arguments.
|
|
+cat >confdef2opt.sed <<\_ACEOF
|
|
+t clear
|
|
+: clear
|
|
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
|
|
+t quote
|
|
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
|
|
+t quote
|
|
+d
|
|
+: quote
|
|
+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
|
|
+s,\[,\\&,g
|
|
+s,\],\\&,g
|
|
+s,\$,$$,g
|
|
+p
|
|
+_ACEOF
|
|
+# We use echo to avoid assuming a particular line-breaking character.
|
|
+# The extra dot is to prevent the shell from consuming trailing
|
|
+# line-breaks from the sub-command output. A line-break within
|
|
+# single-quotes doesn't work because, if this script is created in a
|
|
+# platform that uses two characters for line-breaks (e.g., DOS), tr
|
|
+# would break.
|
|
+ac_LF_and_DOT=`echo; echo .`
|
|
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
|
|
+rm -f confdef2opt.sed
|
|
+
|
|
+
|
|
+ac_libobjs=
|
|
+ac_ltlibobjs=
|
|
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|
+ # 1. Remove the extension, and $U if already installed.
|
|
+ ac_i=`echo "$ac_i" |
|
|
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
|
|
+ # 2. Add them.
|
|
+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
|
|
+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
|
|
+done
|
|
+LIBOBJS=$ac_libobjs
|
|
|
|
+LTLIBOBJS=$ac_ltlibobjs
|
|
|
|
-# 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
|
|
-# Generated automatically by configure.
|
|
+
|
|
+: ${CONFIG_STATUS=./config.status}
|
|
+ac_clean_files_save=$ac_clean_files
|
|
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
|
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
|
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
|
+cat >$CONFIG_STATUS <<_ACEOF
|
|
+#! $SHELL
|
|
+# Generated by $as_me.
|
|
# 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
|
|
+ac_cs_recheck=false
|
|
+ac_cs_silent=false
|
|
+SHELL=\${CONFIG_SHELL-$SHELL}
|
|
+_ACEOF
|
|
+
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+## --------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## --------------------- ##
|
|
+
|
|
+# Be Bourne compatible
|
|
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+ emulate sh
|
|
+ NULLCMD=:
|
|
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
|
+ # is contrary to our usage. Disable this feature.
|
|
+ alias -g '${1+"$@"}'='"$@"'
|
|
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
|
+ set -o posix
|
|
+fi
|
|
+DUALCASE=1; export DUALCASE # for MKS sh
|
|
+
|
|
+# Support unset when possible.
|
|
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
+ as_unset=unset
|
|
+else
|
|
+ as_unset=false
|
|
+fi
|
|
+
|
|
+
|
|
+# Work around bugs in pre-3.0 UWIN ksh.
|
|
+$as_unset ENV MAIL MAILPATH
|
|
+PS1='$ '
|
|
+PS2='> '
|
|
+PS4='+ '
|
|
+
|
|
+# NLS nuisances.
|
|
+for as_var in \
|
|
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
+ LC_TELEPHONE LC_TIME
|
|
+do
|
|
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
+ eval $as_var=C; export $as_var
|
|
+ else
|
|
+ $as_unset $as_var
|
|
+ fi
|
|
+done
|
|
+
|
|
+# Required to use basename.
|
|
+if expr a : '\(a\)' >/dev/null 2>&1; then
|
|
+ as_expr=expr
|
|
+else
|
|
+ as_expr=false
|
|
+fi
|
|
+
|
|
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
|
+ as_basename=basename
|
|
+else
|
|
+ as_basename=false
|
|
+fi
|
|
+
|
|
+
|
|
+# Name of the executable.
|
|
+as_me=`$as_basename "$0" ||
|
|
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)$' \| \
|
|
+ . : '\(.\)' 2>/dev/null ||
|
|
+echo X/"$0" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
|
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
|
|
+ /^X\/\(\/\).*/{ s//\1/; q; }
|
|
+ s/.*/./; q'`
|
|
+
|
|
+
|
|
+# PATH needs CR, and LINENO needs CR and PATH.
|
|
+# 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
|
|
+
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ echo "#! /bin/sh" >conf$$.sh
|
|
+ echo "exit 0" >>conf$$.sh
|
|
+ chmod +x conf$$.sh
|
|
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
+ PATH_SEPARATOR=';'
|
|
+ else
|
|
+ PATH_SEPARATOR=:
|
|
+ fi
|
|
+ rm -f conf$$.sh
|
|
+fi
|
|
+
|
|
+
|
|
+ as_lineno_1=$LINENO
|
|
+ as_lineno_2=$LINENO
|
|
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
|
|
+ # Find who we are. Look in the path if we contain no path at all
|
|
+ # relative or not.
|
|
+ case $0 in
|
|
+ *[\\/]* ) as_myself=$0 ;;
|
|
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+done
|
|
+
|
|
+ ;;
|
|
+ esac
|
|
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
|
|
+ # in which case we are not to be found in the path.
|
|
+ if test "x$as_myself" = x; then
|
|
+ as_myself=$0
|
|
+ fi
|
|
+ if test ! -f "$as_myself"; then
|
|
+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
|
|
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+ fi
|
|
+ case $CONFIG_SHELL in
|
|
+ '')
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for as_base in sh bash ksh sh5; do
|
|
+ case $as_dir in
|
|
+ /*)
|
|
+ if ("$as_dir/$as_base" -c '
|
|
+ as_lineno_1=$LINENO
|
|
+ as_lineno_2=$LINENO
|
|
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
|
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
|
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
|
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
|
+ CONFIG_SHELL=$as_dir/$as_base
|
|
+ export CONFIG_SHELL
|
|
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
|
+ fi;;
|
|
+ esac
|
|
+ done
|
|
+done
|
|
+;;
|
|
+ esac
|
|
+
|
|
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
+ # uniformly replaced by the line number. The first 'sed' inserts a
|
|
+ # line-number line before each line; the second 'sed' does the real
|
|
+ # work. The second script uses 'N' to pair each line-number line
|
|
+ # with the numbered line, and appends trailing '-' during
|
|
+ # substitution so that $LINENO is not a special case at line end.
|
|
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
|
+ sed '=' <$as_myself |
|
|
+ sed '
|
|
+ N
|
|
+ s,$,-,
|
|
+ : loop
|
|
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
|
+ t loop
|
|
+ s,-$,,
|
|
+ s,^['$as_cr_digits']*\n,,
|
|
+ ' >$as_me.lineno &&
|
|
+ chmod +x $as_me.lineno ||
|
|
+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
|
|
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
|
|
+ { (exit 1); exit 1; }; }
|
|
+
|
|
+ # Don't try to exec as it changes $[0], causing all sort of problems
|
|
+ # (the dirname of $[0] is not the place where we might find the
|
|
+ # original and so on. Autoconf is especially sensible to this).
|
|
+ . ./$as_me.lineno
|
|
+ # Exit status is that of the last command.
|
|
+ exit
|
|
+}
|
|
+
|
|
+
|
|
+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
|
|
+
|
|
+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
|
|
+
|
|
+if mkdir -p . 2>/dev/null; then
|
|
+ as_mkdir_p=:
|
|
+else
|
|
+ test -d ./-p && rmdir ./-p
|
|
+ as_mkdir_p=false
|
|
+fi
|
|
+
|
|
+as_executable_p="test -f"
|
|
+
|
|
+# Sed expression to map a string onto a valid CPP name.
|
|
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
+
|
|
+# Sed expression to map a string onto a valid variable name.
|
|
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
|
+
|
|
+
|
|
+# IFS
|
|
+# We need space, tab and new line, in precisely that order.
|
|
+as_nl='
|
|
+'
|
|
+IFS=" $as_nl"
|
|
+
|
|
+# CDPATH.
|
|
+$as_unset CDPATH
|
|
+
|
|
+exec 6>&1
|
|
+
|
|
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
|
|
+# report actual input values of CONFIG_FILES etc. instead of their
|
|
+# values after options handling. Logging --version etc. is OK.
|
|
+exec 5>>config.log
|
|
+{
|
|
+ echo
|
|
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
|
+## Running $as_me. ##
|
|
+_ASBOX
|
|
+} >&5
|
|
+cat >&5 <<_CSEOF
|
|
+
|
|
+This file was extended by $as_me, which was
|
|
+generated by GNU Autoconf 2.59. Invocation command line was
|
|
+
|
|
+ CONFIG_FILES = $CONFIG_FILES
|
|
+ CONFIG_HEADERS = $CONFIG_HEADERS
|
|
+ CONFIG_LINKS = $CONFIG_LINKS
|
|
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
|
|
+ $ $0 $@
|
|
+
|
|
+_CSEOF
|
|
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
|
|
+echo >&5
|
|
+_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 <<\_ACEOF
|
|
+
|
|
+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
|
|
+ -q, --quiet do not print progress messages
|
|
+ -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
|
|
+
|
|
+Configuration files:
|
|
+$config_files
|
|
+
|
|
+Report bugs to <bug-autoconf@gnu.org>."
|
|
+_ACEOF
|
|
+
|
|
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
+ac_cs_version="\\
|
|
+config.status
|
|
+configured by $0, generated by GNU Autoconf 2.59,
|
|
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
|
+
|
|
+Copyright (C) 2003 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"
|
|
+_ACEOF
|
|
+
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+# 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[^=]*=\(.*\)'`
|
|
+ ac_shift=:
|
|
+ ;;
|
|
+ -*)
|
|
+ ac_option=$1
|
|
+ ac_optarg=$2
|
|
+ ac_shift=shift
|
|
+ ;;
|
|
+ *) # This is not an option, so the user has probably given explicit
|
|
+ # arguments.
|
|
+ ac_option=$1
|
|
+ ac_need_defaults=false;;
|
|
+ esac
|
|
+
|
|
+ case $ac_option in
|
|
+ # Handling of the options.
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
-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.4"
|
|
- exit 0 ;;
|
|
- -help | --help | --hel | --he | --h)
|
|
- echo "\$ac_cs_usage"; exit 0 ;;
|
|
- *) echo "\$ac_cs_usage"; exit 1 ;;
|
|
+ ac_cs_recheck=: ;;
|
|
+ --version | --vers* | -V )
|
|
+ echo "$ac_cs_version"; exit 0 ;;
|
|
+ --he | --h)
|
|
+ # Conflict between --help and --header
|
|
+ { { echo "$as_me:$LINENO: 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 )
|
|
+ $ac_shift
|
|
+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
|
|
+ ac_need_defaults=false;;
|
|
+ --header | --heade | --head | --hea )
|
|
+ $ac_shift
|
|
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
|
|
+ ac_need_defaults=false;;
|
|
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
|
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
|
|
+ ac_cs_silent=: ;;
|
|
+
|
|
+ # This is an error.
|
|
+ -*) { { echo "$as_me:$LINENO: 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"
|
|
-
|
|
-trap 'rm -fr `echo "Makefile man/Makefile src/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
|
-
|
|
-# 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%@CFLAGS@%$CFLAGS%g
|
|
-s%@CPPFLAGS@%$CPPFLAGS%g
|
|
-s%@CXXFLAGS@%$CXXFLAGS%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%@DIFF@%$DIFF%g
|
|
-s%@DIFF_SUCCESS@%$DIFF_SUCCESS%g
|
|
-s%@DIFF_FAILURE@%$DIFF_FAILURE%g
|
|
-s%@DIFF_TROUBLE@%$DIFF_TROUBLE%g
|
|
-s%@DIFFFLAGS@%$DIFFFLAGS%g
|
|
-s%@DIFF_L@%$DIFF_L%g
|
|
-s%@DIFF3@%$DIFF3%g
|
|
-s%@DIFF3_BIN@%$DIFF3_BIN%g
|
|
-s%@ED@%$ED%g
|
|
-s%@SENDMAIL@%$SENDMAIL%g
|
|
-s%@PIC@%$PIC%g
|
|
-s%@CC@%$CC%g
|
|
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
|
-s%@INSTALL_DATA@%$INSTALL_DATA%g
|
|
-s%@SET_MAKE@%$SET_MAKE%g
|
|
+ac_configure_extra_args=
|
|
+
|
|
+if $ac_cs_silent; then
|
|
+ exec 6>/dev/null
|
|
+ ac_configure_extra_args="$ac_configure_extra_args --silent"
|
|
+fi
|
|
+
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
+if \$ac_cs_recheck; then
|
|
+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
|
+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+fi
|
|
+
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+for ac_config_target in $ac_config_targets
|
|
+do
|
|
+ case "$ac_config_target" in
|
|
+ # Handling of arguments.
|
|
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
+ "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
|
|
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
|
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
|
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
|
+ { (exit 1); exit 1; }; };;
|
|
+ esac
|
|
+done
|
|
+
|
|
+# 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
|
|
+fi
|
|
+
|
|
+# Have a temporary directory for convenience. Make it in the build tree
|
|
+# simply because there is no reason to put it here, and in addition,
|
|
+# creating and moving files from /tmp can sometimes cause problems.
|
|
+# 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.
|
|
+
|
|
+{
|
|
+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
|
|
+ test -n "$tmp" && test -d "$tmp"
|
|
+} ||
|
|
+{
|
|
+ tmp=./confstat$$-$RANDOM
|
|
+ (umask 077 && mkdir $tmp)
|
|
+} ||
|
|
+{
|
|
+ echo "$me: cannot create a temporary directory in ." >&2
|
|
+ { (exit 1); exit 1; }
|
|
+}
|
|
|
|
+_ACEOF
|
|
+
|
|
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
+
|
|
+#
|
|
+# 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,@PATH_SEPARATOR@,$PATH_SEPARATOR,;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,@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,@build_alias@,$build_alias,;t t
|
|
+s,@host_alias@,$host_alias,;t t
|
|
+s,@target_alias@,$target_alias,;t t
|
|
+s,@DEFS@,$DEFS,;t t
|
|
+s,@ECHO_C@,$ECHO_C,;t t
|
|
+s,@ECHO_N@,$ECHO_N,;t t
|
|
+s,@ECHO_T@,$ECHO_T,;t t
|
|
+s,@LIBS@,$LIBS,;t t
|
|
+s,@DIFF@,$DIFF,;t t
|
|
+s,@DIFF_SUCCESS@,$DIFF_SUCCESS,;t t
|
|
+s,@DIFF_FAILURE@,$DIFF_FAILURE,;t t
|
|
+s,@DIFF_TROUBLE@,$DIFF_TROUBLE,;t t
|
|
+s,@DIFFFLAGS@,$DIFFFLAGS,;t t
|
|
+s,@DIFF_L@,$DIFF_L,;t t
|
|
+s,@DIFF3@,$DIFF3,;t t
|
|
+s,@DIFF3_BIN@,$DIFF3_BIN,;t t
|
|
+s,@ED@,$ED,;t t
|
|
+s,@SENDMAIL@,$SENDMAIL,;t t
|
|
+s,@PIC@,$PIC,;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,@EXEEXT@,$EXEEXT,;t t
|
|
+s,@OBJEXT@,$OBJEXT,;t t
|
|
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
|
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
|
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
|
+s,@SET_MAKE@,$SET_MAKE,;t t
|
|
+s,@LIBOBJS@,$LIBOBJS,;t t
|
|
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
|
CEOF
|
|
-EOF
|
|
-cat >> $CONFIG_STATUS <<EOF
|
|
|
|
-CONFIG_FILES=\${CONFIG_FILES-"Makefile man/Makefile src/Makefile"}
|
|
-EOF
|
|
-cat >> $CONFIG_STATUS <<\EOF
|
|
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
|
|
- # Support "outfile[:infile]", defaulting infile="outfile.in".
|
|
- 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" ;;
|
|
- esac
|
|
-
|
|
- # Adjust relative srcdir, etc. for subdirectories.
|
|
-
|
|
- # 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"
|
|
- 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'`
|
|
- else
|
|
- ac_dir_suffix= ac_dots=
|
|
+_ACEOF
|
|
+
|
|
+ cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+ # 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"
|
|
+
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+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
|
|
+ - | *:- | *:-:* ) # 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
|
|
|
|
- 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" ;;
|
|
+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
|
|
+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
|
+$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 $as_mkdir_p; then
|
|
+ mkdir -p "$ac_dir"
|
|
+ else
|
|
+ as_dir="$ac_dir"
|
|
+ as_dirs=
|
|
+ while test ! -d "$as_dir"; do
|
|
+ as_dirs="$as_dir $as_dirs"
|
|
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
|
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
|
+ X"$as_dir" : 'X\(//\)$' \| \
|
|
+ X"$as_dir" : 'X\(/\)' \| \
|
|
+ . : '\(.\)' 2>/dev/null ||
|
|
+echo X"$as_dir" |
|
|
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
|
+ /^X\(\/\/\)$/{ s//\1/; q; }
|
|
+ /^X\(\/\).*/{ s//\1/; q; }
|
|
+ s/.*/./; q'`
|
|
+ done
|
|
+ test ! -n "$as_dirs" || mkdir $as_dirs
|
|
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
|
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
|
+ { (exit 1); exit 1; }; }; }
|
|
+
|
|
+ ac_builddir=.
|
|
+
|
|
+if test "$ac_dir" != .; then
|
|
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
|
+ # A "../" for each directory in $ac_dir_suffix.
|
|
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
|
+else
|
|
+ ac_dir_suffix= ac_top_builddir=
|
|
+fi
|
|
+
|
|
+case $srcdir in
|
|
+ .) # No --srcdir option. We are building in place.
|
|
+ ac_srcdir=.
|
|
+ if test -z "$ac_top_builddir"; then
|
|
+ ac_top_srcdir=.
|
|
+ else
|
|
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
|
+ fi ;;
|
|
+ [\\/]* | ?:[\\/]* ) # Absolute path.
|
|
+ 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_top_builddir$srcdir$ac_dir_suffix
|
|
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
|
+esac
|
|
+
|
|
+# Do not use `cd foo && pwd` to compute absolute paths, because
|
|
+# the directories may not exist.
|
|
+case `pwd` in
|
|
+.) ac_abs_builddir="$ac_dir";;
|
|
+*)
|
|
+ case "$ac_dir" in
|
|
+ .) ac_abs_builddir=`pwd`;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
|
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
|
+ esac;;
|
|
+esac
|
|
+case $ac_abs_builddir in
|
|
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
+*)
|
|
+ case ${ac_top_builddir}. in
|
|
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
|
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
|
+ esac;;
|
|
+esac
|
|
+case $ac_abs_builddir in
|
|
+.) ac_abs_srcdir=$ac_srcdir;;
|
|
+*)
|
|
+ case $ac_srcdir in
|
|
+ .) ac_abs_srcdir=$ac_abs_builddir;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
|
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
|
+ esac;;
|
|
+esac
|
|
+case $ac_abs_builddir in
|
|
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
+*)
|
|
+ case $ac_top_srcdir in
|
|
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
|
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
|
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
|
+ esac;;
|
|
+esac
|
|
+
|
|
+
|
|
+ case $INSTALL in
|
|
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
|
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
|
|
esac
|
|
|
|
- case "$ac_given_INSTALL" in
|
|
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
|
|
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
|
|
- esac
|
|
- echo creating "$ac_file"
|
|
- rm -f "$ac_file"
|
|
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
|
|
- case "$ac_file" in
|
|
- *Makefile*) ac_comsub="1i\\
|
|
-# $configure_input" ;;
|
|
- *) ac_comsub= ;;
|
|
- esac
|
|
- sed -e "$ac_comsub
|
|
-s%@configure_input@%$configure_input%g
|
|
-s%@srcdir@%$srcdir%g
|
|
-s%@top_srcdir@%$top_srcdir%g
|
|
-s%@INSTALL@%$INSTALL%g
|
|
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
|
|
-fi; done
|
|
-rm -f conftest.subs
|
|
+ # 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 by config.status. */
|
|
+ if test x"$ac_file" = x-; then
|
|
+ configure_input=
|
|
+ else
|
|
+ configure_input="$ac_file. "
|
|
+ fi
|
|
+ configure_input=$configure_input"Generated 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:$LINENO: 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:$LINENO: 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; }
|
|
|
|
+ if test x"$ac_file" != x-; then
|
|
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
+echo "$as_me: creating $ac_file" >&6;}
|
|
+ rm -f "$ac_file"
|
|
+ fi
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<_ACEOF
|
|
+ sed "$ac_vpsub
|
|
+$extrasub
|
|
+_ACEOF
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+:t
|
|
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
|
+s,@configure_input@,$configure_input,;t t
|
|
+s,@srcdir@,$ac_srcdir,;t t
|
|
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
|
|
+s,@top_srcdir@,$ac_top_srcdir,;t t
|
|
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
|
|
+s,@builddir@,$ac_builddir,;t t
|
|
+s,@abs_builddir@,$ac_abs_builddir,;t t
|
|
+s,@top_builddir@,$ac_top_builddir,;t t
|
|
+s,@abs_top_builddir@,$ac_abs_top_builddir,;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
|
|
|
|
-exit 0
|
|
-EOF
|
|
+done
|
|
+_ACEOF
|
|
+
|
|
+cat >>$CONFIG_STATUS <<\_ACEOF
|
|
+
|
|
+{ (exit 0); exit 0; }
|
|
+_ACEOF
|
|
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=:
|
|
+ ac_config_status_args=
|
|
+ test "$silent" = yes &&
|
|
+ ac_config_status_args="$ac_config_status_args --quiet"
|
|
+ exec 5>/dev/null
|
|
+ $SHELL $CONFIG_STATUS $ac_config_status_args || 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
|
|
|
|
--- rcs-5.7.orig/configure.in
|
|
+++ rcs-5.7/configure.in
|
|
@@ -243,7 +243,7 @@
|
|
AC_PATH_PROG(ED, ed, ed)
|
|
|
|
ac_save_path=$PATH
|
|
-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
|
|
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH
|
|
AC_PATH_PROGS(SENDMAIL, sendmail mail mailx)
|
|
PATH=$ac_save_path
|
|
case $SENDMAIL in
|
|
--- rcs-5.7.orig/src/rcs.c
|
|
+++ rcs-5.7/src/rcs.c
|
|
@@ -916,10 +916,11 @@
|
|
getkeystring(Klog);
|
|
if (nextdelta == cuttail) {
|
|
cb = savestring(&curlogbuf);
|
|
- if (!delta->log.string)
|
|
+ if (delta && !delta->log.string)
|
|
delta->log = cleanlogmsg(curlogbuf.string, cb.size);
|
|
nextlex();
|
|
- delta->igtext = getphrases(Ktext);
|
|
+ if (delta)
|
|
+ delta->igtext = getphrases(Ktext);
|
|
} else {
|
|
if (nextdelta->log.string && nextdelta->selector) {
|
|
foutptr = 0;
|
|
--- rcs-5.7.orig/src/rcsfreeze.sh
|
|
+++ rcs-5.7/src/rcsfreeze.sh
|
|
@@ -59,8 +59,7 @@
|
|
|
|
# Stamp the logfile. Because we order the logfile the most recent
|
|
# first we will have to save everything right now in a temporary file.
|
|
-TMPLOG=/tmp/rcsfrz$$
|
|
-trap 'rm -f $TMPLOG; exit 1' 1 2 13 15
|
|
+TMPLOG=$(tempfile)
|
|
# Now ask for a log message, continously add to the log file
|
|
(
|
|
echo "Version: $SYMREVNAME($SYMREV), Date: $DATE
|
|
--- rcs-5.7.orig/src/rcsbase.h
|
|
+++ rcs-5.7/src/rcsbase.h
|
|
@@ -358,6 +358,7 @@
|
|
char const * lockedby; /* who locks the revision */
|
|
char const * state; /* state of revision (Exp by default) */
|
|
char const * name; /* name (if any) by which retrieved */
|
|
+ char const * commitid; /* text string to associate commits */
|
|
struct cbuf log; /* log message requested at checkin */
|
|
struct branchhead * branches; /* list of first revisions on branches*/
|
|
struct cbuf ig; /* ignored phrases in admin part */
|
|
@@ -662,6 +663,7 @@
|
|
extern char const *const expand_names[];
|
|
extern char const
|
|
Kaccess[], Kauthor[], Kbranch[], Kcomment[],
|
|
+ Kcommitid[],
|
|
Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[],
|
|
Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[];
|
|
void unexpected_EOF P((void)) exiting;
|
|
--- rcs-5.7.orig/src/rcssyn.c
|
|
+++ rcs-5.7/src/rcssyn.c
|
|
@@ -171,6 +171,7 @@
|
|
Kauthor[] = "author",
|
|
Kbranch[] = "branch",
|
|
Kcomment[] = "comment",
|
|
+ Kcommitid[] = "commitid",
|
|
Kdate[] = "date",
|
|
Kdesc[] = "desc",
|
|
Kexpand[] = "expand",
|
|
@@ -433,6 +434,14 @@
|
|
Delta->lockedby = 0;
|
|
Delta->log.string = 0;
|
|
Delta->selector = true;
|
|
+
|
|
+ if (getkeyopt(Kcommitid)) {
|
|
+ Delta->commitid = NextString;
|
|
+ nextlex();
|
|
+ getsemi(Kcommitid);
|
|
+ } else
|
|
+ Delta->commitid = NULL;
|
|
+
|
|
Delta->ig = getphrases(Kdesc);
|
|
TotalDeltas++;
|
|
return (true);
|
|
--- rcs-5.7.orig/src/rcsdiff.c
|
|
+++ rcs-5.7/src/rcsdiff.c
|
|
@@ -212,9 +212,13 @@
|
|
}
|
|
goto option_handled;
|
|
case '-': case 'D':
|
|
- no_diff_means_no_output = false;
|
|
+ if (c == 'D'
|
|
+ || strcmp(*argv, "--side-by-side") == 0
|
|
+ || strcmp(*argv, "--ifdef") == 0) {
|
|
+ no_diff_means_no_output = false;
|
|
+ }
|
|
/* fall into */
|
|
- case 'C': case 'F': case 'I': case 'L': case 'W':
|
|
+ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W':
|
|
#if DIFF_L
|
|
if (c == 'L' && ++file_labels == 2)
|
|
faterror("too many -L options");
|
|
--- rcs-5.7.orig/src/ident.c
|
|
+++ rcs-5.7/src/ident.c
|
|
@@ -234,7 +234,7 @@
|
|
if (c == EOF && feof(fp) | ferror(fp))
|
|
return c;
|
|
switch (ctab[c]) {
|
|
- case LETTER: case Letter:
|
|
+ case LETTER: case Letter: case DIGIT:
|
|
*tp++ = c;
|
|
if (tp < line+sizeof(line)-4)
|
|
break;
|
|
--- rcs-5.7.orig/src/conf.sh
|
|
+++ rcs-5.7/src/conf.sh
|
|
@@ -73,17 +73,6 @@
|
|
ech='echo -n' dots='... '
|
|
esac
|
|
|
|
-$ech >&3 "$0: testing permissions $dots"
|
|
-rm -f a.d &&
|
|
-date >a.d &&
|
|
-chmod 0 a.d &&
|
|
-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && {
|
|
- echo >&3 "$n$0: This command should not be run with superuser permissions."
|
|
- exit 1
|
|
-}
|
|
-echo >&3 OK
|
|
-rm -f a.d || exit
|
|
-
|
|
$ech >&3 "$0: testing compiler for plausibility $dots"
|
|
echo 'main() { return 0; }' >a.c
|
|
rm -f a.exe a.out || exit
|
|
--- rcs-5.7.orig/src/rcsgen.c
|
|
+++ rcs-5.7/src/rcsgen.c
|
|
@@ -547,6 +547,9 @@
|
|
|
|
aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:"");
|
|
awrite(node->ig.string, node->ig.size, fout);
|
|
+
|
|
+ if (node->commitid)
|
|
+ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid);
|
|
}
|
|
|
|
|
|
--- rcs-5.7.orig/src/rcsfnms.c
|
|
+++ rcs-5.7/src/rcsfnms.c
|
|
@@ -285,6 +285,9 @@
|
|
{
|
|
char *p;
|
|
char const *t = tpnames[n];
|
|
+# if has_mktemp
|
|
+ int fd;
|
|
+# endif
|
|
|
|
if (t)
|
|
return t;
|
|
@@ -296,10 +299,12 @@
|
|
size_t tplen = dir_useful_len(tp);
|
|
p = testalloc(tplen + 10);
|
|
VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n);
|
|
- if (!mktemp(p) || !*p)
|
|
+ fd = mkstemp(p);
|
|
+ if (fd < 0 || !*p)
|
|
faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'",
|
|
(int)tplen, tp, SLASH, '0'+n
|
|
);
|
|
+ close(fd);
|
|
# else
|
|
static char tpnamebuf[TEMPNAMES][L_tmpnam];
|
|
p = tpnamebuf[n];
|
|
--- rcs-5.7.orig/src/rcsedit.c
|
|
+++ rcs-5.7/src/rcsedit.c
|
|
@@ -1503,6 +1503,9 @@
|
|
register size_t dl;
|
|
register struct buf *bn;
|
|
register char const *name = isworkfile ? workname : RCSname;
|
|
+# if has_mktemp
|
|
+ int fd;
|
|
+# endif
|
|
|
|
dl = basefilename(name) - name;
|
|
bn = &dirtpname[newRCSdirtp_index + isworkfile];
|
|
@@ -1521,10 +1524,12 @@
|
|
catchints();
|
|
# if has_mktemp
|
|
VOID strcpy(tp, "XXXXXX");
|
|
- if (!mktemp(np) || !*np)
|
|
+ fd = mkstemp(np);
|
|
+ if (fd < 0 || !*np)
|
|
faterror("can't make temporary pathname `%.*s_%cXXXXXX'",
|
|
(int)dl, name, '0'+isworkfile
|
|
);
|
|
+ close(fd);
|
|
# else
|
|
/*
|
|
* Posix 1003.1-1990 has no reliable way
|
|
--- rcs-5.7.orig/src/Makefile.in
|
|
+++ rcs-5.7/src/Makefile.in
|
|
@@ -116,16 +116,18 @@
|
|
for p in $(PROGRAMS); do \
|
|
$(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
|
|
done
|
|
+ $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze
|
|
|
|
uninstall ::
|
|
for p in $(PROGRAMS); do \
|
|
$(REMOVE) $(bindir)/$$p; \
|
|
done
|
|
+ $(REMOVE) $(bindir)/rcsfreeze
|
|
|
|
# Install RCS and (if applicable) GNU diff before running these tests.
|
|
# To test RCS before installing it, see the file INSTALL.RCS.
|
|
RCSTEST = \
|
|
- ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \
|
|
+ ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \
|
|
LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
|
|
PATH=$(bindir):$$PATH \
|
|
sh $(srcdir)/rcstest
|
|
@@ -153,7 +155,7 @@
|
|
#(Unix
|
|
conf.h : conf.sh Makefile
|
|
$(REMOVE) a.*
|
|
- ALL_CFLAGS='$(ALL_CFLAGS)' \
|
|
+ ALL_CFLAGS="$(ALL_CFLAGS)" \
|
|
CC='$(CC)' \
|
|
COMPAT2='$(COMPAT2)' \
|
|
DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \
|
|
--- rcs-5.7.orig/src/rlog.c
|
|
+++ rcs-5.7/src/rlog.c
|
|
@@ -591,6 +591,10 @@
|
|
aprintf(out, insDelFormat,
|
|
editscript->insertlns, editscript->deletelns);
|
|
|
|
+ if ( node->commitid )
|
|
+ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "",
|
|
+ node->commitid);
|
|
+
|
|
newbranch = node->branches;
|
|
if ( newbranch ) {
|
|
bufautobegin(&branchnum);
|