Add input-utils (#4009)
[openwrt/svn-archive/archive.git] / utils / rcs / patches / 000-debian.patch
1 --- rcs-5.7.orig/debian/rules
2 +++ rcs-5.7/debian/rules
3 @@ -0,0 +1,91 @@
4 +#!/usr/bin/make -f
5 +# Derived from: Sample debian.rules file - for GNU Hello (1.3).
6 +# Copyright 1994,1995 by Ian Jackson.
7 +# I hereby give you perpetual unlimited permission to copy,
8 +# modify and relicense this file, provided that you do not remove
9 +# my name from the file itself. (I assert my moral right of
10 +# paternity under the Copyright, Designs and Patents Act 1988.)
11 +# This file may have to be extensively modified
12 +
13 +# There used to be `source' and `diff' targets in this file, and many
14 +# packages also had `changes' and `dist' targets. These functions
15 +# have been taken over by dpkg-source, dpkg-genchanges and
16 +# dpkg-buildpackage in a package-independent way, and so these targets
17 +# are obsolete.
18 +
19 +package=rcs
20 +
21 +CFLAGS = -g
22 +
23 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
24 +CFLAGS += -O0
25 +else
26 +CFLAGS += -O2
27 +endif
28 +
29 +# The next section may have to be extensively modified
30 +
31 +build:
32 + $(checkdir)
33 + ./configure --prefix=/usr --with-diffutils
34 + $(MAKE) CFLAGS="$(CFLAGS)"
35 + groff -t -p -Tps -ms rcs.ms >rcs.ps
36 + touch build
37 +
38 +clean:
39 + $(checkdir)
40 + -rm -f build
41 + [ ! -f Makefile ] || $(MAKE) -i distclean
42 + -rm -f *.ps man/index.db man/rcsfile.5
43 + -rm -rf debian/tmp debian/*~ debian/files autom4te.cache \
44 + debian/substvars
45 +
46 +binary-indep: checkroot build
47 + $(checkdir)
48 +# There are no architecture-independent files to be uploaded
49 +# generated by this package. If there were any they would be
50 +# made here.
51 +
52 +binary-arch: checkroot build
53 + -rm -rf debian/tmp
54 + install -d debian/tmp/DEBIAN
55 + install -d debian/tmp/usr/share/doc/$(package)
56 + $(MAKE) prefix=`pwd`/debian/tmp/usr install
57 +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
58 + for f in debian/tmp/usr/bin/*; do \
59 + strip -s -R.comment $$f; \
60 + done
61 +endif
62 + cp debian/copyright debian/tmp/usr/share/doc/$(package)/
63 + cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
64 + cp ChangeLog debian/tmp/usr/share/doc/$(package)/changelog
65 + gzip -9f debian/tmp/usr/share/doc/$(package)/changelog*
66 + cp *.ps debian/tmp/usr/share/doc/$(package)/
67 + gzip -9f debian/tmp/usr/share/doc/$(package)/*.ps
68 + mv debian/tmp/usr/man debian/tmp/usr/share/man
69 + gzip -9f debian/tmp/usr/share/man/man*/*
70 + (cd debian/tmp; find . -type f ! -regex '.*/DEBIAN/.*' \
71 + -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums)
72 + dpkg-shlibdeps src/rcs
73 + dpkg-gencontrol -isp
74 + chown -R root.root debian/tmp
75 + chmod -R u+w debian/tmp
76 + chmod -R g-ws debian/tmp
77 + dpkg --build debian/tmp ..
78 +
79 +define checkdir
80 + test -f man/rcs.1
81 +endef
82 +
83 +# Below here is fairly generic really
84 +
85 +binary: binary-indep binary-arch
86 +
87 +source diff:
88 + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
89 +
90 +checkroot:
91 + $(checkdir)
92 + test root = "`whoami`"
93 +
94 +.PHONY: binary binary-arch binary-indep clean checkroot
95 --- rcs-5.7.orig/debian/control
96 +++ rcs-5.7/debian/control
97 @@ -0,0 +1,16 @@
98 +Source: rcs
99 +Section: devel
100 +Priority: optional
101 +Maintainer: Romain Francoise <rfrancoise@debian.org>
102 +Standards-Version: 3.7.2
103 +Build-Depends: groff, autoconf
104 +
105 +Package: rcs
106 +Architecture: any
107 +Depends: ${shlibs:Depends}
108 +Description: The GNU Revision Control System
109 + The Revision Control System (RCS) manages multiple
110 + revisions of files. RCS automates the storing, retrieval,
111 + logging, identification, and merging of revisions. RCS is
112 + useful for text that is revised frequently, for example
113 + programs, documentation, graphics, papers, and form letters.
114 --- rcs-5.7.orig/debian/copyright
115 +++ rcs-5.7/debian/copyright
116 @@ -0,0 +1,28 @@
117 +This is Debian GNU/Linux's prepackaged version of the FSF's Revision
118 +Control System (RCS) utilities. These utilities allow you to keep
119 +multiple revisions of one or more files in a very compact manner. RCS
120 +is similar to, and in most respects better than, the non-free Source
121 +Code Control System (SCCS).
122 +
123 +This package was assembled by Sven Rudolph <sr1@inf.tu-dresden.de>
124 +from the GNU sources available from prep.ai.mit.edu (and its numerous
125 +mirrors) as /pub/gnu/rcs-5.7.tar.gz. It is currently maintained by
126 +Romain Francoise <rfrancoise@debian.org>.
127 +
128 +The upstream URL is: http://www.gnu.org/software/rcs/
129 +
130 +Copyright (C) 1991,1992,1993 Free Software Foundation, Inc.
131 +
132 +RCS is free software; you can redistribute it and/or modify
133 +it under the terms of the GNU General Public License as published by
134 +the Free Software Foundation; either version 2, or (at your option)
135 +any later version.
136 +
137 +RCS is distributed in the hope that it will be useful,
138 +but WITHOUT ANY WARRANTY; without even the implied warranty of
139 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
140 +GNU General Public License for more details.
141 +
142 +On Debian GNU/Linux systems, the complete text of the GNU General
143 +Public License can be found in `/usr/share/common-licenses/GPL'.
144 +
145 --- rcs-5.7.orig/debian/changelog
146 +++ rcs-5.7/debian/changelog
147 @@ -0,0 +1,216 @@
148 +rcs (5.7-20) unstable; urgency=low
149 +
150 + * debian/control: Add support for DEB_BUILD_OPTIONS (closes: #437885).
151 +
152 + -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Aug 2007 21:24:54 +0200
153 +
154 +rcs (5.7-19) unstable; urgency=low
155 +
156 + * debian/control: Bump Standards-Version to 3.7.2, no changes needed.
157 + * debian/copyright: Mention the current upstream URL (closes: #436739).
158 + * debian/rules:
159 + + Don't ignore errors from 'make distclean'.
160 + + Generate DEBIAN/md5sums.
161 + * Apply patch from Brendan O'Dea <bod@debian.org> adding support for
162 + diff's '-U' option to rcsdiff (closes: #428445).
163 +
164 + -- Romain Francoise <rfrancoise@debian.org> Sun, 12 Aug 2007 18:40:04 +0200
165 +
166 +rcs (5.7-18) unstable; urgency=low
167 +
168 + * Apply patch from Mark D. Baushke <mdb@gnu.org> adding support for the
169 + new 'commitid' phrase used by newer version of CVS and CVSNT. Note
170 + that this patch does not include support for *generating* the ids at
171 + check in time; it only makes RCS recognize them (closes: #352527).
172 +
173 + -- Romain Francoise <rfrancoise@debian.org> Tue, 14 Feb 2006 22:41:33 +0100
174 +
175 +rcs (5.7-17) unstable; urgency=low
176 +
177 + * Apply patch from Aaron S. Hawley making the diff strategy of rcsdiff a
178 + bit more subtle: previously rcsdiff considered any long option as a
179 + case where diff(1) can produce output when the revisions are
180 + identical, when in fact it is only the case if either the
181 + --side-by-side or --ifdef options are used (closes: #334004).
182 +
183 + * Patch man/co.1 to not use 'asteriskmath', thanks to LI Daobing
184 + (closes: #345507).
185 +
186 + * debian/control: Bump Standards-Version to 3.6.2.2, no changes needed.
187 + * debian/changelog: Change formatting of entries from 1995 and 1996 to
188 + avoid lintian warnings.
189 + * debian/rules: `install' no longer strips .comment sections from
190 + binaries (since version 5.93-1), so revert previous fix and strip these
191 + sections manually.
192 +
193 + -- Romain Francoise <rfrancoise@debian.org> Sun, 5 Feb 2006 16:34:21 +0100
194 +
195 +rcs (5.7-16) unstable; urgency=low
196 +
197 + * Tenth anniversary release: RCS 5.7 was released on June 16th, 1995.
198 +
199 + * rcs.c: Check delta pointer in scanlogtext() before dereferencing it to
200 + prevent a segmentation fault in some rare cases (discovered while
201 + investigating #69193).
202 +
203 + * Ship docs in PostScript format (instead of DVI). Drop the ``Functions
204 + of RCS'' paper since it's quite obsolete nowadays.
205 +
206 + * debian/rules: Delete substvars file in clean target.
207 + * debian/changelog: Facelift previous entry.
208 +
209 + -- Romain Francoise <rfrancoise@debian.org> Thu, 16 Jun 2005 08:14:01 +0200
210 +
211 +rcs (5.7-15) unstable; urgency=low
212 +
213 + * Adopting this package with Mark's blessing.
214 + * debian/control:
215 + + Bump Standard-Version to 3.6.1.0.
216 + + Update maintainer contact info.
217 + * debian/copyright: Ditto.
218 + * debian/rules:
219 + + Adjust CFLAGS to include -g and remove useless -I directive.
220 + + Remove LDFLAGS.
221 +
222 + * Patch upstream Makefile.in to use install -s (which has the nice
223 + effect of also deleting .comment sections from the binaries).
224 +
225 + * Patch man/rlog.1 to document option -q which does nothing, it's
226 + provided for consistency with other commands (closes: #69257).
227 +
228 + * Remove a few unneeded files from the Debian diff (.orig files, Emacs
229 + lock files).
230 +
231 + -- Romain Francoise <rfrancoise@debian.org> Wed, 11 May 2005 17:51:01 +0200
232 +
233 +rcs (5.7-14) unstable; urgency=high
234 +
235 + * Fixes tmp file race (patch from OpenBSD) (Closes: #291542)
236 +
237 + -- Mark Baker <mark@mnb.org.uk> Fri, 21 Jan 2005 18:16:20 +0000
238 +
239 +rcs (5.7-13.3) unstable; urgency=high
240 +
241 + * NMU
242 + * Add build-dep on autoconf. Closes: #246566.
243 + * Fix up quoting in src/Makefile.in to make $SHELL not complain, as \"
244 + is not interpolated inside single-quoted strings.
245 + * Make ident accept numbers as well as letters in identifiers.
246 + Closes: #157891
247 + * Remove emacs variables from the changelog as they are no longer
248 + needed.
249 + * Add -isp to the dpkg-gencontrol call in debian/rules to get Section
250 + and Priority included. Closes: #190383.
251 +
252 + -- Tollef Fog Heen <tfheen@debian.org> Thu, 29 Jul 2004 19:09:32 +0200
253 +
254 +rcs (5.7-13.2) unstable; urgency=low
255 +
256 + * NMU
257 + * can build now as root. Closes: #249106
258 + * priority dumped down to optional. Closes: #64438
259 + * fixed spelling error in debian/copyright, and location of the GPL.
260 +
261 + -- Andreas Barth <aba@not.so.argh.org> Wed, 26 May 2004 22:21:05 +0200
262 +
263 +rcs (5.7-13.1) unstable; urgency=low
264 +
265 + * NMU.
266 + * Rebuild so that the .dsc file will have Build-Depends.
267 + Closes: #187853, #176344.
268 + * Remove /usr/doc symlink.
269 +
270 + -- Daniel Schepler <schepler@debian.org> Mon, 28 Jul 2003 16:28:32 -0700
271 +
272 +rcs (5.7-13) unstable; urgency=low
273 +
274 + * debian/rules: install docs and manpages in /usr/share, as in FHS
275 + * debian/control: standards version 3.1.0
276 + * debian/rules: format docs into dvi instead of leaving groff source. I
277 + chose dvi as it is easier to view on screen than PS (Closes: 42277)
278 +
279 + -- Mark Baker <mbaker@iee.org> Sun, 28 Nov 1999 18:31:21 +0000
280 +
281 +rcs (5.7-12) unstable; urgency=low
282 +
283 + * man/Makefile: use sed filter to fix .lf requests on output of pic,
284 + so zsoelim doesn't complain about them (#26150)
285 + * debian/rules: clean target deletes rcsfile.5 so it is always rebuilt
286 + using fix above
287 +
288 + -- Mark Baker <mbaker@iee.org> Mon, 5 Jul 1999 23:24:17 +0100
289 +
290 +rcs (5.7-11) unstable; urgency=low
291 +
292 + * Fixed temp file security hole in rcsfreeze script (#27845)
293 +
294 + -- Mark Baker <mbaker@iee.org> Wed, 14 Oct 1998 22:43:47 +0100
295 +
296 +rcs (5.7-10) unstable; urgency=low
297 +
298 + * Included rcsfreeze script (#26743)
299 +
300 + -- Mark Baker <mbaker@iee.org> Wed, 16 Sep 1998 20:57:00 +0000
301 +
302 +rcs (5.7-9) unstable; urgency=low
303 +
304 + * Fixed permissions
305 +
306 + -- Mark Baker <mbaker@iee.org> Mon, 16 Feb 1998 00:07:52 +0000
307 +
308 +rcs (5.7-8) unstable; urgency=low
309 +
310 + * Updated standards-version to 2.4.0.0 (no changes)
311 +
312 + -- Mark Baker <mbaker@iee.org> Tue, 10 Feb 1998 10:54:36 +0000
313 +
314 +rcs (5.7-7) unstable; urgency=low
315 +
316 + * Corrected maintainer field in debian/control
317 + * Flushed configure cache and recompiled, to fix bug #11305/#11308)
318 +
319 + -- Mark Baker <mbaker@iee.org> Thu, 17 Jul 1997 10:54:36 +0100
320 +
321 +rcs (5.7-6) unstable; urgency=low
322 +
323 + * Renamed changelog.upstream to changelog, as per policy (fixes #9657)
324 +
325 + -- Mark Baker <mbaker@iee.org> Sat, 12 Jul 1997 16:55:37 +0100
326 +
327 +rcs (5.7-5) unstable; urgency=low
328 +
329 + * New maintainer
330 + * Compiled with libc6
331 + * Use canonical path for sendmail (configure.in changed)
332 +
333 + -- Mark Baker <mbaker@iee.org> Fri, 11 Jul 1997 21:24:48 +0100
334 +
335 +rcs (5.7-4) unstable; urgency=low
336 +
337 + * Updated to Standards-Version 2.1.2.2.
338 +
339 + -- Sven Rudolph <sr1@inf.tu-dresden.de> Sun, 26 Jan 1997 22:34:57 +0100
340 +
341 +rcs (5.7-3) unstable; urgency=low
342 +
343 + * debian.rules: added multi-architecture support
344 +
345 + * debian.control: added Priority: and Section:
346 +
347 + * debian.control: corrected extended description (Bug#3619)
348 +
349 + -- Sven Rudolph <sr1@inf.tu-dresden.de> Wed, 24 Jul 1996 23:48:20 +0100
350 +
351 +rcs (5.7-2) unstable; urgency=low
352 +
353 + * rebuilt for elf
354 +
355 + -- Sven Rudolph <sr1@inf.tu-dresden.de> Thu, 23 Nov 1995 23:27:13 +0100
356 +
357 +rcs (5.7-1) unstable; urgency=low
358 +
359 + * created new Debian GNU/Linux package maintenance system files
360 + * updated from rcs5.6.0.1 to rcs-5.7
361 + * received this package from Robert Sanders <Robert.Sanders@linux.org>
362 +
363 + -- Sven Rudolph <sr1@inf.tu-dresden.de> Tue, 5 Sep 1995 04:38:07 +0100
364 --- rcs-5.7.orig/man/co.1
365 +++ rcs-5.7/man/co.1
366 @@ -597,7 +597,7 @@
367 .RB \*(lq "//\ " \*(rq.
368 This is useful for languages with comments that go to the end of the line.
369 The convention for other languages is to use a
370 -.RB \*(lq " \(** " \(rq
371 +.RB \*(lq " * " \(rq
372 prefix inside a multiline comment.
373 For example, the initial log comment of a C program
374 conventionally is of the following form:
375 @@ -606,19 +606,19 @@
376 .nf
377 .ft 3
378 .ne 3
379 -/\(**
380 +/*
381 .in +\w'/'u
382 -\(** $\&Log$
383 -\(**/
384 +* $\&Log$
385 +*/
386 .in
387 .ft
388 .fi
389 .RE
390 .LP
391 For backwards compatibility with older versions of \*r, if the log prefix is
392 -.B /\(**
393 +.B /*
394 or
395 -.B (\(**
396 +.B (*
397 surrounded by optional white space, inserted log lines contain a space
398 instead of
399 .B /
400 --- rcs-5.7.orig/man/rlog.1
401 +++ rcs-5.7/man/rlog.1
402 @@ -187,6 +187,10 @@
403 .I logins
404 is omitted, the user's login is assumed.
405 .TP
406 +.B \-q
407 +This option has no effect;
408 +it is provided for consistency with other commands.
409 +.TP
410 .B \-T
411 This option has no effect;
412 it is present for compatibility with other \*r commands.
413 --- rcs-5.7.orig/man/rcsfile.5in
414 +++ rcs-5.7/man/rcsfile.5in
415 @@ -68,6 +68,7 @@
416 \f3state\fP {\f2id\fP}\f3;\fP
417 \f3branches\fP {\f2num\fP}*\f3;\fP
418 \f3next\fP {\f2num\fP}\f3;\fP
419 + { \f3commitid\fP \f2id\fP\f3;\fP }
420 { \f2newphrase\fP }*
421 .LP
422 \f2desc\fP ::= \f3desc\fP \f2string\fP
423 @@ -127,6 +128,18 @@
424 Dates use the Gregorian calendar; times use UTC.
425 .PP
426 The
427 +.I commitid
428 +is followed by an
429 +.I id
430 +token. This token is intended to be unique across
431 +multiple files and is used to help group files as
432 +being a part of the same logical commit.
433 +This token must uniquely identify the commit
434 +operation that was applied to a set of RCS files.
435 +In particular, it must be unique among all the
436 +commitids in this file.
437 +.PP
438 +The
439 .I newphrase
440 productions in the grammar are reserved for future extensions
441 to the format of \*r files.
442 --- rcs-5.7.orig/man/Makefile.in
443 +++ rcs-5.7/man/Makefile.in
444 @@ -44,14 +44,16 @@
445 all default :: rcsfile.5
446
447 rcsfile.5 : rcsfile.5in
448 - $(PIC) $(PICFLAGS) $(srcdir)/$@in >$@
449 + $(PIC) $(PICFLAGS) $(srcdir)/$@in \
450 + | sed "s%\.lf \([0-9]*\)%\.lf \1 foo%" >$@
451
452 check dvi info TAGS ::
453
454 installdirs :: ../mkinstalldirs
455 -$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
456
457 -man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
458 +man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog \
459 + rcsfreeze
460
461 install :: installdirs
462 -for m in $(man1pages); do \
463 --- rcs-5.7.orig/configure
464 +++ rcs-5.7/configure
465 @@ -1,28 +1,288 @@
466 #! /bin/sh
467 -
468 # Guess values for system-dependent variables and create Makefiles.
469 -# Generated automatically using autoconf version 2.4
470 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
471 +# Generated by GNU Autoconf 2.59.
472 #
473 +# Copyright (C) 2003 Free Software Foundation, Inc.
474 # This configure script is free software; the Free Software Foundation
475 # gives unlimited permission to copy, distribute and modify it.
476 +## --------------------- ##
477 +## M4sh Initialization. ##
478 +## --------------------- ##
479 +
480 +# Be Bourne compatible
481 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
482 + emulate sh
483 + NULLCMD=:
484 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
485 + # is contrary to our usage. Disable this feature.
486 + alias -g '${1+"$@"}'='"$@"'
487 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
488 + set -o posix
489 +fi
490 +DUALCASE=1; export DUALCASE # for MKS sh
491 +
492 +# Support unset when possible.
493 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
494 + as_unset=unset
495 +else
496 + as_unset=false
497 +fi
498 +
499 +
500 +# Work around bugs in pre-3.0 UWIN ksh.
501 +$as_unset ENV MAIL MAILPATH
502 +PS1='$ '
503 +PS2='> '
504 +PS4='+ '
505 +
506 +# NLS nuisances.
507 +for as_var in \
508 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
509 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
510 + LC_TELEPHONE LC_TIME
511 +do
512 + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
513 + eval $as_var=C; export $as_var
514 + else
515 + $as_unset $as_var
516 + fi
517 +done
518 +
519 +# Required to use basename.
520 +if expr a : '\(a\)' >/dev/null 2>&1; then
521 + as_expr=expr
522 +else
523 + as_expr=false
524 +fi
525 +
526 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
527 + as_basename=basename
528 +else
529 + as_basename=false
530 +fi
531 +
532 +
533 +# Name of the executable.
534 +as_me=`$as_basename "$0" ||
535 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
536 + X"$0" : 'X\(//\)$' \| \
537 + X"$0" : 'X\(/\)$' \| \
538 + . : '\(.\)' 2>/dev/null ||
539 +echo X/"$0" |
540 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
541 + /^X\/\(\/\/\)$/{ s//\1/; q; }
542 + /^X\/\(\/\).*/{ s//\1/; q; }
543 + s/.*/./; q'`
544 +
545 +
546 +# PATH needs CR, and LINENO needs CR and PATH.
547 +# Avoid depending upon Character Ranges.
548 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
549 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
550 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
551 +as_cr_digits='0123456789'
552 +as_cr_alnum=$as_cr_Letters$as_cr_digits
553 +
554 +# The user is always right.
555 +if test "${PATH_SEPARATOR+set}" != set; then
556 + echo "#! /bin/sh" >conf$$.sh
557 + echo "exit 0" >>conf$$.sh
558 + chmod +x conf$$.sh
559 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
560 + PATH_SEPARATOR=';'
561 + else
562 + PATH_SEPARATOR=:
563 + fi
564 + rm -f conf$$.sh
565 +fi
566 +
567 +
568 + as_lineno_1=$LINENO
569 + as_lineno_2=$LINENO
570 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
571 + test "x$as_lineno_1" != "x$as_lineno_2" &&
572 + test "x$as_lineno_3" = "x$as_lineno_2" || {
573 + # Find who we are. Look in the path if we contain no path at all
574 + # relative or not.
575 + case $0 in
576 + *[\\/]* ) as_myself=$0 ;;
577 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
578 +for as_dir in $PATH
579 +do
580 + IFS=$as_save_IFS
581 + test -z "$as_dir" && as_dir=.
582 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
583 +done
584 +
585 + ;;
586 + esac
587 + # We did not find ourselves, most probably we were run as `sh COMMAND'
588 + # in which case we are not to be found in the path.
589 + if test "x$as_myself" = x; then
590 + as_myself=$0
591 + fi
592 + if test ! -f "$as_myself"; then
593 + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
594 + { (exit 1); exit 1; }; }
595 + fi
596 + case $CONFIG_SHELL in
597 + '')
598 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
599 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
600 +do
601 + IFS=$as_save_IFS
602 + test -z "$as_dir" && as_dir=.
603 + for as_base in sh bash ksh sh5; do
604 + case $as_dir in
605 + /*)
606 + if ("$as_dir/$as_base" -c '
607 + as_lineno_1=$LINENO
608 + as_lineno_2=$LINENO
609 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
610 + test "x$as_lineno_1" != "x$as_lineno_2" &&
611 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
612 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
613 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
614 + CONFIG_SHELL=$as_dir/$as_base
615 + export CONFIG_SHELL
616 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
617 + fi;;
618 + esac
619 + done
620 +done
621 +;;
622 + esac
623 +
624 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
625 + # uniformly replaced by the line number. The first 'sed' inserts a
626 + # line-number line before each line; the second 'sed' does the real
627 + # work. The second script uses 'N' to pair each line-number line
628 + # with the numbered line, and appends trailing '-' during
629 + # substitution so that $LINENO is not a special case at line end.
630 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
631 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
632 + sed '=' <$as_myself |
633 + sed '
634 + N
635 + s,$,-,
636 + : loop
637 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
638 + t loop
639 + s,-$,,
640 + s,^['$as_cr_digits']*\n,,
641 + ' >$as_me.lineno &&
642 + chmod +x $as_me.lineno ||
643 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
644 + { (exit 1); exit 1; }; }
645 +
646 + # Don't try to exec as it changes $[0], causing all sort of problems
647 + # (the dirname of $[0] is not the place where we might find the
648 + # original and so on. Autoconf is especially sensible to this).
649 + . ./$as_me.lineno
650 + # Exit status is that of the last command.
651 + exit
652 +}
653 +
654 +
655 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
656 + *c*,-n*) ECHO_N= ECHO_C='
657 +' ECHO_T=' ' ;;
658 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
659 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
660 +esac
661 +
662 +if expr a : '\(a\)' >/dev/null 2>&1; then
663 + as_expr=expr
664 +else
665 + as_expr=false
666 +fi
667 +
668 +rm -f conf$$ conf$$.exe conf$$.file
669 +echo >conf$$.file
670 +if ln -s conf$$.file conf$$ 2>/dev/null; then
671 + # We could just check for DJGPP; but this test a) works b) is more generic
672 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
673 + if test -f conf$$.exe; then
674 + # Don't use ln at all; we don't have any links
675 + as_ln_s='cp -p'
676 + else
677 + as_ln_s='ln -s'
678 + fi
679 +elif ln conf$$.file conf$$ 2>/dev/null; then
680 + as_ln_s=ln
681 +else
682 + as_ln_s='cp -p'
683 +fi
684 +rm -f conf$$ conf$$.exe conf$$.file
685 +
686 +if mkdir -p . 2>/dev/null; then
687 + as_mkdir_p=:
688 +else
689 + test -d ./-p && rmdir ./-p
690 + as_mkdir_p=false
691 +fi
692 +
693 +as_executable_p="test -f"
694 +
695 +# Sed expression to map a string onto a valid CPP name.
696 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
697 +
698 +# Sed expression to map a string onto a valid variable name.
699 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
700 +
701 +
702 +# IFS
703 +# We need space, tab and new line, in precisely that order.
704 +as_nl='
705 +'
706 +IFS=" $as_nl"
707 +
708 +# CDPATH.
709 +$as_unset CDPATH
710
711 -# Defaults:
712 -ac_help=
713 +
714 +# Name of the host.
715 +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
716 +# so uname gets run too.
717 +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
718 +
719 +exec 6>&1
720 +
721 +#
722 +# Initializations.
723 +#
724 ac_default_prefix=/usr/local
725 -# Any additions from configure.in:
726 -ac_help="$ac_help
727 - --with-diffutils assume GNU diffutils is similarly installed"
728 +ac_config_libobj_dir=.
729 +cross_compiling=no
730 +subdirs=
731 +MFLAGS=
732 +MAKEFLAGS=
733 +SHELL=${CONFIG_SHELL-/bin/sh}
734 +
735 +# Maximum number of lines to put in a shell here document.
736 +# This variable seems obsolete. It should probably be removed, and
737 +# only ac_max_sed_lines should be used.
738 +: ${ac_max_here_lines=38}
739 +
740 +# Identity of this package.
741 +PACKAGE_NAME=
742 +PACKAGE_TARNAME=
743 +PACKAGE_VERSION=
744 +PACKAGE_STRING=
745 +PACKAGE_BUGREPORT=
746 +
747 +ac_unique_file="src/rcsbase.h"
748 +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'
749 +ac_subst_files=''
750
751 # Initialize some variables set by options.
752 +ac_init_help=
753 +ac_init_version=false
754 # The variables have the same names as the options, with
755 # dashes changed to underlines.
756 -build=NONE
757 -cache_file=./config.cache
758 +cache_file=/dev/null
759 exec_prefix=NONE
760 -host=NONE
761 no_create=
762 -nonopt=NONE
763 no_recursion=
764 prefix=NONE
765 program_prefix=NONE
766 @@ -31,18 +291,31 @@
767 silent=
768 site=
769 srcdir=
770 -target=NONE
771 verbose=
772 x_includes=NONE
773 x_libraries=NONE
774
775 -# Initialize some other variables.
776 -subdirs=
777 +# Installation directory options.
778 +# These are left unexpanded so users can "make install exec_prefix=/foo"
779 +# and all the variables that are supposed to be based on exec_prefix
780 +# by default will actually change.
781 +# Use braces instead of parens because sh, perl, etc. also accept them.
782 +bindir='${exec_prefix}/bin'
783 +sbindir='${exec_prefix}/sbin'
784 +libexecdir='${exec_prefix}/libexec'
785 +datadir='${prefix}/share'
786 +sysconfdir='${prefix}/etc'
787 +sharedstatedir='${prefix}/com'
788 +localstatedir='${prefix}/var'
789 +libdir='${exec_prefix}/lib'
790 +includedir='${prefix}/include'
791 +oldincludedir='/usr/include'
792 +infodir='${prefix}/info'
793 +mandir='${prefix}/man'
794
795 ac_prev=
796 for ac_option
797 do
798 -
799 # If the previous option needs an argument, assign it.
800 if test -n "$ac_prev"; then
801 eval "$ac_prev=\$ac_option"
802 @@ -50,48 +323,59 @@
803 continue
804 fi
805
806 - case "$ac_option" in
807 - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
808 - *) ac_optarg= ;;
809 - esac
810 + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
811
812 # Accept the important Cygnus configure options, so we can diagnose typos.
813
814 - case "$ac_option" in
815 + case $ac_option in
816
817 - -build | --build | --buil | --bui | --bu | --b)
818 - ac_prev=build ;;
819 - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
820 - build="$ac_optarg" ;;
821 + -bindir | --bindir | --bindi | --bind | --bin | --bi)
822 + ac_prev=bindir ;;
823 + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
824 + bindir=$ac_optarg ;;
825 +
826 + -build | --build | --buil | --bui | --bu)
827 + ac_prev=build_alias ;;
828 + -build=* | --build=* | --buil=* | --bui=* | --bu=*)
829 + build_alias=$ac_optarg ;;
830
831 -cache-file | --cache-file | --cache-fil | --cache-fi \
832 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
833 ac_prev=cache_file ;;
834 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
835 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
836 - cache_file="$ac_optarg" ;;
837 + cache_file=$ac_optarg ;;
838 +
839 + --config-cache | -C)
840 + cache_file=config.cache ;;
841 +
842 + -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
843 + ac_prev=datadir ;;
844 + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
845 + | --da=*)
846 + datadir=$ac_optarg ;;
847
848 -disable-* | --disable-*)
849 - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
850 + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
851 # Reject names that are not valid shell variable names.
852 - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
853 - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
854 - fi
855 - ac_feature=`echo $ac_feature| sed 's/-/_/g'`
856 - eval "enable_${ac_feature}=no" ;;
857 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
858 + { echo "$as_me: error: invalid feature name: $ac_feature" >&2
859 + { (exit 1); exit 1; }; }
860 + ac_feature=`echo $ac_feature | sed 's/-/_/g'`
861 + eval "enable_$ac_feature=no" ;;
862
863 -enable-* | --enable-*)
864 - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
865 + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
866 # Reject names that are not valid shell variable names.
867 - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
868 - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
869 - fi
870 - ac_feature=`echo $ac_feature| sed 's/-/_/g'`
871 - case "$ac_option" in
872 - *=*) ;;
873 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
874 + { echo "$as_me: error: invalid feature name: $ac_feature" >&2
875 + { (exit 1); exit 1; }; }
876 + ac_feature=`echo $ac_feature | sed 's/-/_/g'`
877 + case $ac_option in
878 + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
879 *) ac_optarg=yes ;;
880 esac
881 - eval "enable_${ac_feature}='$ac_optarg'" ;;
882 + eval "enable_$ac_feature='$ac_optarg'" ;;
883
884 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
885 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
886 @@ -100,83 +384,101 @@
887 -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
888 | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
889 | --exec=* | --exe=* | --ex=*)
890 - exec_prefix="$ac_optarg" ;;
891 + exec_prefix=$ac_optarg ;;
892
893 -gas | --gas | --ga | --g)
894 # Obsolete; use --with-gas.
895 with_gas=yes ;;
896
897 - -help | --help | --hel | --he)
898 - # Omit some internal or obsolete options to make the list less imposing.
899 - # This message is too long to be a string in the A/UX 3.1 sh.
900 - cat << EOF
901 -Usage: configure [options] [host]
902 -Options: [defaults in brackets after descriptions]
903 -Configuration:
904 - --cache-file=FILE cache test results in FILE
905 - --help print this message
906 - --no-create do not create output files
907 - --quiet, --silent do not print \`checking...' messages
908 - --version print the version of autoconf that created configure
909 -Directory and file names:
910 - --prefix=PREFIX install architecture-independent files in PREFIX
911 - [$ac_default_prefix]
912 - --exec-prefix=PREFIX install architecture-dependent files in PREFIX
913 - [same as prefix]
914 - --srcdir=DIR find the sources in DIR [configure dir or ..]
915 - --program-prefix=PREFIX prepend PREFIX to installed program names
916 - --program-suffix=SUFFIX append SUFFIX to installed program names
917 - --program-transform-name=PROGRAM run sed PROGRAM on installed program names
918 -Host type:
919 - --build=BUILD configure for building on BUILD [BUILD=HOST]
920 - --host=HOST configure for HOST [guessed]
921 - --target=TARGET configure for TARGET [TARGET=HOST]
922 -Features and packages:
923 - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
924 - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
925 - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
926 - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
927 - --x-includes=DIR X include files are in DIR
928 - --x-libraries=DIR X library files are in DIR
929 ---enable and --with options recognized:$ac_help
930 -EOF
931 - exit 0 ;;
932 + -help | --help | --hel | --he | -h)
933 + ac_init_help=long ;;
934 + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
935 + ac_init_help=recursive ;;
936 + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
937 + ac_init_help=short ;;
938
939 -host | --host | --hos | --ho)
940 - ac_prev=host ;;
941 + ac_prev=host_alias ;;
942 -host=* | --host=* | --hos=* | --ho=*)
943 - host="$ac_optarg" ;;
944 + host_alias=$ac_optarg ;;
945 +
946 + -includedir | --includedir | --includedi | --included | --include \
947 + | --includ | --inclu | --incl | --inc)
948 + ac_prev=includedir ;;
949 + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
950 + | --includ=* | --inclu=* | --incl=* | --inc=*)
951 + includedir=$ac_optarg ;;
952 +
953 + -infodir | --infodir | --infodi | --infod | --info | --inf)
954 + ac_prev=infodir ;;
955 + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
956 + infodir=$ac_optarg ;;
957 +
958 + -libdir | --libdir | --libdi | --libd)
959 + ac_prev=libdir ;;
960 + -libdir=* | --libdir=* | --libdi=* | --libd=*)
961 + libdir=$ac_optarg ;;
962 +
963 + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
964 + | --libexe | --libex | --libe)
965 + ac_prev=libexecdir ;;
966 + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
967 + | --libexe=* | --libex=* | --libe=*)
968 + libexecdir=$ac_optarg ;;
969 +
970 + -localstatedir | --localstatedir | --localstatedi | --localstated \
971 + | --localstate | --localstat | --localsta | --localst \
972 + | --locals | --local | --loca | --loc | --lo)
973 + ac_prev=localstatedir ;;
974 + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
975 + | --localstate=* | --localstat=* | --localsta=* | --localst=* \
976 + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
977 + localstatedir=$ac_optarg ;;
978 +
979 + -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
980 + ac_prev=mandir ;;
981 + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
982 + mandir=$ac_optarg ;;
983
984 -nfp | --nfp | --nf)
985 # Obsolete; use --without-fp.
986 with_fp=no ;;
987
988 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
989 - | --no-cr | --no-c)
990 + | --no-cr | --no-c | -n)
991 no_create=yes ;;
992
993 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
994 | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
995 no_recursion=yes ;;
996
997 + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
998 + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
999 + | --oldin | --oldi | --old | --ol | --o)
1000 + ac_prev=oldincludedir ;;
1001 + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
1002 + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
1003 + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
1004 + oldincludedir=$ac_optarg ;;
1005 +
1006 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
1007 ac_prev=prefix ;;
1008 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
1009 - prefix="$ac_optarg" ;;
1010 + prefix=$ac_optarg ;;
1011
1012 -program-prefix | --program-prefix | --program-prefi | --program-pref \
1013 | --program-pre | --program-pr | --program-p)
1014 ac_prev=program_prefix ;;
1015 -program-prefix=* | --program-prefix=* | --program-prefi=* \
1016 | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
1017 - program_prefix="$ac_optarg" ;;
1018 + program_prefix=$ac_optarg ;;
1019
1020 -program-suffix | --program-suffix | --program-suffi | --program-suff \
1021 | --program-suf | --program-su | --program-s)
1022 ac_prev=program_suffix ;;
1023 -program-suffix=* | --program-suffix=* | --program-suffi=* \
1024 | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
1025 - program_suffix="$ac_optarg" ;;
1026 + program_suffix=$ac_optarg ;;
1027
1028 -program-transform-name | --program-transform-name \
1029 | --program-transform-nam | --program-transform-na \
1030 @@ -193,55 +495,78 @@
1031 | --program-transfo=* | --program-transf=* \
1032 | --program-trans=* | --program-tran=* \
1033 | --progr-tra=* | --program-tr=* | --program-t=*)
1034 - program_transform_name="$ac_optarg" ;;
1035 + program_transform_name=$ac_optarg ;;
1036
1037 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1038 | -silent | --silent | --silen | --sile | --sil)
1039 silent=yes ;;
1040
1041 + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1042 + ac_prev=sbindir ;;
1043 + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
1044 + | --sbi=* | --sb=*)
1045 + sbindir=$ac_optarg ;;
1046 +
1047 + -sharedstatedir | --sharedstatedir | --sharedstatedi \
1048 + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
1049 + | --sharedst | --shareds | --shared | --share | --shar \
1050 + | --sha | --sh)
1051 + ac_prev=sharedstatedir ;;
1052 + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
1053 + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
1054 + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
1055 + | --sha=* | --sh=*)
1056 + sharedstatedir=$ac_optarg ;;
1057 +
1058 -site | --site | --sit)
1059 ac_prev=site ;;
1060 -site=* | --site=* | --sit=*)
1061 - site="$ac_optarg" ;;
1062 + site=$ac_optarg ;;
1063
1064 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
1065 ac_prev=srcdir ;;
1066 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
1067 - srcdir="$ac_optarg" ;;
1068 + srcdir=$ac_optarg ;;
1069 +
1070 + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
1071 + | --syscon | --sysco | --sysc | --sys | --sy)
1072 + ac_prev=sysconfdir ;;
1073 + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
1074 + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
1075 + sysconfdir=$ac_optarg ;;
1076
1077 -target | --target | --targe | --targ | --tar | --ta | --t)
1078 - ac_prev=target ;;
1079 + ac_prev=target_alias ;;
1080 -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
1081 - target="$ac_optarg" ;;
1082 + target_alias=$ac_optarg ;;
1083
1084 -v | -verbose | --verbose | --verbos | --verbo | --verb)
1085 verbose=yes ;;
1086
1087 - -version | --version | --versio | --versi | --vers)
1088 - echo "configure generated by autoconf version 2.4"
1089 - exit 0 ;;
1090 + -version | --version | --versio | --versi | --vers | -V)
1091 + ac_init_version=: ;;
1092
1093 -with-* | --with-*)
1094 - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
1095 + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1096 # Reject names that are not valid shell variable names.
1097 - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
1098 - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
1099 - fi
1100 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1101 + { echo "$as_me: error: invalid package name: $ac_package" >&2
1102 + { (exit 1); exit 1; }; }
1103 ac_package=`echo $ac_package| sed 's/-/_/g'`
1104 - case "$ac_option" in
1105 - *=*) ;;
1106 + case $ac_option in
1107 + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
1108 *) ac_optarg=yes ;;
1109 esac
1110 - eval "with_${ac_package}='$ac_optarg'" ;;
1111 + eval "with_$ac_package='$ac_optarg'" ;;
1112
1113 -without-* | --without-*)
1114 - ac_package=`echo $ac_option|sed -e 's/-*without-//'`
1115 + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1116 # Reject names that are not valid shell variable names.
1117 - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
1118 - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
1119 - fi
1120 - ac_package=`echo $ac_package| sed 's/-/_/g'`
1121 - eval "with_${ac_package}=no" ;;
1122 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1123 + { echo "$as_me: error: invalid package name: $ac_package" >&2
1124 + { (exit 1); exit 1; }; }
1125 + ac_package=`echo $ac_package | sed 's/-/_/g'`
1126 + eval "with_$ac_package=no" ;;
1127
1128 --x)
1129 # Obsolete; use --with-x.
1130 @@ -252,96 +577,110 @@
1131 ac_prev=x_includes ;;
1132 -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
1133 | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
1134 - x_includes="$ac_optarg" ;;
1135 + x_includes=$ac_optarg ;;
1136
1137 -x-libraries | --x-libraries | --x-librarie | --x-librari \
1138 | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
1139 ac_prev=x_libraries ;;
1140 -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
1141 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1142 - x_libraries="$ac_optarg" ;;
1143 + x_libraries=$ac_optarg ;;
1144
1145 - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
1146 + -*) { echo "$as_me: error: unrecognized option: $ac_option
1147 +Try \`$0 --help' for more information." >&2
1148 + { (exit 1); exit 1; }; }
1149 ;;
1150
1151 - *)
1152 - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
1153 - echo "configure: warning: $ac_option: invalid host type" 1>&2
1154 - fi
1155 - if test "x$nonopt" != xNONE; then
1156 - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
1157 - fi
1158 - nonopt="$ac_option"
1159 + *=*)
1160 + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
1161 + # Reject names that are not valid shell variable names.
1162 + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1163 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1164 + { (exit 1); exit 1; }; }
1165 + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
1166 + eval "$ac_envvar='$ac_optarg'"
1167 + export $ac_envvar ;;
1168 +
1169 + *)
1170 + # FIXME: should be removed in autoconf 3.0.
1171 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1172 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1173 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1174 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1175 ;;
1176
1177 esac
1178 done
1179
1180 if test -n "$ac_prev"; then
1181 - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
1182 -fi
1183 -
1184 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
1185 -
1186 -# File descriptor usage:
1187 -# 0 standard input
1188 -# 1 file creation
1189 -# 2 errors and warnings
1190 -# 3 some systems may open it to /dev/tty
1191 -# 4 used on the Kubota Titan
1192 -# 6 checking for... messages and results
1193 -# 5 compiler messages saved in config.log
1194 -if test "$silent" = yes; then
1195 - exec 6>/dev/null
1196 -else
1197 - exec 6>&1
1198 + ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1199 + { echo "$as_me: error: missing argument to $ac_option" >&2
1200 + { (exit 1); exit 1; }; }
1201 fi
1202 -exec 5>./config.log
1203
1204 -echo "\
1205 -This file contains any messages produced by compilers while
1206 -running configure, to aid debugging if configure makes a mistake.
1207 -" 1>&5
1208 +# Be sure to have absolute paths.
1209 +for ac_var in exec_prefix prefix
1210 +do
1211 + eval ac_val=$`echo $ac_var`
1212 + case $ac_val in
1213 + [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
1214 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1215 + { (exit 1); exit 1; }; };;
1216 + esac
1217 +done
1218
1219 -# Strip out --no-create and --no-recursion so they do not pile up.
1220 -# Also quote any args containing shell metacharacters.
1221 -ac_configure_args=
1222 -for ac_arg
1223 +# Be sure to have absolute paths.
1224 +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
1225 + localstatedir libdir includedir oldincludedir infodir mandir
1226 do
1227 - case "$ac_arg" in
1228 - -no-create | --no-create | --no-creat | --no-crea | --no-cre \
1229 - | --no-cr | --no-c) ;;
1230 - -no-recursion | --no-recursion | --no-recursio | --no-recursi \
1231 - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
1232 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
1233 - ac_configure_args="$ac_configure_args '$ac_arg'" ;;
1234 - *) ac_configure_args="$ac_configure_args $ac_arg" ;;
1235 + eval ac_val=$`echo $ac_var`
1236 + case $ac_val in
1237 + [\\/$]* | ?:[\\/]* ) ;;
1238 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1239 + { (exit 1); exit 1; }; };;
1240 esac
1241 done
1242
1243 -# NLS nuisances.
1244 -# Only set LANG and LC_ALL to C if already set.
1245 -# These must not be set unconditionally because not all systems understand
1246 -# e.g. LANG=C (notably SCO).
1247 -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
1248 -if test "${LANG+set}" = set; then LANG=C; export LANG; fi
1249 +# There might be people who depend on the old broken behavior: `$host'
1250 +# used to hold the argument of --host etc.
1251 +# FIXME: To remove some day.
1252 +build=$build_alias
1253 +host=$host_alias
1254 +target=$target_alias
1255 +
1256 +# FIXME: To remove some day.
1257 +if test "x$host_alias" != x; then
1258 + if test "x$build_alias" = x; then
1259 + cross_compiling=maybe
1260 + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1261 + If a cross compiler is detected then cross compile mode will be used." >&2
1262 + elif test "x$build_alias" != "x$host_alias"; then
1263 + cross_compiling=yes
1264 + fi
1265 +fi
1266
1267 -# confdefs.h avoids OS command line length limits that DEFS can exceed.
1268 -rm -rf conftest* confdefs.h
1269 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
1270 -echo > confdefs.h
1271 +ac_tool_prefix=
1272 +test -n "$host_alias" && ac_tool_prefix=$host_alias-
1273 +
1274 +test "$silent" = yes && exec 6>/dev/null
1275
1276 -# A filename unique to this package, relative to the directory that
1277 -# configure is in, which we can look for to find out if srcdir is correct.
1278 -ac_unique_file=src/rcsbase.h
1279
1280 # Find the source files, if location was not specified.
1281 if test -z "$srcdir"; then
1282 ac_srcdir_defaulted=yes
1283 # Try the directory containing this script, then its parent.
1284 - ac_prog=$0
1285 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
1286 - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
1287 + ac_confdir=`(dirname "$0") 2>/dev/null ||
1288 +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1289 + X"$0" : 'X\(//\)[^/]' \| \
1290 + X"$0" : 'X\(//\)$' \| \
1291 + X"$0" : 'X\(/\)' \| \
1292 + . : '\(.\)' 2>/dev/null ||
1293 +echo X"$0" |
1294 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
1295 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
1296 + /^X\(\/\/\)$/{ s//\1/; q; }
1297 + /^X\(\/\).*/{ s//\1/; q; }
1298 + s/.*/./; q'`
1299 srcdir=$ac_confdir
1300 if test ! -r $srcdir/$ac_unique_file; then
1301 srcdir=..
1302 @@ -351,13 +690,454 @@
1303 fi
1304 if test ! -r $srcdir/$ac_unique_file; then
1305 if test "$ac_srcdir_defaulted" = yes; then
1306 - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
1307 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
1308 + { (exit 1); exit 1; }; }
1309 else
1310 - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
1311 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1312 + { (exit 1); exit 1; }; }
1313 fi
1314 fi
1315 -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
1316 +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
1317 + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
1318 + { (exit 1); exit 1; }; }
1319 +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
1320 +ac_env_build_alias_set=${build_alias+set}
1321 +ac_env_build_alias_value=$build_alias
1322 +ac_cv_env_build_alias_set=${build_alias+set}
1323 +ac_cv_env_build_alias_value=$build_alias
1324 +ac_env_host_alias_set=${host_alias+set}
1325 +ac_env_host_alias_value=$host_alias
1326 +ac_cv_env_host_alias_set=${host_alias+set}
1327 +ac_cv_env_host_alias_value=$host_alias
1328 +ac_env_target_alias_set=${target_alias+set}
1329 +ac_env_target_alias_value=$target_alias
1330 +ac_cv_env_target_alias_set=${target_alias+set}
1331 +ac_cv_env_target_alias_value=$target_alias
1332 +ac_env_CC_set=${CC+set}
1333 +ac_env_CC_value=$CC
1334 +ac_cv_env_CC_set=${CC+set}
1335 +ac_cv_env_CC_value=$CC
1336 +ac_env_CFLAGS_set=${CFLAGS+set}
1337 +ac_env_CFLAGS_value=$CFLAGS
1338 +ac_cv_env_CFLAGS_set=${CFLAGS+set}
1339 +ac_cv_env_CFLAGS_value=$CFLAGS
1340 +ac_env_LDFLAGS_set=${LDFLAGS+set}
1341 +ac_env_LDFLAGS_value=$LDFLAGS
1342 +ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
1343 +ac_cv_env_LDFLAGS_value=$LDFLAGS
1344 +ac_env_CPPFLAGS_set=${CPPFLAGS+set}
1345 +ac_env_CPPFLAGS_value=$CPPFLAGS
1346 +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
1347 +ac_cv_env_CPPFLAGS_value=$CPPFLAGS
1348 +
1349 +#
1350 +# Report the --help message.
1351 +#
1352 +if test "$ac_init_help" = "long"; then
1353 + # Omit some internal or obsolete options to make the list less imposing.
1354 + # This message is too long to be a string in the A/UX 3.1 sh.
1355 + cat <<_ACEOF
1356 +\`configure' configures this package to adapt to many kinds of systems.
1357 +
1358 +Usage: $0 [OPTION]... [VAR=VALUE]...
1359 +
1360 +To assign environment variables (e.g., CC, CFLAGS...), specify them as
1361 +VAR=VALUE. See below for descriptions of some of the useful variables.
1362 +
1363 +Defaults for the options are specified in brackets.
1364 +
1365 +Configuration:
1366 + -h, --help display this help and exit
1367 + --help=short display options specific to this package
1368 + --help=recursive display the short help of all the included packages
1369 + -V, --version display version information and exit
1370 + -q, --quiet, --silent do not print \`checking...' messages
1371 + --cache-file=FILE cache test results in FILE [disabled]
1372 + -C, --config-cache alias for \`--cache-file=config.cache'
1373 + -n, --no-create do not create output files
1374 + --srcdir=DIR find the sources in DIR [configure dir or \`..']
1375 +
1376 +_ACEOF
1377 +
1378 + cat <<_ACEOF
1379 +Installation directories:
1380 + --prefix=PREFIX install architecture-independent files in PREFIX
1381 + [$ac_default_prefix]
1382 + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
1383 + [PREFIX]
1384 +
1385 +By default, \`make install' will install all the files in
1386 +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
1387 +an installation prefix other than \`$ac_default_prefix' using \`--prefix',
1388 +for instance \`--prefix=\$HOME'.
1389 +
1390 +For better control, use the options below.
1391 +
1392 +Fine tuning of the installation directories:
1393 + --bindir=DIR user executables [EPREFIX/bin]
1394 + --sbindir=DIR system admin executables [EPREFIX/sbin]
1395 + --libexecdir=DIR program executables [EPREFIX/libexec]
1396 + --datadir=DIR read-only architecture-independent data [PREFIX/share]
1397 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1398 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1399 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1400 + --libdir=DIR object code libraries [EPREFIX/lib]
1401 + --includedir=DIR C header files [PREFIX/include]
1402 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
1403 + --infodir=DIR info documentation [PREFIX/info]
1404 + --mandir=DIR man documentation [PREFIX/man]
1405 +_ACEOF
1406 +
1407 + cat <<\_ACEOF
1408 +_ACEOF
1409 +fi
1410 +
1411 +if test -n "$ac_init_help"; then
1412 +
1413 + cat <<\_ACEOF
1414 +
1415 +Optional Packages:
1416 + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1417 + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1418 + --with-diffutils assume GNU diffutils is similarly installed
1419 +
1420 +Some influential environment variables:
1421 + CC C compiler command
1422 + CFLAGS C compiler flags
1423 + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1424 + nonstandard directory <lib dir>
1425 + CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
1426 + headers in a nonstandard directory <include dir>
1427 +
1428 +Use these variables to override the choices made by `configure' or to help
1429 +it to find libraries and programs with nonstandard names/locations.
1430 +
1431 +_ACEOF
1432 +fi
1433 +
1434 +if test "$ac_init_help" = "recursive"; then
1435 + # If there are subdirs, report their specific --help.
1436 + ac_popdir=`pwd`
1437 + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
1438 + test -d $ac_dir || continue
1439 + ac_builddir=.
1440 +
1441 +if test "$ac_dir" != .; then
1442 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
1443 + # A "../" for each directory in $ac_dir_suffix.
1444 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
1445 +else
1446 + ac_dir_suffix= ac_top_builddir=
1447 +fi
1448 +
1449 +case $srcdir in
1450 + .) # No --srcdir option. We are building in place.
1451 + ac_srcdir=.
1452 + if test -z "$ac_top_builddir"; then
1453 + ac_top_srcdir=.
1454 + else
1455 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
1456 + fi ;;
1457 + [\\/]* | ?:[\\/]* ) # Absolute path.
1458 + ac_srcdir=$srcdir$ac_dir_suffix;
1459 + ac_top_srcdir=$srcdir ;;
1460 + *) # Relative path.
1461 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
1462 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
1463 +esac
1464 +
1465 +# Do not use `cd foo && pwd` to compute absolute paths, because
1466 +# the directories may not exist.
1467 +case `pwd` in
1468 +.) ac_abs_builddir="$ac_dir";;
1469 +*)
1470 + case "$ac_dir" in
1471 + .) ac_abs_builddir=`pwd`;;
1472 + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
1473 + *) ac_abs_builddir=`pwd`/"$ac_dir";;
1474 + esac;;
1475 +esac
1476 +case $ac_abs_builddir in
1477 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
1478 +*)
1479 + case ${ac_top_builddir}. in
1480 + .) ac_abs_top_builddir=$ac_abs_builddir;;
1481 + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
1482 + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
1483 + esac;;
1484 +esac
1485 +case $ac_abs_builddir in
1486 +.) ac_abs_srcdir=$ac_srcdir;;
1487 +*)
1488 + case $ac_srcdir in
1489 + .) ac_abs_srcdir=$ac_abs_builddir;;
1490 + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
1491 + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
1492 + esac;;
1493 +esac
1494 +case $ac_abs_builddir in
1495 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
1496 +*)
1497 + case $ac_top_srcdir in
1498 + .) ac_abs_top_srcdir=$ac_abs_builddir;;
1499 + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
1500 + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
1501 + esac;;
1502 +esac
1503 +
1504 + cd $ac_dir
1505 + # Check for guested configure; otherwise get Cygnus style configure.
1506 + if test -f $ac_srcdir/configure.gnu; then
1507 + echo
1508 + $SHELL $ac_srcdir/configure.gnu --help=recursive
1509 + elif test -f $ac_srcdir/configure; then
1510 + echo
1511 + $SHELL $ac_srcdir/configure --help=recursive
1512 + elif test -f $ac_srcdir/configure.ac ||
1513 + test -f $ac_srcdir/configure.in; then
1514 + echo
1515 + $ac_configure --help
1516 + else
1517 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1518 + fi
1519 + cd "$ac_popdir"
1520 + done
1521 +fi
1522 +
1523 +test -n "$ac_init_help" && exit 0
1524 +if $ac_init_version; then
1525 + cat <<\_ACEOF
1526 +
1527 +Copyright (C) 2003 Free Software Foundation, Inc.
1528 +This configure script is free software; the Free Software Foundation
1529 +gives unlimited permission to copy, distribute and modify it.
1530 +_ACEOF
1531 + exit 0
1532 +fi
1533 +exec 5>config.log
1534 +cat >&5 <<_ACEOF
1535 +This file contains any messages produced by compilers while
1536 +running configure, to aid debugging if configure makes a mistake.
1537 +
1538 +It was created by $as_me, which was
1539 +generated by GNU Autoconf 2.59. Invocation command line was
1540 +
1541 + $ $0 $@
1542 +
1543 +_ACEOF
1544 +{
1545 +cat <<_ASUNAME
1546 +## --------- ##
1547 +## Platform. ##
1548 +## --------- ##
1549 +
1550 +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
1551 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
1552 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
1553 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
1554 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
1555 +
1556 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
1557 +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
1558 +
1559 +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
1560 +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
1561 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
1562 +hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
1563 +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
1564 +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
1565 +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
1566 +
1567 +_ASUNAME
1568 +
1569 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1570 +for as_dir in $PATH
1571 +do
1572 + IFS=$as_save_IFS
1573 + test -z "$as_dir" && as_dir=.
1574 + echo "PATH: $as_dir"
1575 +done
1576 +
1577 +} >&5
1578 +
1579 +cat >&5 <<_ACEOF
1580 +
1581 +
1582 +## ----------- ##
1583 +## Core tests. ##
1584 +## ----------- ##
1585 +
1586 +_ACEOF
1587 +
1588 +
1589 +# Keep a trace of the command line.
1590 +# Strip out --no-create and --no-recursion so they do not pile up.
1591 +# Strip out --silent because we don't want to record it for future runs.
1592 +# Also quote any args containing shell meta-characters.
1593 +# Make two passes to allow for proper duplicate-argument suppression.
1594 +ac_configure_args=
1595 +ac_configure_args0=
1596 +ac_configure_args1=
1597 +ac_sep=
1598 +ac_must_keep_next=false
1599 +for ac_pass in 1 2
1600 +do
1601 + for ac_arg
1602 + do
1603 + case $ac_arg in
1604 + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
1605 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1606 + | -silent | --silent | --silen | --sile | --sil)
1607 + continue ;;
1608 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
1609 + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1610 + esac
1611 + case $ac_pass in
1612 + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1613 + 2)
1614 + ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1615 + if test $ac_must_keep_next = true; then
1616 + ac_must_keep_next=false # Got value, back to normal.
1617 + else
1618 + case $ac_arg in
1619 + *=* | --config-cache | -C | -disable-* | --disable-* \
1620 + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1621 + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1622 + | -with-* | --with-* | -without-* | --without-* | --x)
1623 + case "$ac_configure_args0 " in
1624 + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1625 + esac
1626 + ;;
1627 + -* ) ac_must_keep_next=true ;;
1628 + esac
1629 + fi
1630 + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
1631 + # Get rid of the leading space.
1632 + ac_sep=" "
1633 + ;;
1634 + esac
1635 + done
1636 +done
1637 +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
1638 +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
1639 +
1640 +# When interrupted or exit'd, cleanup temporary files, and complete
1641 +# config.log. We remove comments because anyway the quotes in there
1642 +# would cause problems or look ugly.
1643 +# WARNING: Be sure not to use single quotes in there, as some shells,
1644 +# such as our DU 5.0 friend, will then `close' the trap.
1645 +trap 'exit_status=$?
1646 + # Save into config.log some information that might help in debugging.
1647 + {
1648 + echo
1649 +
1650 + cat <<\_ASBOX
1651 +## ---------------- ##
1652 +## Cache variables. ##
1653 +## ---------------- ##
1654 +_ASBOX
1655 + echo
1656 + # The following way of writing the cache mishandles newlines in values,
1657 +{
1658 + (set) 2>&1 |
1659 + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
1660 + *ac_space=\ *)
1661 + sed -n \
1662 + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1663 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1664 + ;;
1665 + *)
1666 + sed -n \
1667 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1668 + ;;
1669 + esac;
1670 +}
1671 + echo
1672 +
1673 + cat <<\_ASBOX
1674 +## ----------------- ##
1675 +## Output variables. ##
1676 +## ----------------- ##
1677 +_ASBOX
1678 + echo
1679 + for ac_var in $ac_subst_vars
1680 + do
1681 + eval ac_val=$`echo $ac_var`
1682 + echo "$ac_var='"'"'$ac_val'"'"'"
1683 + done | sort
1684 + echo
1685 +
1686 + if test -n "$ac_subst_files"; then
1687 + cat <<\_ASBOX
1688 +## ------------- ##
1689 +## Output files. ##
1690 +## ------------- ##
1691 +_ASBOX
1692 + echo
1693 + for ac_var in $ac_subst_files
1694 + do
1695 + eval ac_val=$`echo $ac_var`
1696 + echo "$ac_var='"'"'$ac_val'"'"'"
1697 + done | sort
1698 + echo
1699 + fi
1700 +
1701 + if test -s confdefs.h; then
1702 + cat <<\_ASBOX
1703 +## ----------- ##
1704 +## confdefs.h. ##
1705 +## ----------- ##
1706 +_ASBOX
1707 + echo
1708 + sed "/^$/d" confdefs.h | sort
1709 + echo
1710 + fi
1711 + test "$ac_signal" != 0 &&
1712 + echo "$as_me: caught signal $ac_signal"
1713 + echo "$as_me: exit $exit_status"
1714 + } >&5
1715 + rm -f core *.core &&
1716 + rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
1717 + exit $exit_status
1718 + ' 0
1719 +for ac_signal in 1 2 13 15; do
1720 + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
1721 +done
1722 +ac_signal=0
1723 +
1724 +# confdefs.h avoids OS command line length limits that DEFS can exceed.
1725 +rm -rf conftest* confdefs.h
1726 +# AIX cpp loses on an empty file, so make sure it contains at least a newline.
1727 +echo >confdefs.h
1728 +
1729 +# Predefined preprocessor variables.
1730 +
1731 +cat >>confdefs.h <<_ACEOF
1732 +#define PACKAGE_NAME "$PACKAGE_NAME"
1733 +_ACEOF
1734 +
1735 +
1736 +cat >>confdefs.h <<_ACEOF
1737 +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
1738 +_ACEOF
1739 +
1740 +
1741 +cat >>confdefs.h <<_ACEOF
1742 +#define PACKAGE_VERSION "$PACKAGE_VERSION"
1743 +_ACEOF
1744
1745 +
1746 +cat >>confdefs.h <<_ACEOF
1747 +#define PACKAGE_STRING "$PACKAGE_STRING"
1748 +_ACEOF
1749 +
1750 +
1751 +cat >>confdefs.h <<_ACEOF
1752 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
1753 +_ACEOF
1754 +
1755 +
1756 +# Let the site file select an alternate cache file if it wants to.
1757 # Prefer explicitly selected file to automatically selected ones.
1758 if test -z "$CONFIG_SITE"; then
1759 if test "x$prefix" != xNONE; then
1760 @@ -368,36 +1148,103 @@
1761 fi
1762 for ac_site_file in $CONFIG_SITE; do
1763 if test -r "$ac_site_file"; then
1764 - echo "loading site script $ac_site_file"
1765 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1766 +echo "$as_me: loading site script $ac_site_file" >&6;}
1767 + sed 's/^/| /' "$ac_site_file" >&5
1768 . "$ac_site_file"
1769 fi
1770 done
1771
1772 if test -r "$cache_file"; then
1773 - echo "loading cache $cache_file"
1774 - . $cache_file
1775 + # Some versions of bash will fail to source /dev/null (special
1776 + # files actually), so we avoid doing that.
1777 + if test -f "$cache_file"; then
1778 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5
1779 +echo "$as_me: loading cache $cache_file" >&6;}
1780 + case $cache_file in
1781 + [\\/]* | ?:[\\/]* ) . $cache_file;;
1782 + *) . ./$cache_file;;
1783 + esac
1784 + fi
1785 else
1786 - echo "creating cache $cache_file"
1787 - > $cache_file
1788 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5
1789 +echo "$as_me: creating cache $cache_file" >&6;}
1790 + >$cache_file
1791 +fi
1792 +
1793 +# Check that the precious variables saved in the cache have kept the same
1794 +# value.
1795 +ac_cache_corrupted=false
1796 +for ac_var in `(set) 2>&1 |
1797 + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1798 + eval ac_old_set=\$ac_cv_env_${ac_var}_set
1799 + eval ac_new_set=\$ac_env_${ac_var}_set
1800 + eval ac_old_val="\$ac_cv_env_${ac_var}_value"
1801 + eval ac_new_val="\$ac_env_${ac_var}_value"
1802 + case $ac_old_set,$ac_new_set in
1803 + set,)
1804 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1805 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1806 + ac_cache_corrupted=: ;;
1807 + ,set)
1808 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1809 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1810 + ac_cache_corrupted=: ;;
1811 + ,);;
1812 + *)
1813 + if test "x$ac_old_val" != "x$ac_new_val"; then
1814 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1815 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1816 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
1817 +echo "$as_me: former value: $ac_old_val" >&2;}
1818 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
1819 +echo "$as_me: current value: $ac_new_val" >&2;}
1820 + ac_cache_corrupted=:
1821 + fi;;
1822 + esac
1823 + # Pass precious variables to config.status.
1824 + if test "$ac_new_set" = set; then
1825 + case $ac_new_val in
1826 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
1827 + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1828 + *) ac_arg=$ac_var=$ac_new_val ;;
1829 + esac
1830 + case " $ac_configure_args " in
1831 + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
1832 + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
1833 + esac
1834 + fi
1835 +done
1836 +if $ac_cache_corrupted; then
1837 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1838 +echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1839 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1840 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1841 + { (exit 1); exit 1; }; }
1842 fi
1843
1844 ac_ext=c
1845 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
1846 ac_cpp='$CPP $CPPFLAGS'
1847 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
1848 -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
1849 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1850 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1851 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
1852 +
1853 +
1854 +
1855 +
1856 +
1857 +
1858 +
1859 +
1860 +
1861 +
1862 +
1863 +
1864 +
1865 +
1866 +
1867 +
1868
1869 -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
1870 - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
1871 - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
1872 - ac_n= ac_c='
1873 -' ac_t=' '
1874 - else
1875 - ac_n=-n ac_c= ac_t=
1876 - fi
1877 -else
1878 - ac_n= ac_c='\c' ac_t=
1879 -fi
1880
1881
1882
1883 @@ -411,15 +1258,15 @@
1884 1
1885 EOF
1886
1887 +
1888 # Check whether --with-diffutils or --without-diffutils was given.
1889 -withval="$with_diffutils"
1890 -if test -n "$withval"; then
1891 +if test "${with_diffutils+set}" = set; then
1892 + withval="$with_diffutils"
1893 with_diffutils=$withval
1894 else
1895 with_diffutils=no
1896
1897 -fi
1898 -
1899 +fi;
1900
1901 case $with_diffutils in
1902 yes)
1903 @@ -437,11 +1284,12 @@
1904 # On some systems, the RCS-compatible diff program is called `rdiff';
1905 # use it if it works and `diff' doesn't.
1906
1907 -echo $ac_n "checking diff basename""... $ac_c" 1>&6
1908 -if eval "test \"`echo '$''{'rcs_cv_prog_diff'+set}'`\" = set"; then
1909 - echo $ac_n "(cached) $ac_c" 1>&6
1910 +echo "$as_me:$LINENO: checking diff basename" >&5
1911 +echo $ECHO_N "checking diff basename... $ECHO_C" >&6
1912 +if test "${rcs_cv_prog_diff+set}" = set; then
1913 + echo $ECHO_N "(cached) $ECHO_C" >&6
1914 else
1915 -
1916 +
1917 rcs_cv_prog_diff=$DIFF
1918 case $rcs_cv_prog_diff in
1919 '')
1920 @@ -463,49 +1311,62 @@
1921
1922 DIFF=$rcs_cv_prog_diff
1923 case $DIFF in
1924 -'') { echo "configure: error: cannot find RCS-compatible diff" 1>&2; exit 1; };;
1925 +'') { { echo "$as_me:$LINENO: error: cannot find RCS-compatible diff" >&5
1926 +echo "$as_me: error: cannot find RCS-compatible diff" >&2;}
1927 + { (exit 1); exit 1; }; };;
1928 esac
1929 -echo "$ac_t""$DIFF" 1>&6
1930 +echo "$as_me:$LINENO: result: $DIFF" >&5
1931 +echo "${ECHO_T}$DIFF" >&6
1932 # Extract the first word of "$DIFF", so it can be a program name with args.
1933 set dummy $DIFF; ac_word=$2
1934 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1935 -if eval "test \"`echo '$''{'ac_cv_path_DIFF'+set}'`\" = set"; then
1936 - echo $ac_n "(cached) $ac_c" 1>&6
1937 +echo "$as_me:$LINENO: checking for $ac_word" >&5
1938 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1939 +if test "${ac_cv_path_DIFF+set}" = set; then
1940 + echo $ECHO_N "(cached) $ECHO_C" >&6
1941 else
1942 - case "$DIFF" in
1943 - /*)
1944 + case $DIFF in
1945 + [\\/]* | ?:[\\/]*)
1946 ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
1947 ;;
1948 *)
1949 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1950 - for ac_dir in $PATH; do
1951 - test -z "$ac_dir" && ac_dir=.
1952 - if test -f $ac_dir/$ac_word; then
1953 - ac_cv_path_DIFF="$ac_dir/$ac_word"
1954 - break
1955 - fi
1956 - done
1957 - IFS="$ac_save_ifs"
1958 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1959 +for as_dir in $PATH
1960 +do
1961 + IFS=$as_save_IFS
1962 + test -z "$as_dir" && as_dir=.
1963 + for ac_exec_ext in '' $ac_executable_extensions; do
1964 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1965 + ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
1966 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1967 + break 2
1968 + fi
1969 +done
1970 +done
1971 +
1972 test -z "$ac_cv_path_DIFF" && ac_cv_path_DIFF="$DIFF"
1973 ;;
1974 esac
1975 fi
1976 -DIFF="$ac_cv_path_DIFF"
1977 +DIFF=$ac_cv_path_DIFF
1978 +
1979 if test -n "$DIFF"; then
1980 - echo "$ac_t""$DIFF" 1>&6
1981 + echo "$as_me:$LINENO: result: $DIFF" >&5
1982 +echo "${ECHO_T}$DIFF" >&6
1983 else
1984 - echo "$ac_t""no" 1>&6
1985 + echo "$as_me:$LINENO: result: no" >&5
1986 +echo "${ECHO_T}no" >&6
1987 fi
1988
1989
1990 # Set DIFF_SUCCESS, DIFF_FAILURE, DIFF_TROUBLE to diff's exit status
1991 # when it finds no differences, some differences, or trouble.
1992
1993 -echo $ac_n "checking diff success status""... $ac_c" 1>&6
1994 -if eval "test \"`echo '$''{'rcs_cv_status_diff_success'+set}'`\" = set"; then
1995 - echo $ac_n "(cached) $ac_c" 1>&6
1996 +echo "$as_me:$LINENO: checking diff success status" >&5
1997 +echo $ECHO_N "checking diff success status... $ECHO_C" >&6
1998 +if test "${rcs_cv_status_diff_success+set}" = set; then
1999 + echo $ECHO_N "(cached) $ECHO_C" >&6
2000 else
2001 -
2002 +
2003 rcs_cv_status_diff_success=$DIFF_SUCCESS
2004 case $rcs_cv_status_diff_success in
2005 '')
2006 @@ -519,14 +1380,16 @@
2007 fi
2008
2009 DIFF_SUCCESS=$rcs_cv_status_diff_success
2010 -echo "$ac_t""$DIFF_SUCCESS" 1>&6
2011 +echo "$as_me:$LINENO: result: $DIFF_SUCCESS" >&5
2012 +echo "${ECHO_T}$DIFF_SUCCESS" >&6
2013 #
2014
2015 -echo $ac_n "checking diff failure status""... $ac_c" 1>&6
2016 -if eval "test \"`echo '$''{'rcs_cv_status_diff_failure'+set}'`\" = set"; then
2017 - echo $ac_n "(cached) $ac_c" 1>&6
2018 +echo "$as_me:$LINENO: checking diff failure status" >&5
2019 +echo $ECHO_N "checking diff failure status... $ECHO_C" >&6
2020 +if test "${rcs_cv_status_diff_failure+set}" = set; then
2021 + echo $ECHO_N "(cached) $ECHO_C" >&6
2022 else
2023 -
2024 +
2025 rcs_cv_status_diff_failure=$DIFF_FAILURE
2026 case $rcs_cv_status_diff_failure in
2027 '')
2028 @@ -538,14 +1401,16 @@
2029 fi
2030
2031 DIFF_FAILURE=$rcs_cv_status_diff_failure
2032 -echo "$ac_t""$DIFF_FAILURE" 1>&6
2033 +echo "$as_me:$LINENO: result: $DIFF_FAILURE" >&5
2034 +echo "${ECHO_T}$DIFF_FAILURE" >&6
2035 #
2036
2037 -echo $ac_n "checking diff trouble status""... $ac_c" 1>&6
2038 -if eval "test \"`echo '$''{'rcs_cv_status_diff_trouble'+set}'`\" = set"; then
2039 - echo $ac_n "(cached) $ac_c" 1>&6
2040 +echo "$as_me:$LINENO: checking diff trouble status" >&5
2041 +echo $ECHO_N "checking diff trouble status... $ECHO_C" >&6
2042 +if test "${rcs_cv_status_diff_trouble+set}" = set; then
2043 + echo $ECHO_N "(cached) $ECHO_C" >&6
2044 else
2045 -
2046 +
2047 rcs_cv_status_diff_trouble=$DIFF_TROUBLE
2048 case $rcs_cv_status_diff_trouble in
2049 '')
2050 @@ -557,16 +1422,18 @@
2051 fi
2052
2053 DIFF_TROUBLE=$rcs_cv_status_diff_trouble
2054 -echo "$ac_t""$DIFF_TROUBLE" 1>&6
2055 +echo "$as_me:$LINENO: result: $DIFF_TROUBLE" >&5
2056 +echo "${ECHO_T}$DIFF_TROUBLE" >&6
2057
2058 # Set DIFFFLAGS to the options of the `diff' program to be run.
2059 # Use -an if possible, -n otherwise.
2060
2061 -echo $ac_n "checking diff options for RCS""... $ac_c" 1>&6
2062 -if eval "test \"`echo '$''{'rcs_cv_options_diff'+set}'`\" = set"; then
2063 - echo $ac_n "(cached) $ac_c" 1>&6
2064 +echo "$as_me:$LINENO: checking diff options for RCS" >&5
2065 +echo $ECHO_N "checking diff options for RCS... $ECHO_C" >&6
2066 +if test "${rcs_cv_options_diff+set}" = set; then
2067 + echo $ECHO_N "(cached) $ECHO_C" >&6
2068 else
2069 -
2070 +
2071 rcs_cv_options_diff=$DIFFFLAGS
2072 case $rcs_cv_options_diff in
2073 '')
2074 @@ -585,15 +1452,17 @@
2075 fi
2076
2077 DIFFFLAGS=$rcs_cv_options_diff
2078 -echo "$ac_t""$DIFFFLAGS" 1>&6
2079 +echo "$as_me:$LINENO: result: $DIFFFLAGS" >&5
2080 +echo "${ECHO_T}$DIFFFLAGS" >&6
2081
2082 # Set DIFF_L to 1 if diff understands the L option, 0 otherwise.
2083
2084 -echo $ac_n "checking diff -L""... $ac_c" 1>&6
2085 -if eval "test \"`echo '$''{'rcs_cv_options_diff_l'+set}'`\" = set"; then
2086 - echo $ac_n "(cached) $ac_c" 1>&6
2087 +echo "$as_me:$LINENO: checking diff -L" >&5
2088 +echo $ECHO_N "checking diff -L... $ECHO_C" >&6
2089 +if test "${rcs_cv_options_diff_l+set}" = set; then
2090 + echo $ECHO_N "(cached) $ECHO_C" >&6
2091 else
2092 -
2093 +
2094 rcs_cv_options_diff_l=$DIFF_L
2095 case $rcs_cv_options_diff_l in
2096 '')
2097 @@ -621,19 +1490,22 @@
2098
2099 DIFF_L=$rcs_cv_options_diff_l
2100 case $DIFF_L in
2101 -1) echo "$ac_t""yes" 1>&6;;
2102 -*) echo "$ac_t""no" 1>&6;;
2103 +1) echo "$as_me:$LINENO: result: yes" >&5
2104 +echo "${ECHO_T}yes" >&6;;
2105 +*) echo "$as_me:$LINENO: result: no" >&5
2106 +echo "${ECHO_T}no" >&6;;
2107 esac
2108
2109 # Set DIFF3 to the name of the diff3 program.
2110 # In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec.
2111 diff3PATH=$PATH:/usr/libexec
2112
2113 -echo $ac_n "checking diff3 -m""... $ac_c" 1>&6
2114 -if eval "test \"`echo '$''{'rcs_cv_prog_diff3_bin'+set}'`\" = set"; then
2115 - echo $ac_n "(cached) $ac_c" 1>&6
2116 +echo "$as_me:$LINENO: checking diff3 -m" >&5
2117 +echo $ECHO_N "checking diff3 -m... $ECHO_C" >&6
2118 +if test "${rcs_cv_prog_diff3_bin+set}" = set; then
2119 + echo $ECHO_N "(cached) $ECHO_C" >&6
2120 else
2121 -
2122 +
2123 rcs_cv_prog_diff3_bin=$DIFF3
2124 case $rcs_cv_prog_diff3_bin in
2125 '')
2126 @@ -657,49 +1529,61 @@
2127
2128 case $rcs_cv_prog_diff3_bin in
2129 ?*)
2130 - echo "$ac_t""yes" 1>&6
2131 + echo "$as_me:$LINENO: result: yes" >&5
2132 +echo "${ECHO_T}yes" >&6
2133 ac_save_path=$PATH
2134 PATH=$diff3PATH
2135 # Extract the first word of "$rcs_cv_prog_diff3_bin", so it can be a program name with args.
2136 set dummy $rcs_cv_prog_diff3_bin; ac_word=$2
2137 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2138 -if eval "test \"`echo '$''{'ac_cv_path_DIFF3'+set}'`\" = set"; then
2139 - echo $ac_n "(cached) $ac_c" 1>&6
2140 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2141 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2142 +if test "${ac_cv_path_DIFF3+set}" = set; then
2143 + echo $ECHO_N "(cached) $ECHO_C" >&6
2144 else
2145 - case "$DIFF3" in
2146 - /*)
2147 + case $DIFF3 in
2148 + [\\/]* | ?:[\\/]*)
2149 ac_cv_path_DIFF3="$DIFF3" # Let the user override the test with a path.
2150 ;;
2151 *)
2152 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
2153 - for ac_dir in $PATH; do
2154 - test -z "$ac_dir" && ac_dir=.
2155 - if test -f $ac_dir/$ac_word; then
2156 - ac_cv_path_DIFF3="$ac_dir/$ac_word"
2157 - break
2158 - fi
2159 - done
2160 - IFS="$ac_save_ifs"
2161 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2162 +for as_dir in $PATH
2163 +do
2164 + IFS=$as_save_IFS
2165 + test -z "$as_dir" && as_dir=.
2166 + for ac_exec_ext in '' $ac_executable_extensions; do
2167 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2168 + ac_cv_path_DIFF3="$as_dir/$ac_word$ac_exec_ext"
2169 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2170 + break 2
2171 + fi
2172 +done
2173 +done
2174 +
2175 test -z "$ac_cv_path_DIFF3" && ac_cv_path_DIFF3="$rcs_cv_prog_diff3_bin"
2176 ;;
2177 esac
2178 fi
2179 -DIFF3="$ac_cv_path_DIFF3"
2180 +DIFF3=$ac_cv_path_DIFF3
2181 +
2182 if test -n "$DIFF3"; then
2183 - echo "$ac_t""$DIFF3" 1>&6
2184 + echo "$as_me:$LINENO: result: $DIFF3" >&5
2185 +echo "${ECHO_T}$DIFF3" >&6
2186 else
2187 - echo "$ac_t""no" 1>&6
2188 + echo "$as_me:$LINENO: result: no" >&5
2189 +echo "${ECHO_T}no" >&6
2190 fi
2191
2192 PATH=$ac_save_path
2193 ;;
2194 '')
2195 - echo "$ac_t""no" 1>&6
2196 - echo $ac_n "checking diff3 library program""... $ac_c" 1>&6
2197 - if eval "test \"`echo '$''{'rcs_cv_path_diff3_lib'+set}'`\" = set"; then
2198 - echo $ac_n "(cached) $ac_c" 1>&6
2199 + echo "$as_me:$LINENO: result: no" >&5
2200 +echo "${ECHO_T}no" >&6
2201 + echo "$as_me:$LINENO: checking diff3 library program" >&5
2202 +echo $ECHO_N "checking diff3 library program... $ECHO_C" >&6
2203 + if test "${rcs_cv_path_diff3_lib+set}" = set; then
2204 + echo $ECHO_N "(cached) $ECHO_C" >&6
2205 else
2206 -
2207 +
2208 $DIFF conftest0 conftest1 >conftest01
2209 $DIFF /dev/null conftest1 >conftestn1
2210 for i in /usr/*lib*/*diff3*; do
2211 @@ -714,13 +1598,16 @@
2212 break
2213 fi
2214 done
2215 -
2216 +
2217 fi
2218
2219 DIFF3=$rcs_cv_path_diff3_lib
2220 case $DIFF3 in
2221 - '') { echo "configure: error: cannot find a working diff3 library program" 1>&2; exit 1; };;
2222 - ?*) echo "$ac_t""$DIFF3" 1>&6;;
2223 + '') { { echo "$as_me:$LINENO: error: cannot find a working diff3 library program" >&5
2224 +echo "$as_me: error: cannot find a working diff3 library program" >&2;}
2225 + { (exit 1); exit 1; }; };;
2226 + ?*) echo "$as_me:$LINENO: result: $DIFF3" >&5
2227 +echo "${ECHO_T}$DIFF3" >&6;;
2228 esac
2229 ;;
2230 esac
2231 @@ -740,71 +1627,89 @@
2232
2233 # Extract the first word of "ed", so it can be a program name with args.
2234 set dummy ed; ac_word=$2
2235 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2236 -if eval "test \"`echo '$''{'ac_cv_path_ED'+set}'`\" = set"; then
2237 - echo $ac_n "(cached) $ac_c" 1>&6
2238 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2239 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2240 +if test "${ac_cv_path_ED+set}" = set; then
2241 + echo $ECHO_N "(cached) $ECHO_C" >&6
2242 else
2243 - case "$ED" in
2244 - /*)
2245 + case $ED in
2246 + [\\/]* | ?:[\\/]*)
2247 ac_cv_path_ED="$ED" # Let the user override the test with a path.
2248 ;;
2249 *)
2250 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
2251 - for ac_dir in $PATH; do
2252 - test -z "$ac_dir" && ac_dir=.
2253 - if test -f $ac_dir/$ac_word; then
2254 - ac_cv_path_ED="$ac_dir/$ac_word"
2255 - break
2256 - fi
2257 - done
2258 - IFS="$ac_save_ifs"
2259 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2260 +for as_dir in $PATH
2261 +do
2262 + IFS=$as_save_IFS
2263 + test -z "$as_dir" && as_dir=.
2264 + for ac_exec_ext in '' $ac_executable_extensions; do
2265 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2266 + ac_cv_path_ED="$as_dir/$ac_word$ac_exec_ext"
2267 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2268 + break 2
2269 + fi
2270 +done
2271 +done
2272 +
2273 test -z "$ac_cv_path_ED" && ac_cv_path_ED="ed"
2274 ;;
2275 esac
2276 fi
2277 -ED="$ac_cv_path_ED"
2278 +ED=$ac_cv_path_ED
2279 +
2280 if test -n "$ED"; then
2281 - echo "$ac_t""$ED" 1>&6
2282 + echo "$as_me:$LINENO: result: $ED" >&5
2283 +echo "${ECHO_T}$ED" >&6
2284 else
2285 - echo "$ac_t""no" 1>&6
2286 + echo "$as_me:$LINENO: result: no" >&5
2287 +echo "${ECHO_T}no" >&6
2288 fi
2289
2290
2291 ac_save_path=$PATH
2292 -PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
2293 +PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH
2294 for ac_prog in sendmail mail mailx
2295 do
2296 -# Extract the first word of "$ac_prog", so it can be a program name with args.
2297 + # Extract the first word of "$ac_prog", so it can be a program name with args.
2298 set dummy $ac_prog; ac_word=$2
2299 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2300 -if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
2301 - echo $ac_n "(cached) $ac_c" 1>&6
2302 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2303 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2304 +if test "${ac_cv_path_SENDMAIL+set}" = set; then
2305 + echo $ECHO_N "(cached) $ECHO_C" >&6
2306 else
2307 - case "$SENDMAIL" in
2308 - /*)
2309 + case $SENDMAIL in
2310 + [\\/]* | ?:[\\/]*)
2311 ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
2312 ;;
2313 *)
2314 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
2315 - for ac_dir in $PATH; do
2316 - test -z "$ac_dir" && ac_dir=.
2317 - if test -f $ac_dir/$ac_word; then
2318 - ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
2319 - break
2320 - fi
2321 - done
2322 - IFS="$ac_save_ifs"
2323 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2324 +for as_dir in $PATH
2325 +do
2326 + IFS=$as_save_IFS
2327 + test -z "$as_dir" && as_dir=.
2328 + for ac_exec_ext in '' $ac_executable_extensions; do
2329 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2330 + ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
2331 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2332 + break 2
2333 + fi
2334 +done
2335 +done
2336 +
2337 ;;
2338 esac
2339 fi
2340 -SENDMAIL="$ac_cv_path_SENDMAIL"
2341 +SENDMAIL=$ac_cv_path_SENDMAIL
2342 +
2343 if test -n "$SENDMAIL"; then
2344 - echo "$ac_t""$SENDMAIL" 1>&6
2345 + echo "$as_me:$LINENO: result: $SENDMAIL" >&5
2346 +echo "${ECHO_T}$SENDMAIL" >&6
2347 else
2348 - echo "$ac_t""no" 1>&6
2349 + echo "$as_me:$LINENO: result: no" >&5
2350 +echo "${ECHO_T}no" >&6
2351 fi
2352
2353 -test -n "$SENDMAIL" && break
2354 + test -n "$SENDMAIL" && break
2355 done
2356
2357 PATH=$ac_save_path
2358 @@ -817,110 +1722,969 @@
2359 # Similarly, if using traditional pic, use its -D option.
2360 for ac_prog in "pic -n" "gpic -n" "pic -D" "pic"
2361 do
2362 -# Extract the first word of "$ac_prog", so it can be a program name with args.
2363 + # Extract the first word of "$ac_prog", so it can be a program name with args.
2364 set dummy $ac_prog; ac_word=$2
2365 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2366 -if eval "test \"`echo '$''{'ac_cv_prog_PIC'+set}'`\" = set"; then
2367 - echo $ac_n "(cached) $ac_c" 1>&6
2368 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2369 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2370 +if test "${ac_cv_prog_PIC+set}" = set; then
2371 + echo $ECHO_N "(cached) $ECHO_C" >&6
2372 else
2373 if test -n "$PIC"; then
2374 ac_cv_prog_PIC="$PIC" # Let the user override the test.
2375 else
2376 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
2377 - for ac_dir in $PATH; do
2378 - test -z "$ac_dir" && ac_dir=.
2379 - if test -f $ac_dir/$ac_word; then
2380 - ac_cv_prog_PIC="$ac_prog"
2381 - break
2382 - fi
2383 - done
2384 - IFS="$ac_save_ifs"
2385 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2386 +for as_dir in $PATH
2387 +do
2388 + IFS=$as_save_IFS
2389 + test -z "$as_dir" && as_dir=.
2390 + for ac_exec_ext in '' $ac_executable_extensions; do
2391 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2392 + ac_cv_prog_PIC="$ac_prog"
2393 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2394 + break 2
2395 + fi
2396 +done
2397 +done
2398 +
2399 fi
2400 fi
2401 -PIC="$ac_cv_prog_PIC"
2402 +PIC=$ac_cv_prog_PIC
2403 if test -n "$PIC"; then
2404 - echo "$ac_t""$PIC" 1>&6
2405 + echo "$as_me:$LINENO: result: $PIC" >&5
2406 +echo "${ECHO_T}$PIC" >&6
2407 else
2408 - echo "$ac_t""no" 1>&6
2409 + echo "$as_me:$LINENO: result: no" >&5
2410 +echo "${ECHO_T}no" >&6
2411 fi
2412
2413 -test -n "$PIC" && break
2414 + test -n "$PIC" && break
2415 done
2416 test -n "$PIC" || PIC="pic"
2417
2418
2419 -# Extract the first word of "gcc", so it can be a program name with args.
2420 +ac_ext=c
2421 +ac_cpp='$CPP $CPPFLAGS'
2422 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2423 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2424 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
2425 +if test -n "$ac_tool_prefix"; then
2426 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2427 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
2428 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2429 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2430 +if test "${ac_cv_prog_CC+set}" = set; then
2431 + echo $ECHO_N "(cached) $ECHO_C" >&6
2432 +else
2433 + if test -n "$CC"; then
2434 + ac_cv_prog_CC="$CC" # Let the user override the test.
2435 +else
2436 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2437 +for as_dir in $PATH
2438 +do
2439 + IFS=$as_save_IFS
2440 + test -z "$as_dir" && as_dir=.
2441 + for ac_exec_ext in '' $ac_executable_extensions; do
2442 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2443 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
2444 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2445 + break 2
2446 + fi
2447 +done
2448 +done
2449 +
2450 +fi
2451 +fi
2452 +CC=$ac_cv_prog_CC
2453 +if test -n "$CC"; then
2454 + echo "$as_me:$LINENO: result: $CC" >&5
2455 +echo "${ECHO_T}$CC" >&6
2456 +else
2457 + echo "$as_me:$LINENO: result: no" >&5
2458 +echo "${ECHO_T}no" >&6
2459 +fi
2460 +
2461 +fi
2462 +if test -z "$ac_cv_prog_CC"; then
2463 + ac_ct_CC=$CC
2464 + # Extract the first word of "gcc", so it can be a program name with args.
2465 set dummy gcc; ac_word=$2
2466 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2467 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
2468 - echo $ac_n "(cached) $ac_c" 1>&6
2469 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2470 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2471 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2472 + echo $ECHO_N "(cached) $ECHO_C" >&6
2473 +else
2474 + if test -n "$ac_ct_CC"; then
2475 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
2476 +else
2477 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2478 +for as_dir in $PATH
2479 +do
2480 + IFS=$as_save_IFS
2481 + test -z "$as_dir" && as_dir=.
2482 + for ac_exec_ext in '' $ac_executable_extensions; do
2483 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2484 + ac_cv_prog_ac_ct_CC="gcc"
2485 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2486 + break 2
2487 + fi
2488 +done
2489 +done
2490 +
2491 +fi
2492 +fi
2493 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
2494 +if test -n "$ac_ct_CC"; then
2495 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2496 +echo "${ECHO_T}$ac_ct_CC" >&6
2497 +else
2498 + echo "$as_me:$LINENO: result: no" >&5
2499 +echo "${ECHO_T}no" >&6
2500 +fi
2501 +
2502 + CC=$ac_ct_CC
2503 +else
2504 + CC="$ac_cv_prog_CC"
2505 +fi
2506 +
2507 +if test -z "$CC"; then
2508 + if test -n "$ac_tool_prefix"; then
2509 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
2510 +set dummy ${ac_tool_prefix}cc; ac_word=$2
2511 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2512 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2513 +if test "${ac_cv_prog_CC+set}" = set; then
2514 + echo $ECHO_N "(cached) $ECHO_C" >&6
2515 else
2516 if test -n "$CC"; then
2517 ac_cv_prog_CC="$CC" # Let the user override the test.
2518 else
2519 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
2520 - for ac_dir in $PATH; do
2521 - test -z "$ac_dir" && ac_dir=.
2522 - if test -f $ac_dir/$ac_word; then
2523 - ac_cv_prog_CC="gcc"
2524 - break
2525 - fi
2526 - done
2527 - IFS="$ac_save_ifs"
2528 - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
2529 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2530 +for as_dir in $PATH
2531 +do
2532 + IFS=$as_save_IFS
2533 + test -z "$as_dir" && as_dir=.
2534 + for ac_exec_ext in '' $ac_executable_extensions; do
2535 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2536 + ac_cv_prog_CC="${ac_tool_prefix}cc"
2537 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2538 + break 2
2539 + fi
2540 +done
2541 +done
2542 +
2543 fi
2544 fi
2545 -CC="$ac_cv_prog_CC"
2546 +CC=$ac_cv_prog_CC
2547 if test -n "$CC"; then
2548 - echo "$ac_t""$CC" 1>&6
2549 + echo "$as_me:$LINENO: result: $CC" >&5
2550 +echo "${ECHO_T}$CC" >&6
2551 else
2552 - echo "$ac_t""no" 1>&6
2553 + echo "$as_me:$LINENO: result: no" >&5
2554 +echo "${ECHO_T}no" >&6
2555 fi
2556
2557 +fi
2558 +if test -z "$ac_cv_prog_CC"; then
2559 + ac_ct_CC=$CC
2560 + # Extract the first word of "cc", so it can be a program name with args.
2561 +set dummy cc; ac_word=$2
2562 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2563 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2564 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2565 + echo $ECHO_N "(cached) $ECHO_C" >&6
2566 +else
2567 + if test -n "$ac_ct_CC"; then
2568 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
2569 +else
2570 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2571 +for as_dir in $PATH
2572 +do
2573 + IFS=$as_save_IFS
2574 + test -z "$as_dir" && as_dir=.
2575 + for ac_exec_ext in '' $ac_executable_extensions; do
2576 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2577 + ac_cv_prog_ac_ct_CC="cc"
2578 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2579 + break 2
2580 + fi
2581 +done
2582 +done
2583
2584 -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
2585 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
2586 - echo $ac_n "(cached) $ac_c" 1>&6
2587 +fi
2588 +fi
2589 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
2590 +if test -n "$ac_ct_CC"; then
2591 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2592 +echo "${ECHO_T}$ac_ct_CC" >&6
2593 else
2594 - cat > conftest.c <<EOF
2595 -#ifdef __GNUC__
2596 - yes;
2597 -#endif
2598 -EOF
2599 -if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
2600 - ac_cv_prog_gcc=yes
2601 + echo "$as_me:$LINENO: result: no" >&5
2602 +echo "${ECHO_T}no" >&6
2603 +fi
2604 +
2605 + CC=$ac_ct_CC
2606 else
2607 - ac_cv_prog_gcc=no
2608 + CC="$ac_cv_prog_CC"
2609 fi
2610 +
2611 fi
2612 -echo "$ac_t""$ac_cv_prog_gcc" 1>&6
2613 -if test $ac_cv_prog_gcc = yes; then
2614 - GCC=yes
2615 - if test "${CFLAGS+set}" != set; then
2616 - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
2617 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
2618 - echo $ac_n "(cached) $ac_c" 1>&6
2619 +if test -z "$CC"; then
2620 + # Extract the first word of "cc", so it can be a program name with args.
2621 +set dummy cc; ac_word=$2
2622 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2623 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2624 +if test "${ac_cv_prog_CC+set}" = set; then
2625 + echo $ECHO_N "(cached) $ECHO_C" >&6
2626 else
2627 - echo 'void f(){}' > conftest.c
2628 -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
2629 - ac_cv_prog_gcc_g=yes
2630 + if test -n "$CC"; then
2631 + ac_cv_prog_CC="$CC" # Let the user override the test.
2632 +else
2633 + ac_prog_rejected=no
2634 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2635 +for as_dir in $PATH
2636 +do
2637 + IFS=$as_save_IFS
2638 + test -z "$as_dir" && as_dir=.
2639 + for ac_exec_ext in '' $ac_executable_extensions; do
2640 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2641 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2642 + ac_prog_rejected=yes
2643 + continue
2644 + fi
2645 + ac_cv_prog_CC="cc"
2646 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2647 + break 2
2648 + fi
2649 +done
2650 +done
2651 +
2652 +if test $ac_prog_rejected = yes; then
2653 + # We found a bogon in the path, so make sure we never use it.
2654 + set dummy $ac_cv_prog_CC
2655 + shift
2656 + if test $# != 0; then
2657 + # We chose a different compiler from the bogus one.
2658 + # However, it has the same basename, so the bogon will be chosen
2659 + # first if we set CC to just the basename; use the full file name.
2660 + shift
2661 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
2662 + fi
2663 +fi
2664 +fi
2665 +fi
2666 +CC=$ac_cv_prog_CC
2667 +if test -n "$CC"; then
2668 + echo "$as_me:$LINENO: result: $CC" >&5
2669 +echo "${ECHO_T}$CC" >&6
2670 else
2671 - ac_cv_prog_gcc_g=no
2672 + echo "$as_me:$LINENO: result: no" >&5
2673 +echo "${ECHO_T}no" >&6
2674 +fi
2675 +
2676 +fi
2677 +if test -z "$CC"; then
2678 + if test -n "$ac_tool_prefix"; then
2679 + for ac_prog in cl
2680 + do
2681 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2682 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2683 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2684 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2685 +if test "${ac_cv_prog_CC+set}" = set; then
2686 + echo $ECHO_N "(cached) $ECHO_C" >&6
2687 +else
2688 + if test -n "$CC"; then
2689 + ac_cv_prog_CC="$CC" # Let the user override the test.
2690 +else
2691 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2692 +for as_dir in $PATH
2693 +do
2694 + IFS=$as_save_IFS
2695 + test -z "$as_dir" && as_dir=.
2696 + for ac_exec_ext in '' $ac_executable_extensions; do
2697 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2698 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
2699 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2700 + break 2
2701 + fi
2702 +done
2703 +done
2704 +
2705 +fi
2706 +fi
2707 +CC=$ac_cv_prog_CC
2708 +if test -n "$CC"; then
2709 + echo "$as_me:$LINENO: result: $CC" >&5
2710 +echo "${ECHO_T}$CC" >&6
2711 +else
2712 + echo "$as_me:$LINENO: result: no" >&5
2713 +echo "${ECHO_T}no" >&6
2714 +fi
2715 +
2716 + test -n "$CC" && break
2717 + done
2718 +fi
2719 +if test -z "$CC"; then
2720 + ac_ct_CC=$CC
2721 + for ac_prog in cl
2722 +do
2723 + # Extract the first word of "$ac_prog", so it can be a program name with args.
2724 +set dummy $ac_prog; ac_word=$2
2725 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2726 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2727 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2728 + echo $ECHO_N "(cached) $ECHO_C" >&6
2729 +else
2730 + if test -n "$ac_ct_CC"; then
2731 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
2732 +else
2733 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2734 +for as_dir in $PATH
2735 +do
2736 + IFS=$as_save_IFS
2737 + test -z "$as_dir" && as_dir=.
2738 + for ac_exec_ext in '' $ac_executable_extensions; do
2739 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2740 + ac_cv_prog_ac_ct_CC="$ac_prog"
2741 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2742 + break 2
2743 + fi
2744 +done
2745 +done
2746 +
2747 +fi
2748 +fi
2749 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
2750 +if test -n "$ac_ct_CC"; then
2751 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2752 +echo "${ECHO_T}$ac_ct_CC" >&6
2753 +else
2754 + echo "$as_me:$LINENO: result: no" >&5
2755 +echo "${ECHO_T}no" >&6
2756 +fi
2757 +
2758 + test -n "$ac_ct_CC" && break
2759 +done
2760 +
2761 + CC=$ac_ct_CC
2762 fi
2763 -rm -f conftest*
2764
2765 fi
2766 - echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
2767 - if test $ac_cv_prog_gcc_g = yes; then
2768 - CFLAGS="-g -O"
2769 +
2770 +
2771 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
2772 +See \`config.log' for more details." >&5
2773 +echo "$as_me: error: no acceptable C compiler found in \$PATH
2774 +See \`config.log' for more details." >&2;}
2775 + { (exit 1); exit 1; }; }
2776 +
2777 +# Provide some information about the compiler.
2778 +echo "$as_me:$LINENO:" \
2779 + "checking for C compiler version" >&5
2780 +ac_compiler=`set X $ac_compile; echo $2`
2781 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
2782 + (eval $ac_compiler --version </dev/null >&5) 2>&5
2783 + ac_status=$?
2784 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2785 + (exit $ac_status); }
2786 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
2787 + (eval $ac_compiler -v </dev/null >&5) 2>&5
2788 + ac_status=$?
2789 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2790 + (exit $ac_status); }
2791 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
2792 + (eval $ac_compiler -V </dev/null >&5) 2>&5
2793 + ac_status=$?
2794 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2795 + (exit $ac_status); }
2796 +
2797 +cat >conftest.$ac_ext <<_ACEOF
2798 +/* confdefs.h. */
2799 +_ACEOF
2800 +cat confdefs.h >>conftest.$ac_ext
2801 +cat >>conftest.$ac_ext <<_ACEOF
2802 +/* end confdefs.h. */
2803 +
2804 +int
2805 +main ()
2806 +{
2807 +
2808 + ;
2809 + return 0;
2810 +}
2811 +_ACEOF
2812 +ac_clean_files_save=$ac_clean_files
2813 +ac_clean_files="$ac_clean_files a.out a.exe b.out"
2814 +# Try to create an executable without -o first, disregard a.out.
2815 +# It will help us diagnose broken compilers, and finding out an intuition
2816 +# of exeext.
2817 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
2818 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
2819 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2820 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
2821 + (eval $ac_link_default) 2>&5
2822 + ac_status=$?
2823 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2824 + (exit $ac_status); }; then
2825 + # Find the output, starting from the most likely. This scheme is
2826 +# not robust to junk in `.', hence go to wildcards (a.*) only as a last
2827 +# resort.
2828 +
2829 +# Be careful to initialize this variable, since it used to be cached.
2830 +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
2831 +ac_cv_exeext=
2832 +# b.out is created by i960 compilers.
2833 +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
2834 +do
2835 + test -f "$ac_file" || continue
2836 + case $ac_file in
2837 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
2838 + ;;
2839 + conftest.$ac_ext )
2840 + # This is the source file.
2841 + ;;
2842 + [ab].out )
2843 + # We found the default executable, but exeext='' is most
2844 + # certainly right.
2845 + break;;
2846 + *.* )
2847 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2848 + # FIXME: I believe we export ac_cv_exeext for Libtool,
2849 + # but it would be cool to find out if it's true. Does anybody
2850 + # maintain Libtool? --akim.
2851 + export ac_cv_exeext
2852 + break;;
2853 + * )
2854 + break;;
2855 + esac
2856 +done
2857 +else
2858 + echo "$as_me: failed program was:" >&5
2859 +sed 's/^/| /' conftest.$ac_ext >&5
2860 +
2861 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
2862 +See \`config.log' for more details." >&5
2863 +echo "$as_me: error: C compiler cannot create executables
2864 +See \`config.log' for more details." >&2;}
2865 + { (exit 77); exit 77; }; }
2866 +fi
2867 +
2868 +ac_exeext=$ac_cv_exeext
2869 +echo "$as_me:$LINENO: result: $ac_file" >&5
2870 +echo "${ECHO_T}$ac_file" >&6
2871 +
2872 +# Check the compiler produces executables we can run. If not, either
2873 +# the compiler is broken, or we cross compile.
2874 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5
2875 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
2876 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
2877 +# If not cross compiling, check that we can run a simple program.
2878 +if test "$cross_compiling" != yes; then
2879 + if { ac_try='./$ac_file'
2880 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2881 + (eval $ac_try) 2>&5
2882 + ac_status=$?
2883 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2884 + (exit $ac_status); }; }; then
2885 + cross_compiling=no
2886 + else
2887 + if test "$cross_compiling" = maybe; then
2888 + cross_compiling=yes
2889 else
2890 - CFLAGS="-O"
2891 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
2892 +If you meant to cross compile, use \`--host'.
2893 +See \`config.log' for more details." >&5
2894 +echo "$as_me: error: cannot run C compiled programs.
2895 +If you meant to cross compile, use \`--host'.
2896 +See \`config.log' for more details." >&2;}
2897 + { (exit 1); exit 1; }; }
2898 fi
2899 fi
2900 +fi
2901 +echo "$as_me:$LINENO: result: yes" >&5
2902 +echo "${ECHO_T}yes" >&6
2903 +
2904 +rm -f a.out a.exe conftest$ac_cv_exeext b.out
2905 +ac_clean_files=$ac_clean_files_save
2906 +# Check the compiler produces executables we can run. If not, either
2907 +# the compiler is broken, or we cross compile.
2908 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2909 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
2910 +echo "$as_me:$LINENO: result: $cross_compiling" >&5
2911 +echo "${ECHO_T}$cross_compiling" >&6
2912 +
2913 +echo "$as_me:$LINENO: checking for suffix of executables" >&5
2914 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
2915 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
2916 + (eval $ac_link) 2>&5
2917 + ac_status=$?
2918 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2919 + (exit $ac_status); }; then
2920 + # If both `conftest.exe' and `conftest' are `present' (well, observable)
2921 +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
2922 +# work properly (i.e., refer to `conftest.exe'), while it won't with
2923 +# `rm'.
2924 +for ac_file in conftest.exe conftest conftest.*; do
2925 + test -f "$ac_file" || continue
2926 + case $ac_file in
2927 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
2928 + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2929 + export ac_cv_exeext
2930 + break;;
2931 + * ) break;;
2932 + esac
2933 +done
2934 +else
2935 + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2936 +See \`config.log' for more details." >&5
2937 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2938 +See \`config.log' for more details." >&2;}
2939 + { (exit 1); exit 1; }; }
2940 +fi
2941 +
2942 +rm -f conftest$ac_cv_exeext
2943 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2944 +echo "${ECHO_T}$ac_cv_exeext" >&6
2945 +
2946 +rm -f conftest.$ac_ext
2947 +EXEEXT=$ac_cv_exeext
2948 +ac_exeext=$EXEEXT
2949 +echo "$as_me:$LINENO: checking for suffix of object files" >&5
2950 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
2951 +if test "${ac_cv_objext+set}" = set; then
2952 + echo $ECHO_N "(cached) $ECHO_C" >&6
2953 +else
2954 + cat >conftest.$ac_ext <<_ACEOF
2955 +/* confdefs.h. */
2956 +_ACEOF
2957 +cat confdefs.h >>conftest.$ac_ext
2958 +cat >>conftest.$ac_ext <<_ACEOF
2959 +/* end confdefs.h. */
2960 +
2961 +int
2962 +main ()
2963 +{
2964 +
2965 + ;
2966 + return 0;
2967 +}
2968 +_ACEOF
2969 +rm -f conftest.o conftest.obj
2970 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2971 + (eval $ac_compile) 2>&5
2972 + ac_status=$?
2973 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2974 + (exit $ac_status); }; then
2975 + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
2976 + case $ac_file in
2977 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
2978 + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
2979 + break;;
2980 + esac
2981 +done
2982 +else
2983 + echo "$as_me: failed program was:" >&5
2984 +sed 's/^/| /' conftest.$ac_ext >&5
2985 +
2986 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2987 +See \`config.log' for more details." >&5
2988 +echo "$as_me: error: cannot compute suffix of object files: cannot compile
2989 +See \`config.log' for more details." >&2;}
2990 + { (exit 1); exit 1; }; }
2991 +fi
2992 +
2993 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
2994 +fi
2995 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2996 +echo "${ECHO_T}$ac_cv_objext" >&6
2997 +OBJEXT=$ac_cv_objext
2998 +ac_objext=$OBJEXT
2999 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3000 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
3001 +if test "${ac_cv_c_compiler_gnu+set}" = set; then
3002 + echo $ECHO_N "(cached) $ECHO_C" >&6
3003 +else
3004 + cat >conftest.$ac_ext <<_ACEOF
3005 +/* confdefs.h. */
3006 +_ACEOF
3007 +cat confdefs.h >>conftest.$ac_ext
3008 +cat >>conftest.$ac_ext <<_ACEOF
3009 +/* end confdefs.h. */
3010 +
3011 +int
3012 +main ()
3013 +{
3014 +#ifndef __GNUC__
3015 + choke me
3016 +#endif
3017 +
3018 + ;
3019 + return 0;
3020 +}
3021 +_ACEOF
3022 +rm -f conftest.$ac_objext
3023 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3024 + (eval $ac_compile) 2>conftest.er1
3025 + ac_status=$?
3026 + grep -v '^ *+' conftest.er1 >conftest.err
3027 + rm -f conftest.er1
3028 + cat conftest.err >&5
3029 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3030 + (exit $ac_status); } &&
3031 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3032 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3033 + (eval $ac_try) 2>&5
3034 + ac_status=$?
3035 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3036 + (exit $ac_status); }; } &&
3037 + { ac_try='test -s conftest.$ac_objext'
3038 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3039 + (eval $ac_try) 2>&5
3040 + ac_status=$?
3041 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3042 + (exit $ac_status); }; }; then
3043 + ac_compiler_gnu=yes
3044 +else
3045 + echo "$as_me: failed program was:" >&5
3046 +sed 's/^/| /' conftest.$ac_ext >&5
3047 +
3048 +ac_compiler_gnu=no
3049 +fi
3050 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3051 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
3052 +
3053 +fi
3054 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3055 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
3056 +GCC=`test $ac_compiler_gnu = yes && echo yes`
3057 +ac_test_CFLAGS=${CFLAGS+set}
3058 +ac_save_CFLAGS=$CFLAGS
3059 +CFLAGS="-g"
3060 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3061 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
3062 +if test "${ac_cv_prog_cc_g+set}" = set; then
3063 + echo $ECHO_N "(cached) $ECHO_C" >&6
3064 +else
3065 + cat >conftest.$ac_ext <<_ACEOF
3066 +/* confdefs.h. */
3067 +_ACEOF
3068 +cat confdefs.h >>conftest.$ac_ext
3069 +cat >>conftest.$ac_ext <<_ACEOF
3070 +/* end confdefs.h. */
3071 +
3072 +int
3073 +main ()
3074 +{
3075 +
3076 + ;
3077 + return 0;
3078 +}
3079 +_ACEOF
3080 +rm -f conftest.$ac_objext
3081 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3082 + (eval $ac_compile) 2>conftest.er1
3083 + ac_status=$?
3084 + grep -v '^ *+' conftest.er1 >conftest.err
3085 + rm -f conftest.er1
3086 + cat conftest.err >&5
3087 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3088 + (exit $ac_status); } &&
3089 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3090 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3091 + (eval $ac_try) 2>&5
3092 + ac_status=$?
3093 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3094 + (exit $ac_status); }; } &&
3095 + { ac_try='test -s conftest.$ac_objext'
3096 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3097 + (eval $ac_try) 2>&5
3098 + ac_status=$?
3099 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3100 + (exit $ac_status); }; }; then
3101 + ac_cv_prog_cc_g=yes
3102 +else
3103 + echo "$as_me: failed program was:" >&5
3104 +sed 's/^/| /' conftest.$ac_ext >&5
3105 +
3106 +ac_cv_prog_cc_g=no
3107 +fi
3108 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3109 +fi
3110 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3111 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
3112 +if test "$ac_test_CFLAGS" = set; then
3113 + CFLAGS=$ac_save_CFLAGS
3114 +elif test $ac_cv_prog_cc_g = yes; then
3115 + if test "$GCC" = yes; then
3116 + CFLAGS="-g -O2"
3117 + else
3118 + CFLAGS="-g"
3119 + fi
3120 +else
3121 + if test "$GCC" = yes; then
3122 + CFLAGS="-O2"
3123 + else
3124 + CFLAGS=
3125 + fi
3126 +fi
3127 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
3128 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
3129 +if test "${ac_cv_prog_cc_stdc+set}" = set; then
3130 + echo $ECHO_N "(cached) $ECHO_C" >&6
3131 +else
3132 + ac_cv_prog_cc_stdc=no
3133 +ac_save_CC=$CC
3134 +cat >conftest.$ac_ext <<_ACEOF
3135 +/* confdefs.h. */
3136 +_ACEOF
3137 +cat confdefs.h >>conftest.$ac_ext
3138 +cat >>conftest.$ac_ext <<_ACEOF
3139 +/* end confdefs.h. */
3140 +#include <stdarg.h>
3141 +#include <stdio.h>
3142 +#include <sys/types.h>
3143 +#include <sys/stat.h>
3144 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
3145 +struct buf { int x; };
3146 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
3147 +static char *e (p, i)
3148 + char **p;
3149 + int i;
3150 +{
3151 + return p[i];
3152 +}
3153 +static char *f (char * (*g) (char **, int), char **p, ...)
3154 +{
3155 + char *s;
3156 + va_list v;
3157 + va_start (v,p);
3158 + s = g (p, va_arg (v,int));
3159 + va_end (v);
3160 + return s;
3161 +}
3162 +
3163 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
3164 + function prototypes and stuff, but not '\xHH' hex character constants.
3165 + These don't provoke an error unfortunately, instead are silently treated
3166 + as 'x'. The following induces an error, until -std1 is added to get
3167 + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
3168 + array size at least. It's necessary to write '\x00'==0 to get something
3169 + that's true only with -std1. */
3170 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
3171 +
3172 +int test (int i, double x);
3173 +struct s1 {int (*f) (int a);};
3174 +struct s2 {int (*f) (double a);};
3175 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
3176 +int argc;
3177 +char **argv;
3178 +int
3179 +main ()
3180 +{
3181 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
3182 + ;
3183 + return 0;
3184 +}
3185 +_ACEOF
3186 +# Don't try gcc -ansi; that turns off useful extensions and
3187 +# breaks some systems' header files.
3188 +# AIX -qlanglvl=ansi
3189 +# Ultrix and OSF/1 -std1
3190 +# HP-UX 10.20 and later -Ae
3191 +# HP-UX older versions -Aa -D_HPUX_SOURCE
3192 +# SVR4 -Xc -D__EXTENSIONS__
3193 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3194 +do
3195 + CC="$ac_save_CC $ac_arg"
3196 + rm -f conftest.$ac_objext
3197 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3198 + (eval $ac_compile) 2>conftest.er1
3199 + ac_status=$?
3200 + grep -v '^ *+' conftest.er1 >conftest.err
3201 + rm -f conftest.er1
3202 + cat conftest.err >&5
3203 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3204 + (exit $ac_status); } &&
3205 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3206 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3207 + (eval $ac_try) 2>&5
3208 + ac_status=$?
3209 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3210 + (exit $ac_status); }; } &&
3211 + { ac_try='test -s conftest.$ac_objext'
3212 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3213 + (eval $ac_try) 2>&5
3214 + ac_status=$?
3215 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3216 + (exit $ac_status); }; }; then
3217 + ac_cv_prog_cc_stdc=$ac_arg
3218 +break
3219 +else
3220 + echo "$as_me: failed program was:" >&5
3221 +sed 's/^/| /' conftest.$ac_ext >&5
3222 +
3223 +fi
3224 +rm -f conftest.err conftest.$ac_objext
3225 +done
3226 +rm -f conftest.$ac_ext conftest.$ac_objext
3227 +CC=$ac_save_CC
3228 +
3229 +fi
3230 +
3231 +case "x$ac_cv_prog_cc_stdc" in
3232 + x|xno)
3233 + echo "$as_me:$LINENO: result: none needed" >&5
3234 +echo "${ECHO_T}none needed" >&6 ;;
3235 + *)
3236 + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
3237 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
3238 + CC="$CC $ac_cv_prog_cc_stdc" ;;
3239 +esac
3240 +
3241 +# Some people use a C++ compiler to compile C. Since we use `exit',
3242 +# in C++ we need to declare it. In case someone uses the same compiler
3243 +# for both compiling C and C++ we need to have the C++ compiler decide
3244 +# the declaration of exit, since it's the most demanding environment.
3245 +cat >conftest.$ac_ext <<_ACEOF
3246 +#ifndef __cplusplus
3247 + choke me
3248 +#endif
3249 +_ACEOF
3250 +rm -f conftest.$ac_objext
3251 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3252 + (eval $ac_compile) 2>conftest.er1
3253 + ac_status=$?
3254 + grep -v '^ *+' conftest.er1 >conftest.err
3255 + rm -f conftest.er1
3256 + cat conftest.err >&5
3257 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3258 + (exit $ac_status); } &&
3259 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3260 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3261 + (eval $ac_try) 2>&5
3262 + ac_status=$?
3263 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3264 + (exit $ac_status); }; } &&
3265 + { ac_try='test -s conftest.$ac_objext'
3266 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3267 + (eval $ac_try) 2>&5
3268 + ac_status=$?
3269 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3270 + (exit $ac_status); }; }; then
3271 + for ac_declaration in \
3272 + '' \
3273 + 'extern "C" void std::exit (int) throw (); using std::exit;' \
3274 + 'extern "C" void std::exit (int); using std::exit;' \
3275 + 'extern "C" void exit (int) throw ();' \
3276 + 'extern "C" void exit (int);' \
3277 + 'void exit (int);'
3278 +do
3279 + cat >conftest.$ac_ext <<_ACEOF
3280 +/* confdefs.h. */
3281 +_ACEOF
3282 +cat confdefs.h >>conftest.$ac_ext
3283 +cat >>conftest.$ac_ext <<_ACEOF
3284 +/* end confdefs.h. */
3285 +$ac_declaration
3286 +#include <stdlib.h>
3287 +int
3288 +main ()
3289 +{
3290 +exit (42);
3291 + ;
3292 + return 0;
3293 +}
3294 +_ACEOF
3295 +rm -f conftest.$ac_objext
3296 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3297 + (eval $ac_compile) 2>conftest.er1
3298 + ac_status=$?
3299 + grep -v '^ *+' conftest.er1 >conftest.err
3300 + rm -f conftest.er1
3301 + cat conftest.err >&5
3302 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3303 + (exit $ac_status); } &&
3304 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3305 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3306 + (eval $ac_try) 2>&5
3307 + ac_status=$?
3308 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3309 + (exit $ac_status); }; } &&
3310 + { ac_try='test -s conftest.$ac_objext'
3311 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3312 + (eval $ac_try) 2>&5
3313 + ac_status=$?
3314 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3315 + (exit $ac_status); }; }; then
3316 + :
3317 else
3318 - GCC=
3319 - test "${CFLAGS+set}" = set || CFLAGS="-g"
3320 + echo "$as_me: failed program was:" >&5
3321 +sed 's/^/| /' conftest.$ac_ext >&5
3322 +
3323 +continue
3324 fi
3325 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3326 + cat >conftest.$ac_ext <<_ACEOF
3327 +/* confdefs.h. */
3328 +_ACEOF
3329 +cat confdefs.h >>conftest.$ac_ext
3330 +cat >>conftest.$ac_ext <<_ACEOF
3331 +/* end confdefs.h. */
3332 +$ac_declaration
3333 +int
3334 +main ()
3335 +{
3336 +exit (42);
3337 + ;
3338 + return 0;
3339 +}
3340 +_ACEOF
3341 +rm -f conftest.$ac_objext
3342 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3343 + (eval $ac_compile) 2>conftest.er1
3344 + ac_status=$?
3345 + grep -v '^ *+' conftest.er1 >conftest.err
3346 + rm -f conftest.er1
3347 + cat conftest.err >&5
3348 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3349 + (exit $ac_status); } &&
3350 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3351 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3352 + (eval $ac_try) 2>&5
3353 + ac_status=$?
3354 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3355 + (exit $ac_status); }; } &&
3356 + { ac_try='test -s conftest.$ac_objext'
3357 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3358 + (eval $ac_try) 2>&5
3359 + ac_status=$?
3360 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3361 + (exit $ac_status); }; }; then
3362 + break
3363 +else
3364 + echo "$as_me: failed program was:" >&5
3365 +sed 's/^/| /' conftest.$ac_ext >&5
3366 +
3367 +fi
3368 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3369 +done
3370 +rm -f conftest*
3371 +if test -n "$ac_declaration"; then
3372 + echo '#ifdef __cplusplus' >>confdefs.h
3373 + echo $ac_declaration >>confdefs.h
3374 + echo '#endif' >>confdefs.h
3375 +fi
3376 +
3377 +else
3378 + echo "$as_me: failed program was:" >&5
3379 +sed 's/^/| /' conftest.$ac_ext >&5
3380 +
3381 +fi
3382 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3383 +ac_ext=c
3384 +ac_cpp='$CPP $CPPFLAGS'
3385 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3386 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3387 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
3388
3389 ac_aux_dir=
3390 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
3391 @@ -932,14 +2696,20 @@
3392 ac_aux_dir=$ac_dir
3393 ac_install_sh="$ac_aux_dir/install.sh -c"
3394 break
3395 + elif test -f $ac_dir/shtool; then
3396 + ac_aux_dir=$ac_dir
3397 + ac_install_sh="$ac_aux_dir/shtool install -c"
3398 + break
3399 fi
3400 done
3401 if test -z "$ac_aux_dir"; then
3402 - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
3403 -fi
3404 -ac_config_guess=$ac_aux_dir/config.guess
3405 -ac_config_sub=$ac_aux_dir/config.sub
3406 -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
3407 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
3408 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
3409 + { (exit 1); exit 1; }; }
3410 +fi
3411 +ac_config_guess="$SHELL $ac_aux_dir/config.guess"
3412 +ac_config_sub="$SHELL $ac_aux_dir/config.sub"
3413 +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
3414
3415 # Find a good install program. We prefer a C program (faster),
3416 # so one script is as good as another. But avoid the broken or
3417 @@ -948,274 +2718,1036 @@
3418 # SunOS /usr/etc/install
3419 # IRIX /sbin/install
3420 # AIX /bin/install
3421 +# AmigaOS /C/install, which installs bootblocks on floppy discs
3422 +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
3423 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
3424 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
3425 +# OS/2's system install, which has a completely different semantic
3426 # ./install, which can be erroneously created by make from ./install.sh.
3427 -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
3428 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
3429 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
3430 if test -z "$INSTALL"; then
3431 -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
3432 - echo $ac_n "(cached) $ac_c" 1>&6
3433 +if test "${ac_cv_path_install+set}" = set; then
3434 + echo $ECHO_N "(cached) $ECHO_C" >&6
3435 else
3436 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
3437 - for ac_dir in $PATH; do
3438 - # Account for people who put trailing slashes in PATH elements.
3439 - case "$ac_dir/" in
3440 - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
3441 - *)
3442 - # OSF1 and SCO ODT 3.0 have their own names for install.
3443 - for ac_prog in ginstall installbsd scoinst install; do
3444 - if test -f $ac_dir/$ac_prog; then
3445 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3446 +for as_dir in $PATH
3447 +do
3448 + IFS=$as_save_IFS
3449 + test -z "$as_dir" && as_dir=.
3450 + # Account for people who put trailing slashes in PATH elements.
3451 +case $as_dir/ in
3452 + ./ | .// | /cC/* | \
3453 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
3454 + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
3455 + /usr/ucb/* ) ;;
3456 + *)
3457 + # OSF1 and SCO ODT 3.0 have their own names for install.
3458 + # Don't use installbsd from OSF since it installs stuff as root
3459 + # by default.
3460 + for ac_prog in ginstall scoinst install; do
3461 + for ac_exec_ext in '' $ac_executable_extensions; do
3462 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
3463 if test $ac_prog = install &&
3464 - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
3465 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3466 # AIX install. It has an incompatible calling convention.
3467 - # OSF/1 installbsd also uses dspmsg, but is usable.
3468 + :
3469 + elif test $ac_prog = install &&
3470 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3471 + # program-specific install script used by HP pwplus--don't use.
3472 :
3473 else
3474 - ac_cv_path_install="$ac_dir/$ac_prog -c"
3475 - break 2
3476 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
3477 + break 3
3478 fi
3479 fi
3480 done
3481 - ;;
3482 - esac
3483 - done
3484 - IFS="$ac_save_ifs"
3485 - # As a last resort, use the slow shell script.
3486 - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
3487 + done
3488 + ;;
3489 +esac
3490 +done
3491 +
3492 +
3493 fi
3494 - INSTALL="$ac_cv_path_install"
3495 + if test "${ac_cv_path_install+set}" = set; then
3496 + INSTALL=$ac_cv_path_install
3497 + else
3498 + # As a last resort, use the slow shell script. We don't cache a
3499 + # path for INSTALL within a source directory, because that will
3500 + # break other packages using the cache if that directory is
3501 + # removed, or if the path is relative.
3502 + INSTALL=$ac_install_sh
3503 + fi
3504 fi
3505 -echo "$ac_t""$INSTALL" 1>&6
3506 +echo "$as_me:$LINENO: result: $INSTALL" >&5
3507 +echo "${ECHO_T}$INSTALL" >&6
3508
3509 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
3510 # It thinks the first close brace ends the variable substitution.
3511 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
3512
3513 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
3514 +
3515 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
3516
3517 -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
3518 -set dummy ${MAKE-make}; ac_make=$2
3519 -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
3520 - echo $ac_n "(cached) $ac_c" 1>&6
3521 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3522 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
3523 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
3524 +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
3525 + echo $ECHO_N "(cached) $ECHO_C" >&6
3526 else
3527 - cat > conftestmake <<\EOF
3528 + cat >conftest.make <<\_ACEOF
3529 all:
3530 - @echo 'ac_maketemp="${MAKE}"'
3531 -EOF
3532 + @echo 'ac_maketemp="$(MAKE)"'
3533 +_ACEOF
3534 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
3535 -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
3536 +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
3537 if test -n "$ac_maketemp"; then
3538 eval ac_cv_prog_make_${ac_make}_set=yes
3539 else
3540 eval ac_cv_prog_make_${ac_make}_set=no
3541 fi
3542 -rm -f conftestmake
3543 +rm -f conftest.make
3544 fi
3545 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
3546 - echo "$ac_t""yes" 1>&6
3547 + echo "$as_me:$LINENO: result: yes" >&5
3548 +echo "${ECHO_T}yes" >&6
3549 SET_MAKE=
3550 else
3551 - echo "$ac_t""no" 1>&6
3552 + echo "$as_me:$LINENO: result: no" >&5
3553 +echo "${ECHO_T}no" >&6
3554 SET_MAKE="MAKE=${MAKE-make}"
3555 fi
3556
3557
3558 -trap '' 1 2 15
3559 -cat > confcache <<\EOF
3560 + ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile"
3561 +cat >confcache <<\_ACEOF
3562 # This file is a shell script that caches the results of configure
3563 # tests run on this system so they can be shared between configure
3564 -# scripts and configure runs. It is not useful on other systems.
3565 -# If it contains results you don't want to keep, you may remove or edit it.
3566 +# scripts and configure runs, see configure's option --config-cache.
3567 +# It is not useful on other systems. If it contains results you don't
3568 +# want to keep, you may remove or edit it.
3569 #
3570 -# By default, configure uses ./config.cache as the cache file,
3571 -# creating it if it does not exist already. You can give configure
3572 -# the --cache-file=FILE option to use a different cache file; that is
3573 -# what configure does when it calls configure scripts in
3574 -# subdirectories, so they share the cache.
3575 -# Giving --cache-file=/dev/null disables caching, for debugging configure.
3576 -# config.status only pays attention to the cache file if you give it the
3577 -# --recheck option to rerun configure.
3578 +# config.status only pays attention to the cache file if you give it
3579 +# the --recheck option to rerun configure.
3580 #
3581 -EOF
3582 +# `ac_cv_env_foo' variables (set or unset) will be overridden when
3583 +# loading this file, other *unset* `ac_cv_foo' will be assigned the
3584 +# following values.
3585 +
3586 +_ACEOF
3587 +
3588 +# The following way of writing the cache mishandles newlines in values,
3589 +# but we know of no workaround that is simple, portable, and efficient.
3590 +# So, don't put newlines in cache variables' values.
3591 # Ultrix sh set writes to stderr and can't be redirected directly,
3592 # and sets the high bit in the cache file unless we assign to the vars.
3593 -(set) 2>&1 |
3594 - sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
3595 - >> confcache
3596 -if cmp -s $cache_file confcache; then
3597 - :
3598 -else
3599 +{
3600 + (set) 2>&1 |
3601 + case `(ac_space=' '; set | grep ac_space) 2>&1` in
3602 + *ac_space=\ *)
3603 + # `set' does not quote correctly, so add quotes (double-quote
3604 + # substitution turns \\\\ into \\, and sed turns \\ into \).
3605 + sed -n \
3606 + "s/'/'\\\\''/g;
3607 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
3608 + ;;
3609 + *)
3610 + # `set' quotes correctly as required by POSIX, so do not add quotes.
3611 + sed -n \
3612 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
3613 + ;;
3614 + esac;
3615 +} |
3616 + sed '
3617 + t clear
3618 + : clear
3619 + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
3620 + t end
3621 + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
3622 + : end' >>confcache
3623 +if diff $cache_file confcache >/dev/null 2>&1; then :; else
3624 if test -w $cache_file; then
3625 - echo "updating cache $cache_file"
3626 - cat confcache > $cache_file
3627 + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
3628 + cat confcache >$cache_file
3629 else
3630 echo "not updating unwritable cache $cache_file"
3631 fi
3632 fi
3633 rm -f confcache
3634
3635 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
3636 -
3637 test "x$prefix" = xNONE && prefix=$ac_default_prefix
3638 # Let make expand exec_prefix.
3639 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
3640
3641 -# Any assignment to VPATH causes Sun make to only execute
3642 -# the first set of double-colon rules, so remove it if not needed.
3643 -# If there is a colon in the path, we need to keep it.
3644 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
3645 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
3646 +# trailing colons and then remove the whole line if VPATH becomes empty
3647 +# (actually we leave an empty line to preserve line numbers).
3648 if test "x$srcdir" = x.; then
3649 - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
3650 + ac_vpsub='/^[ ]*VPATH[ ]*=/{
3651 +s/:*\$(srcdir):*/:/;
3652 +s/:*\${srcdir}:*/:/;
3653 +s/:*@srcdir@:*/:/;
3654 +s/^\([^=]*=[ ]*\):*/\1/;
3655 +s/:*$//;
3656 +s/^[^=]*=[ ]*$//;
3657 +}'
3658 fi
3659
3660 -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
3661 -
3662 # Transform confdefs.h into DEFS.
3663 # Protect against shell expansion while executing Makefile rules.
3664 # Protect against Makefile macro expansion.
3665 -cat > conftest.defs <<\EOF
3666 -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
3667 -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
3668 -s%\[%\\&%g
3669 -s%\]%\\&%g
3670 -s%\$%$$%g
3671 -EOF
3672 -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
3673 -rm -f conftest.defs
3674 +#
3675 +# If the first sed substitution is executed (which looks for macros that
3676 +# take arguments), then we branch to the quote section. Otherwise,
3677 +# look for a macro that doesn't take arguments.
3678 +cat >confdef2opt.sed <<\_ACEOF
3679 +t clear
3680 +: clear
3681 +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
3682 +t quote
3683 +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
3684 +t quote
3685 +d
3686 +: quote
3687 +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
3688 +s,\[,\\&,g
3689 +s,\],\\&,g
3690 +s,\$,$$,g
3691 +p
3692 +_ACEOF
3693 +# We use echo to avoid assuming a particular line-breaking character.
3694 +# The extra dot is to prevent the shell from consuming trailing
3695 +# line-breaks from the sub-command output. A line-break within
3696 +# single-quotes doesn't work because, if this script is created in a
3697 +# platform that uses two characters for line-breaks (e.g., DOS), tr
3698 +# would break.
3699 +ac_LF_and_DOT=`echo; echo .`
3700 +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
3701 +rm -f confdef2opt.sed
3702 +
3703 +
3704 +ac_libobjs=
3705 +ac_ltlibobjs=
3706 +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
3707 + # 1. Remove the extension, and $U if already installed.
3708 + ac_i=`echo "$ac_i" |
3709 + sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
3710 + # 2. Add them.
3711 + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
3712 + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
3713 +done
3714 +LIBOBJS=$ac_libobjs
3715
3716 +LTLIBOBJS=$ac_ltlibobjs
3717
3718 -# Without the "./", some shells look in PATH for config.status.
3719 -: ${CONFIG_STATUS=./config.status}
3720
3721 -echo creating $CONFIG_STATUS
3722 -rm -f $CONFIG_STATUS
3723 -cat > $CONFIG_STATUS <<EOF
3724 -#! /bin/sh
3725 -# Generated automatically by configure.
3726 +
3727 +: ${CONFIG_STATUS=./config.status}
3728 +ac_clean_files_save=$ac_clean_files
3729 +ac_clean_files="$ac_clean_files $CONFIG_STATUS"
3730 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3731 +echo "$as_me: creating $CONFIG_STATUS" >&6;}
3732 +cat >$CONFIG_STATUS <<_ACEOF
3733 +#! $SHELL
3734 +# Generated by $as_me.
3735 # Run this file to recreate the current configuration.
3736 -# This directory was configured as follows,
3737 -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
3738 -#
3739 -# $0 $ac_configure_args
3740 -#
3741 # Compiler output produced by configure, useful for debugging
3742 -# configure, is in ./config.log if it exists.
3743 +# configure, is in config.log if it exists.
3744
3745 -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
3746 -for ac_option
3747 +debug=false
3748 +ac_cs_recheck=false
3749 +ac_cs_silent=false
3750 +SHELL=\${CONFIG_SHELL-$SHELL}
3751 +_ACEOF
3752 +
3753 +cat >>$CONFIG_STATUS <<\_ACEOF
3754 +## --------------------- ##
3755 +## M4sh Initialization. ##
3756 +## --------------------- ##
3757 +
3758 +# Be Bourne compatible
3759 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3760 + emulate sh
3761 + NULLCMD=:
3762 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3763 + # is contrary to our usage. Disable this feature.
3764 + alias -g '${1+"$@"}'='"$@"'
3765 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
3766 + set -o posix
3767 +fi
3768 +DUALCASE=1; export DUALCASE # for MKS sh
3769 +
3770 +# Support unset when possible.
3771 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
3772 + as_unset=unset
3773 +else
3774 + as_unset=false
3775 +fi
3776 +
3777 +
3778 +# Work around bugs in pre-3.0 UWIN ksh.
3779 +$as_unset ENV MAIL MAILPATH
3780 +PS1='$ '
3781 +PS2='> '
3782 +PS4='+ '
3783 +
3784 +# NLS nuisances.
3785 +for as_var in \
3786 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3787 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3788 + LC_TELEPHONE LC_TIME
3789 +do
3790 + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
3791 + eval $as_var=C; export $as_var
3792 + else
3793 + $as_unset $as_var
3794 + fi
3795 +done
3796 +
3797 +# Required to use basename.
3798 +if expr a : '\(a\)' >/dev/null 2>&1; then
3799 + as_expr=expr
3800 +else
3801 + as_expr=false
3802 +fi
3803 +
3804 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
3805 + as_basename=basename
3806 +else
3807 + as_basename=false
3808 +fi
3809 +
3810 +
3811 +# Name of the executable.
3812 +as_me=`$as_basename "$0" ||
3813 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3814 + X"$0" : 'X\(//\)$' \| \
3815 + X"$0" : 'X\(/\)$' \| \
3816 + . : '\(.\)' 2>/dev/null ||
3817 +echo X/"$0" |
3818 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
3819 + /^X\/\(\/\/\)$/{ s//\1/; q; }
3820 + /^X\/\(\/\).*/{ s//\1/; q; }
3821 + s/.*/./; q'`
3822 +
3823 +
3824 +# PATH needs CR, and LINENO needs CR and PATH.
3825 +# Avoid depending upon Character Ranges.
3826 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
3827 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
3828 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
3829 +as_cr_digits='0123456789'
3830 +as_cr_alnum=$as_cr_Letters$as_cr_digits
3831 +
3832 +# The user is always right.
3833 +if test "${PATH_SEPARATOR+set}" != set; then
3834 + echo "#! /bin/sh" >conf$$.sh
3835 + echo "exit 0" >>conf$$.sh
3836 + chmod +x conf$$.sh
3837 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3838 + PATH_SEPARATOR=';'
3839 + else
3840 + PATH_SEPARATOR=:
3841 + fi
3842 + rm -f conf$$.sh
3843 +fi
3844 +
3845 +
3846 + as_lineno_1=$LINENO
3847 + as_lineno_2=$LINENO
3848 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3849 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3850 + test "x$as_lineno_3" = "x$as_lineno_2" || {
3851 + # Find who we are. Look in the path if we contain no path at all
3852 + # relative or not.
3853 + case $0 in
3854 + *[\\/]* ) as_myself=$0 ;;
3855 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3856 +for as_dir in $PATH
3857 +do
3858 + IFS=$as_save_IFS
3859 + test -z "$as_dir" && as_dir=.
3860 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
3861 +done
3862 +
3863 + ;;
3864 + esac
3865 + # We did not find ourselves, most probably we were run as `sh COMMAND'
3866 + # in which case we are not to be found in the path.
3867 + if test "x$as_myself" = x; then
3868 + as_myself=$0
3869 + fi
3870 + if test ! -f "$as_myself"; then
3871 + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
3872 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
3873 + { (exit 1); exit 1; }; }
3874 + fi
3875 + case $CONFIG_SHELL in
3876 + '')
3877 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3878 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
3879 +do
3880 + IFS=$as_save_IFS
3881 + test -z "$as_dir" && as_dir=.
3882 + for as_base in sh bash ksh sh5; do
3883 + case $as_dir in
3884 + /*)
3885 + if ("$as_dir/$as_base" -c '
3886 + as_lineno_1=$LINENO
3887 + as_lineno_2=$LINENO
3888 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3889 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3890 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
3891 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
3892 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
3893 + CONFIG_SHELL=$as_dir/$as_base
3894 + export CONFIG_SHELL
3895 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
3896 + fi;;
3897 + esac
3898 + done
3899 +done
3900 +;;
3901 + esac
3902 +
3903 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
3904 + # uniformly replaced by the line number. The first 'sed' inserts a
3905 + # line-number line before each line; the second 'sed' does the real
3906 + # work. The second script uses 'N' to pair each line-number line
3907 + # with the numbered line, and appends trailing '-' during
3908 + # substitution so that $LINENO is not a special case at line end.
3909 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
3910 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
3911 + sed '=' <$as_myself |
3912 + sed '
3913 + N
3914 + s,$,-,
3915 + : loop
3916 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
3917 + t loop
3918 + s,-$,,
3919 + s,^['$as_cr_digits']*\n,,
3920 + ' >$as_me.lineno &&
3921 + chmod +x $as_me.lineno ||
3922 + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
3923 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
3924 + { (exit 1); exit 1; }; }
3925 +
3926 + # Don't try to exec as it changes $[0], causing all sort of problems
3927 + # (the dirname of $[0] is not the place where we might find the
3928 + # original and so on. Autoconf is especially sensible to this).
3929 + . ./$as_me.lineno
3930 + # Exit status is that of the last command.
3931 + exit
3932 +}
3933 +
3934 +
3935 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
3936 + *c*,-n*) ECHO_N= ECHO_C='
3937 +' ECHO_T=' ' ;;
3938 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
3939 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
3940 +esac
3941 +
3942 +if expr a : '\(a\)' >/dev/null 2>&1; then
3943 + as_expr=expr
3944 +else
3945 + as_expr=false
3946 +fi
3947 +
3948 +rm -f conf$$ conf$$.exe conf$$.file
3949 +echo >conf$$.file
3950 +if ln -s conf$$.file conf$$ 2>/dev/null; then
3951 + # We could just check for DJGPP; but this test a) works b) is more generic
3952 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
3953 + if test -f conf$$.exe; then
3954 + # Don't use ln at all; we don't have any links
3955 + as_ln_s='cp -p'
3956 + else
3957 + as_ln_s='ln -s'
3958 + fi
3959 +elif ln conf$$.file conf$$ 2>/dev/null; then
3960 + as_ln_s=ln
3961 +else
3962 + as_ln_s='cp -p'
3963 +fi
3964 +rm -f conf$$ conf$$.exe conf$$.file
3965 +
3966 +if mkdir -p . 2>/dev/null; then
3967 + as_mkdir_p=:
3968 +else
3969 + test -d ./-p && rmdir ./-p
3970 + as_mkdir_p=false
3971 +fi
3972 +
3973 +as_executable_p="test -f"
3974 +
3975 +# Sed expression to map a string onto a valid CPP name.
3976 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
3977 +
3978 +# Sed expression to map a string onto a valid variable name.
3979 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
3980 +
3981 +
3982 +# IFS
3983 +# We need space, tab and new line, in precisely that order.
3984 +as_nl='
3985 +'
3986 +IFS=" $as_nl"
3987 +
3988 +# CDPATH.
3989 +$as_unset CDPATH
3990 +
3991 +exec 6>&1
3992 +
3993 +# Open the log real soon, to keep \$[0] and so on meaningful, and to
3994 +# report actual input values of CONFIG_FILES etc. instead of their
3995 +# values after options handling. Logging --version etc. is OK.
3996 +exec 5>>config.log
3997 +{
3998 + echo
3999 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
4000 +## Running $as_me. ##
4001 +_ASBOX
4002 +} >&5
4003 +cat >&5 <<_CSEOF
4004 +
4005 +This file was extended by $as_me, which was
4006 +generated by GNU Autoconf 2.59. Invocation command line was
4007 +
4008 + CONFIG_FILES = $CONFIG_FILES
4009 + CONFIG_HEADERS = $CONFIG_HEADERS
4010 + CONFIG_LINKS = $CONFIG_LINKS
4011 + CONFIG_COMMANDS = $CONFIG_COMMANDS
4012 + $ $0 $@
4013 +
4014 +_CSEOF
4015 +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
4016 +echo >&5
4017 +_ACEOF
4018 +
4019 +# Files that config.status was made for.
4020 +if test -n "$ac_config_files"; then
4021 + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
4022 +fi
4023 +
4024 +if test -n "$ac_config_headers"; then
4025 + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
4026 +fi
4027 +
4028 +if test -n "$ac_config_links"; then
4029 + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
4030 +fi
4031 +
4032 +if test -n "$ac_config_commands"; then
4033 + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
4034 +fi
4035 +
4036 +cat >>$CONFIG_STATUS <<\_ACEOF
4037 +
4038 +ac_cs_usage="\
4039 +\`$as_me' instantiates files from templates according to the
4040 +current configuration.
4041 +
4042 +Usage: $0 [OPTIONS] [FILE]...
4043 +
4044 + -h, --help print this help, then exit
4045 + -V, --version print version number, then exit
4046 + -q, --quiet do not print progress messages
4047 + -d, --debug don't remove temporary files
4048 + --recheck update $as_me by reconfiguring in the same conditions
4049 + --file=FILE[:TEMPLATE]
4050 + instantiate the configuration file FILE
4051 +
4052 +Configuration files:
4053 +$config_files
4054 +
4055 +Report bugs to <bug-autoconf@gnu.org>."
4056 +_ACEOF
4057 +
4058 +cat >>$CONFIG_STATUS <<_ACEOF
4059 +ac_cs_version="\\
4060 +config.status
4061 +configured by $0, generated by GNU Autoconf 2.59,
4062 + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
4063 +
4064 +Copyright (C) 2003 Free Software Foundation, Inc.
4065 +This config.status script is free software; the Free Software Foundation
4066 +gives unlimited permission to copy, distribute and modify it."
4067 +srcdir=$srcdir
4068 +INSTALL="$INSTALL"
4069 +_ACEOF
4070 +
4071 +cat >>$CONFIG_STATUS <<\_ACEOF
4072 +# If no file are specified by the user, then we need to provide default
4073 +# value. By we need to know if files were specified by the user.
4074 +ac_need_defaults=:
4075 +while test $# != 0
4076 do
4077 - case "\$ac_option" in
4078 + case $1 in
4079 + --*=*)
4080 + ac_option=`expr "x$1" : 'x\([^=]*\)='`
4081 + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
4082 + ac_shift=:
4083 + ;;
4084 + -*)
4085 + ac_option=$1
4086 + ac_optarg=$2
4087 + ac_shift=shift
4088 + ;;
4089 + *) # This is not an option, so the user has probably given explicit
4090 + # arguments.
4091 + ac_option=$1
4092 + ac_need_defaults=false;;
4093 + esac
4094 +
4095 + case $ac_option in
4096 + # Handling of the options.
4097 +_ACEOF
4098 +cat >>$CONFIG_STATUS <<\_ACEOF
4099 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
4100 - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
4101 - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
4102 - -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
4103 - echo "$CONFIG_STATUS generated by autoconf version 2.4"
4104 - exit 0 ;;
4105 - -help | --help | --hel | --he | --h)
4106 - echo "\$ac_cs_usage"; exit 0 ;;
4107 - *) echo "\$ac_cs_usage"; exit 1 ;;
4108 + ac_cs_recheck=: ;;
4109 + --version | --vers* | -V )
4110 + echo "$ac_cs_version"; exit 0 ;;
4111 + --he | --h)
4112 + # Conflict between --help and --header
4113 + { { echo "$as_me:$LINENO: error: ambiguous option: $1
4114 +Try \`$0 --help' for more information." >&5
4115 +echo "$as_me: error: ambiguous option: $1
4116 +Try \`$0 --help' for more information." >&2;}
4117 + { (exit 1); exit 1; }; };;
4118 + --help | --hel | -h )
4119 + echo "$ac_cs_usage"; exit 0 ;;
4120 + --debug | --d* | -d )
4121 + debug=: ;;
4122 + --file | --fil | --fi | --f )
4123 + $ac_shift
4124 + CONFIG_FILES="$CONFIG_FILES $ac_optarg"
4125 + ac_need_defaults=false;;
4126 + --header | --heade | --head | --hea )
4127 + $ac_shift
4128 + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
4129 + ac_need_defaults=false;;
4130 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
4131 + | -silent | --silent | --silen | --sile | --sil | --si | --s)
4132 + ac_cs_silent=: ;;
4133 +
4134 + # This is an error.
4135 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
4136 +Try \`$0 --help' for more information." >&5
4137 +echo "$as_me: error: unrecognized option: $1
4138 +Try \`$0 --help' for more information." >&2;}
4139 + { (exit 1); exit 1; }; } ;;
4140 +
4141 + *) ac_config_targets="$ac_config_targets $1" ;;
4142 +
4143 esac
4144 + shift
4145 done
4146
4147 -ac_given_srcdir=$srcdir
4148 -ac_given_INSTALL="$INSTALL"
4149 -
4150 -trap 'rm -fr `echo "Makefile man/Makefile src/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
4151 -
4152 -# Protect against being on the right side of a sed subst in config.status.
4153 -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
4154 - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
4155 -$ac_vpsub
4156 -$extrasub
4157 -s%@CFLAGS@%$CFLAGS%g
4158 -s%@CPPFLAGS@%$CPPFLAGS%g
4159 -s%@CXXFLAGS@%$CXXFLAGS%g
4160 -s%@DEFS@%$DEFS%g
4161 -s%@LDFLAGS@%$LDFLAGS%g
4162 -s%@LIBS@%$LIBS%g
4163 -s%@exec_prefix@%$exec_prefix%g
4164 -s%@prefix@%$prefix%g
4165 -s%@program_transform_name@%$program_transform_name%g
4166 -s%@DIFF@%$DIFF%g
4167 -s%@DIFF_SUCCESS@%$DIFF_SUCCESS%g
4168 -s%@DIFF_FAILURE@%$DIFF_FAILURE%g
4169 -s%@DIFF_TROUBLE@%$DIFF_TROUBLE%g
4170 -s%@DIFFFLAGS@%$DIFFFLAGS%g
4171 -s%@DIFF_L@%$DIFF_L%g
4172 -s%@DIFF3@%$DIFF3%g
4173 -s%@DIFF3_BIN@%$DIFF3_BIN%g
4174 -s%@ED@%$ED%g
4175 -s%@SENDMAIL@%$SENDMAIL%g
4176 -s%@PIC@%$PIC%g
4177 -s%@CC@%$CC%g
4178 -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
4179 -s%@INSTALL_DATA@%$INSTALL_DATA%g
4180 -s%@SET_MAKE@%$SET_MAKE%g
4181 +ac_configure_extra_args=
4182 +
4183 +if $ac_cs_silent; then
4184 + exec 6>/dev/null
4185 + ac_configure_extra_args="$ac_configure_extra_args --silent"
4186 +fi
4187 +
4188 +_ACEOF
4189 +cat >>$CONFIG_STATUS <<_ACEOF
4190 +if \$ac_cs_recheck; then
4191 + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
4192 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
4193 +fi
4194 +
4195 +_ACEOF
4196 +
4197 +
4198 +
4199 +
4200 +
4201 +cat >>$CONFIG_STATUS <<\_ACEOF
4202 +for ac_config_target in $ac_config_targets
4203 +do
4204 + case "$ac_config_target" in
4205 + # Handling of arguments.
4206 + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
4207 + "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
4208 + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
4209 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
4210 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
4211 + { (exit 1); exit 1; }; };;
4212 + esac
4213 +done
4214 +
4215 +# If the user did not use the arguments to specify the items to instantiate,
4216 +# then the envvar interface is used. Set only those that are not.
4217 +# We use the long form for the default assignment because of an extremely
4218 +# bizarre bug on SunOS 4.1.3.
4219 +if $ac_need_defaults; then
4220 + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
4221 +fi
4222 +
4223 +# Have a temporary directory for convenience. Make it in the build tree
4224 +# simply because there is no reason to put it here, and in addition,
4225 +# creating and moving files from /tmp can sometimes cause problems.
4226 +# Create a temporary directory, and hook for its removal unless debugging.
4227 +$debug ||
4228 +{
4229 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
4230 + trap '{ (exit 1); exit 1; }' 1 2 13 15
4231 +}
4232 +
4233 +# Create a (secure) tmp directory for tmp files.
4234 +
4235 +{
4236 + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
4237 + test -n "$tmp" && test -d "$tmp"
4238 +} ||
4239 +{
4240 + tmp=./confstat$$-$RANDOM
4241 + (umask 077 && mkdir $tmp)
4242 +} ||
4243 +{
4244 + echo "$me: cannot create a temporary directory in ." >&2
4245 + { (exit 1); exit 1; }
4246 +}
4247
4248 +_ACEOF
4249 +
4250 +cat >>$CONFIG_STATUS <<_ACEOF
4251 +
4252 +#
4253 +# CONFIG_FILES section.
4254 +#
4255 +
4256 +# No need to generate the scripts if there are no CONFIG_FILES.
4257 +# This happens for instance when ./config.status config.h
4258 +if test -n "\$CONFIG_FILES"; then
4259 + # Protect against being on the right side of a sed subst in config.status.
4260 + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
4261 + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
4262 +s,@SHELL@,$SHELL,;t t
4263 +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
4264 +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
4265 +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
4266 +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
4267 +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
4268 +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
4269 +s,@exec_prefix@,$exec_prefix,;t t
4270 +s,@prefix@,$prefix,;t t
4271 +s,@program_transform_name@,$program_transform_name,;t t
4272 +s,@bindir@,$bindir,;t t
4273 +s,@sbindir@,$sbindir,;t t
4274 +s,@libexecdir@,$libexecdir,;t t
4275 +s,@datadir@,$datadir,;t t
4276 +s,@sysconfdir@,$sysconfdir,;t t
4277 +s,@sharedstatedir@,$sharedstatedir,;t t
4278 +s,@localstatedir@,$localstatedir,;t t
4279 +s,@libdir@,$libdir,;t t
4280 +s,@includedir@,$includedir,;t t
4281 +s,@oldincludedir@,$oldincludedir,;t t
4282 +s,@infodir@,$infodir,;t t
4283 +s,@mandir@,$mandir,;t t
4284 +s,@build_alias@,$build_alias,;t t
4285 +s,@host_alias@,$host_alias,;t t
4286 +s,@target_alias@,$target_alias,;t t
4287 +s,@DEFS@,$DEFS,;t t
4288 +s,@ECHO_C@,$ECHO_C,;t t
4289 +s,@ECHO_N@,$ECHO_N,;t t
4290 +s,@ECHO_T@,$ECHO_T,;t t
4291 +s,@LIBS@,$LIBS,;t t
4292 +s,@DIFF@,$DIFF,;t t
4293 +s,@DIFF_SUCCESS@,$DIFF_SUCCESS,;t t
4294 +s,@DIFF_FAILURE@,$DIFF_FAILURE,;t t
4295 +s,@DIFF_TROUBLE@,$DIFF_TROUBLE,;t t
4296 +s,@DIFFFLAGS@,$DIFFFLAGS,;t t
4297 +s,@DIFF_L@,$DIFF_L,;t t
4298 +s,@DIFF3@,$DIFF3,;t t
4299 +s,@DIFF3_BIN@,$DIFF3_BIN,;t t
4300 +s,@ED@,$ED,;t t
4301 +s,@SENDMAIL@,$SENDMAIL,;t t
4302 +s,@PIC@,$PIC,;t t
4303 +s,@CC@,$CC,;t t
4304 +s,@CFLAGS@,$CFLAGS,;t t
4305 +s,@LDFLAGS@,$LDFLAGS,;t t
4306 +s,@CPPFLAGS@,$CPPFLAGS,;t t
4307 +s,@ac_ct_CC@,$ac_ct_CC,;t t
4308 +s,@EXEEXT@,$EXEEXT,;t t
4309 +s,@OBJEXT@,$OBJEXT,;t t
4310 +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
4311 +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
4312 +s,@INSTALL_DATA@,$INSTALL_DATA,;t t
4313 +s,@SET_MAKE@,$SET_MAKE,;t t
4314 +s,@LIBOBJS@,$LIBOBJS,;t t
4315 +s,@LTLIBOBJS@,$LTLIBOBJS,;t t
4316 CEOF
4317 -EOF
4318 -cat >> $CONFIG_STATUS <<EOF
4319
4320 -CONFIG_FILES=\${CONFIG_FILES-"Makefile man/Makefile src/Makefile"}
4321 -EOF
4322 -cat >> $CONFIG_STATUS <<\EOF
4323 -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
4324 - # Support "outfile[:infile]", defaulting infile="outfile.in".
4325 - case "$ac_file" in
4326 - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
4327 - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
4328 - *) ac_file_in="${ac_file}.in" ;;
4329 - esac
4330 -
4331 - # Adjust relative srcdir, etc. for subdirectories.
4332 -
4333 - # Remove last slash and all that follows it. Not all systems have dirname.
4334 - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
4335 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
4336 - # The file is in a subdirectory.
4337 - test ! -d "$ac_dir" && mkdir "$ac_dir"
4338 - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
4339 - # A "../" for each directory in $ac_dir_suffix.
4340 - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
4341 - else
4342 - ac_dir_suffix= ac_dots=
4343 +_ACEOF
4344 +
4345 + cat >>$CONFIG_STATUS <<\_ACEOF
4346 + # Split the substitutions into bite-sized pieces for seds with
4347 + # small command number limits, like on Digital OSF/1 and HP-UX.
4348 + ac_max_sed_lines=48
4349 + ac_sed_frag=1 # Number of current file.
4350 + ac_beg=1 # First line for current file.
4351 + ac_end=$ac_max_sed_lines # Line after last line for current file.
4352 + ac_more_lines=:
4353 + ac_sed_cmds=
4354 + while $ac_more_lines; do
4355 + if test $ac_beg -gt 1; then
4356 + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
4357 + else
4358 + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
4359 + fi
4360 + if test ! -s $tmp/subs.frag; then
4361 + ac_more_lines=false
4362 + else
4363 + # The purpose of the label and of the branching condition is to
4364 + # speed up the sed processing (if there are no `@' at all, there
4365 + # is no need to browse any of the substitutions).
4366 + # These are the two extra sed commands mentioned above.
4367 + (echo ':t
4368 + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
4369 + if test -z "$ac_sed_cmds"; then
4370 + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
4371 + else
4372 + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
4373 + fi
4374 + ac_sed_frag=`expr $ac_sed_frag + 1`
4375 + ac_beg=$ac_end
4376 + ac_end=`expr $ac_end + $ac_max_sed_lines`
4377 + fi
4378 + done
4379 + if test -z "$ac_sed_cmds"; then
4380 + ac_sed_cmds=cat
4381 fi
4382 +fi # test -n "$CONFIG_FILES"
4383 +
4384 +_ACEOF
4385 +cat >>$CONFIG_STATUS <<\_ACEOF
4386 +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
4387 + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
4388 + case $ac_file in
4389 + - | *:- | *:-:* ) # input from stdin
4390 + cat >$tmp/stdin
4391 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
4392 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
4393 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
4394 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
4395 + * ) ac_file_in=$ac_file.in ;;
4396 + esac
4397
4398 - case "$ac_given_srcdir" in
4399 - .) srcdir=.
4400 - if test -z "$ac_dots"; then top_srcdir=.
4401 - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
4402 - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
4403 + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
4404 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
4405 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4406 + X"$ac_file" : 'X\(//\)[^/]' \| \
4407 + X"$ac_file" : 'X\(//\)$' \| \
4408 + X"$ac_file" : 'X\(/\)' \| \
4409 + . : '\(.\)' 2>/dev/null ||
4410 +echo X"$ac_file" |
4411 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4412 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4413 + /^X\(\/\/\)$/{ s//\1/; q; }
4414 + /^X\(\/\).*/{ s//\1/; q; }
4415 + s/.*/./; q'`
4416 + { if $as_mkdir_p; then
4417 + mkdir -p "$ac_dir"
4418 + else
4419 + as_dir="$ac_dir"
4420 + as_dirs=
4421 + while test ! -d "$as_dir"; do
4422 + as_dirs="$as_dir $as_dirs"
4423 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
4424 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4425 + X"$as_dir" : 'X\(//\)[^/]' \| \
4426 + X"$as_dir" : 'X\(//\)$' \| \
4427 + X"$as_dir" : 'X\(/\)' \| \
4428 + . : '\(.\)' 2>/dev/null ||
4429 +echo X"$as_dir" |
4430 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4431 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4432 + /^X\(\/\/\)$/{ s//\1/; q; }
4433 + /^X\(\/\).*/{ s//\1/; q; }
4434 + s/.*/./; q'`
4435 + done
4436 + test ! -n "$as_dirs" || mkdir $as_dirs
4437 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
4438 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
4439 + { (exit 1); exit 1; }; }; }
4440 +
4441 + ac_builddir=.
4442 +
4443 +if test "$ac_dir" != .; then
4444 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
4445 + # A "../" for each directory in $ac_dir_suffix.
4446 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
4447 +else
4448 + ac_dir_suffix= ac_top_builddir=
4449 +fi
4450 +
4451 +case $srcdir in
4452 + .) # No --srcdir option. We are building in place.
4453 + ac_srcdir=.
4454 + if test -z "$ac_top_builddir"; then
4455 + ac_top_srcdir=.
4456 + else
4457 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
4458 + fi ;;
4459 + [\\/]* | ?:[\\/]* ) # Absolute path.
4460 + ac_srcdir=$srcdir$ac_dir_suffix;
4461 + ac_top_srcdir=$srcdir ;;
4462 *) # Relative path.
4463 - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
4464 - top_srcdir="$ac_dots$ac_given_srcdir" ;;
4465 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
4466 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
4467 +esac
4468 +
4469 +# Do not use `cd foo && pwd` to compute absolute paths, because
4470 +# the directories may not exist.
4471 +case `pwd` in
4472 +.) ac_abs_builddir="$ac_dir";;
4473 +*)
4474 + case "$ac_dir" in
4475 + .) ac_abs_builddir=`pwd`;;
4476 + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
4477 + *) ac_abs_builddir=`pwd`/"$ac_dir";;
4478 + esac;;
4479 +esac
4480 +case $ac_abs_builddir in
4481 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
4482 +*)
4483 + case ${ac_top_builddir}. in
4484 + .) ac_abs_top_builddir=$ac_abs_builddir;;
4485 + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
4486 + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
4487 + esac;;
4488 +esac
4489 +case $ac_abs_builddir in
4490 +.) ac_abs_srcdir=$ac_srcdir;;
4491 +*)
4492 + case $ac_srcdir in
4493 + .) ac_abs_srcdir=$ac_abs_builddir;;
4494 + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
4495 + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
4496 + esac;;
4497 +esac
4498 +case $ac_abs_builddir in
4499 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
4500 +*)
4501 + case $ac_top_srcdir in
4502 + .) ac_abs_top_srcdir=$ac_abs_builddir;;
4503 + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
4504 + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
4505 + esac;;
4506 +esac
4507 +
4508 +
4509 + case $INSTALL in
4510 + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
4511 + *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
4512 esac
4513
4514 - case "$ac_given_INSTALL" in
4515 - [/$]*) INSTALL="$ac_given_INSTALL" ;;
4516 - *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
4517 - esac
4518 - echo creating "$ac_file"
4519 - rm -f "$ac_file"
4520 - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
4521 - case "$ac_file" in
4522 - *Makefile*) ac_comsub="1i\\
4523 -# $configure_input" ;;
4524 - *) ac_comsub= ;;
4525 - esac
4526 - sed -e "$ac_comsub
4527 -s%@configure_input@%$configure_input%g
4528 -s%@srcdir@%$srcdir%g
4529 -s%@top_srcdir@%$top_srcdir%g
4530 -s%@INSTALL@%$INSTALL%g
4531 -" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
4532 -fi; done
4533 -rm -f conftest.subs
4534 + # Let's still pretend it is `configure' which instantiates (i.e., don't
4535 + # use $as_me), people would be surprised to read:
4536 + # /* config.h. Generated by config.status. */
4537 + if test x"$ac_file" = x-; then
4538 + configure_input=
4539 + else
4540 + configure_input="$ac_file. "
4541 + fi
4542 + configure_input=$configure_input"Generated from `echo $ac_file_in |
4543 + sed 's,.*/,,'` by configure."
4544
4545 + # First look for the input files in the build tree, otherwise in the
4546 + # src tree.
4547 + ac_file_inputs=`IFS=:
4548 + for f in $ac_file_in; do
4549 + case $f in
4550 + -) echo $tmp/stdin ;;
4551 + [\\/$]*)
4552 + # Absolute (can't be DOS-style, as IFS=:)
4553 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
4554 +echo "$as_me: error: cannot find input file: $f" >&2;}
4555 + { (exit 1); exit 1; }; }
4556 + echo "$f";;
4557 + *) # Relative
4558 + if test -f "$f"; then
4559 + # Build tree
4560 + echo "$f"
4561 + elif test -f "$srcdir/$f"; then
4562 + # Source tree
4563 + echo "$srcdir/$f"
4564 + else
4565 + # /dev/null tree
4566 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
4567 +echo "$as_me: error: cannot find input file: $f" >&2;}
4568 + { (exit 1); exit 1; }; }
4569 + fi;;
4570 + esac
4571 + done` || { (exit 1); exit 1; }
4572
4573 + if test x"$ac_file" != x-; then
4574 + { echo "$as_me:$LINENO: creating $ac_file" >&5
4575 +echo "$as_me: creating $ac_file" >&6;}
4576 + rm -f "$ac_file"
4577 + fi
4578 +_ACEOF
4579 +cat >>$CONFIG_STATUS <<_ACEOF
4580 + sed "$ac_vpsub
4581 +$extrasub
4582 +_ACEOF
4583 +cat >>$CONFIG_STATUS <<\_ACEOF
4584 +:t
4585 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
4586 +s,@configure_input@,$configure_input,;t t
4587 +s,@srcdir@,$ac_srcdir,;t t
4588 +s,@abs_srcdir@,$ac_abs_srcdir,;t t
4589 +s,@top_srcdir@,$ac_top_srcdir,;t t
4590 +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
4591 +s,@builddir@,$ac_builddir,;t t
4592 +s,@abs_builddir@,$ac_abs_builddir,;t t
4593 +s,@top_builddir@,$ac_top_builddir,;t t
4594 +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
4595 +s,@INSTALL@,$ac_INSTALL,;t t
4596 +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
4597 + rm -f $tmp/stdin
4598 + if test x"$ac_file" != x-; then
4599 + mv $tmp/out $ac_file
4600 + else
4601 + cat $tmp/out
4602 + rm -f $tmp/out
4603 + fi
4604
4605 -exit 0
4606 -EOF
4607 +done
4608 +_ACEOF
4609 +
4610 +cat >>$CONFIG_STATUS <<\_ACEOF
4611 +
4612 +{ (exit 0); exit 0; }
4613 +_ACEOF
4614 chmod +x $CONFIG_STATUS
4615 -rm -fr confdefs* $ac_clean_files
4616 -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4617 +ac_clean_files=$ac_clean_files_save
4618 +
4619 +
4620 +# configure is writing to config.log, and then calls config.status.
4621 +# config.status does its own redirection, appending to config.log.
4622 +# Unfortunately, on DOS this fails, as config.log is still kept open
4623 +# by configure, so config.status won't be able to write to it; its
4624 +# output is simply discarded. So we exec the FD to /dev/null,
4625 +# effectively closing config.log, so it can be properly (re)opened and
4626 +# appended to by config.status. When coming back to configure, we
4627 +# need to make the FD available again.
4628 +if test "$no_create" != yes; then
4629 + ac_cs_success=:
4630 + ac_config_status_args=
4631 + test "$silent" = yes &&
4632 + ac_config_status_args="$ac_config_status_args --quiet"
4633 + exec 5>/dev/null
4634 + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
4635 + exec 5>>config.log
4636 + # Use ||, not &&, to avoid exiting from the if with $? = 1, which
4637 + # would make configure fail if this is the last instruction.
4638 + $ac_cs_success || { (exit 1); exit 1; }
4639 +fi
4640
4641 --- rcs-5.7.orig/configure.in
4642 +++ rcs-5.7/configure.in
4643 @@ -243,7 +243,7 @@
4644 AC_PATH_PROG(ED, ed, ed)
4645
4646 ac_save_path=$PATH
4647 -PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
4648 +PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH
4649 AC_PATH_PROGS(SENDMAIL, sendmail mail mailx)
4650 PATH=$ac_save_path
4651 case $SENDMAIL in
4652 --- rcs-5.7.orig/src/rcs.c
4653 +++ rcs-5.7/src/rcs.c
4654 @@ -916,10 +916,11 @@
4655 getkeystring(Klog);
4656 if (nextdelta == cuttail) {
4657 cb = savestring(&curlogbuf);
4658 - if (!delta->log.string)
4659 + if (delta && !delta->log.string)
4660 delta->log = cleanlogmsg(curlogbuf.string, cb.size);
4661 nextlex();
4662 - delta->igtext = getphrases(Ktext);
4663 + if (delta)
4664 + delta->igtext = getphrases(Ktext);
4665 } else {
4666 if (nextdelta->log.string && nextdelta->selector) {
4667 foutptr = 0;
4668 --- rcs-5.7.orig/src/rcsfreeze.sh
4669 +++ rcs-5.7/src/rcsfreeze.sh
4670 @@ -59,8 +59,7 @@
4671
4672 # Stamp the logfile. Because we order the logfile the most recent
4673 # first we will have to save everything right now in a temporary file.
4674 -TMPLOG=/tmp/rcsfrz$$
4675 -trap 'rm -f $TMPLOG; exit 1' 1 2 13 15
4676 +TMPLOG=$(tempfile)
4677 # Now ask for a log message, continously add to the log file
4678 (
4679 echo "Version: $SYMREVNAME($SYMREV), Date: $DATE
4680 --- rcs-5.7.orig/src/rcsbase.h
4681 +++ rcs-5.7/src/rcsbase.h
4682 @@ -358,6 +358,7 @@
4683 char const * lockedby; /* who locks the revision */
4684 char const * state; /* state of revision (Exp by default) */
4685 char const * name; /* name (if any) by which retrieved */
4686 + char const * commitid; /* text string to associate commits */
4687 struct cbuf log; /* log message requested at checkin */
4688 struct branchhead * branches; /* list of first revisions on branches*/
4689 struct cbuf ig; /* ignored phrases in admin part */
4690 @@ -662,6 +663,7 @@
4691 extern char const *const expand_names[];
4692 extern char const
4693 Kaccess[], Kauthor[], Kbranch[], Kcomment[],
4694 + Kcommitid[],
4695 Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[],
4696 Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[];
4697 void unexpected_EOF P((void)) exiting;
4698 --- rcs-5.7.orig/src/rcssyn.c
4699 +++ rcs-5.7/src/rcssyn.c
4700 @@ -171,6 +171,7 @@
4701 Kauthor[] = "author",
4702 Kbranch[] = "branch",
4703 Kcomment[] = "comment",
4704 + Kcommitid[] = "commitid",
4705 Kdate[] = "date",
4706 Kdesc[] = "desc",
4707 Kexpand[] = "expand",
4708 @@ -433,6 +434,14 @@
4709 Delta->lockedby = 0;
4710 Delta->log.string = 0;
4711 Delta->selector = true;
4712 +
4713 + if (getkeyopt(Kcommitid)) {
4714 + Delta->commitid = NextString;
4715 + nextlex();
4716 + getsemi(Kcommitid);
4717 + } else
4718 + Delta->commitid = NULL;
4719 +
4720 Delta->ig = getphrases(Kdesc);
4721 TotalDeltas++;
4722 return (true);
4723 --- rcs-5.7.orig/src/rcsdiff.c
4724 +++ rcs-5.7/src/rcsdiff.c
4725 @@ -212,9 +212,13 @@
4726 }
4727 goto option_handled;
4728 case '-': case 'D':
4729 - no_diff_means_no_output = false;
4730 + if (c == 'D'
4731 + || strcmp(*argv, "--side-by-side") == 0
4732 + || strcmp(*argv, "--ifdef") == 0) {
4733 + no_diff_means_no_output = false;
4734 + }
4735 /* fall into */
4736 - case 'C': case 'F': case 'I': case 'L': case 'W':
4737 + case 'C': case 'F': case 'I': case 'L': case 'U': case 'W':
4738 #if DIFF_L
4739 if (c == 'L' && ++file_labels == 2)
4740 faterror("too many -L options");
4741 --- rcs-5.7.orig/src/ident.c
4742 +++ rcs-5.7/src/ident.c
4743 @@ -234,7 +234,7 @@
4744 if (c == EOF && feof(fp) | ferror(fp))
4745 return c;
4746 switch (ctab[c]) {
4747 - case LETTER: case Letter:
4748 + case LETTER: case Letter: case DIGIT:
4749 *tp++ = c;
4750 if (tp < line+sizeof(line)-4)
4751 break;
4752 --- rcs-5.7.orig/src/conf.sh
4753 +++ rcs-5.7/src/conf.sh
4754 @@ -73,17 +73,6 @@
4755 ech='echo -n' dots='... '
4756 esac
4757
4758 -$ech >&3 "$0: testing permissions $dots"
4759 -rm -f a.d &&
4760 -date >a.d &&
4761 -chmod 0 a.d &&
4762 -{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && {
4763 - echo >&3 "$n$0: This command should not be run with superuser permissions."
4764 - exit 1
4765 -}
4766 -echo >&3 OK
4767 -rm -f a.d || exit
4768 -
4769 $ech >&3 "$0: testing compiler for plausibility $dots"
4770 echo 'main() { return 0; }' >a.c
4771 rm -f a.exe a.out || exit
4772 --- rcs-5.7.orig/src/rcsgen.c
4773 +++ rcs-5.7/src/rcsgen.c
4774 @@ -547,6 +547,9 @@
4775
4776 aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:"");
4777 awrite(node->ig.string, node->ig.size, fout);
4778 +
4779 + if (node->commitid)
4780 + aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid);
4781 }
4782
4783
4784 --- rcs-5.7.orig/src/rcsfnms.c
4785 +++ rcs-5.7/src/rcsfnms.c
4786 @@ -285,6 +285,9 @@
4787 {
4788 char *p;
4789 char const *t = tpnames[n];
4790 +# if has_mktemp
4791 + int fd;
4792 +# endif
4793
4794 if (t)
4795 return t;
4796 @@ -296,10 +299,12 @@
4797 size_t tplen = dir_useful_len(tp);
4798 p = testalloc(tplen + 10);
4799 VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n);
4800 - if (!mktemp(p) || !*p)
4801 + fd = mkstemp(p);
4802 + if (fd < 0 || !*p)
4803 faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'",
4804 (int)tplen, tp, SLASH, '0'+n
4805 );
4806 + close(fd);
4807 # else
4808 static char tpnamebuf[TEMPNAMES][L_tmpnam];
4809 p = tpnamebuf[n];
4810 --- rcs-5.7.orig/src/rcsedit.c
4811 +++ rcs-5.7/src/rcsedit.c
4812 @@ -1503,6 +1503,9 @@
4813 register size_t dl;
4814 register struct buf *bn;
4815 register char const *name = isworkfile ? workname : RCSname;
4816 +# if has_mktemp
4817 + int fd;
4818 +# endif
4819
4820 dl = basefilename(name) - name;
4821 bn = &dirtpname[newRCSdirtp_index + isworkfile];
4822 @@ -1521,10 +1524,12 @@
4823 catchints();
4824 # if has_mktemp
4825 VOID strcpy(tp, "XXXXXX");
4826 - if (!mktemp(np) || !*np)
4827 + fd = mkstemp(np);
4828 + if (fd < 0 || !*np)
4829 faterror("can't make temporary pathname `%.*s_%cXXXXXX'",
4830 (int)dl, name, '0'+isworkfile
4831 );
4832 + close(fd);
4833 # else
4834 /*
4835 * Posix 1003.1-1990 has no reliable way
4836 --- rcs-5.7.orig/src/Makefile.in
4837 +++ rcs-5.7/src/Makefile.in
4838 @@ -116,16 +116,18 @@
4839 for p in $(PROGRAMS); do \
4840 $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
4841 done
4842 + $(INSTALL_PROGRAM) rcsfreeze.sh $(bindir)/rcsfreeze
4843
4844 uninstall ::
4845 for p in $(PROGRAMS); do \
4846 $(REMOVE) $(bindir)/$$p; \
4847 done
4848 + $(REMOVE) $(bindir)/rcsfreeze
4849
4850 # Install RCS and (if applicable) GNU diff before running these tests.
4851 # To test RCS before installing it, see the file INSTALL.RCS.
4852 RCSTEST = \
4853 - ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \
4854 + ALL_CFLAGS="$(ALL_CFLAGS)" CC='$(CC)' DIFF='$(DIFF)' \
4855 LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
4856 PATH=$(bindir):$$PATH \
4857 sh $(srcdir)/rcstest
4858 @@ -153,7 +155,7 @@
4859 #(Unix
4860 conf.h : conf.sh Makefile
4861 $(REMOVE) a.*
4862 - ALL_CFLAGS='$(ALL_CFLAGS)' \
4863 + ALL_CFLAGS="$(ALL_CFLAGS)" \
4864 CC='$(CC)' \
4865 COMPAT2='$(COMPAT2)' \
4866 DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \
4867 --- rcs-5.7.orig/src/rlog.c
4868 +++ rcs-5.7/src/rlog.c
4869 @@ -591,6 +591,10 @@
4870 aprintf(out, insDelFormat,
4871 editscript->insertlns, editscript->deletelns);
4872
4873 + if ( node->commitid )
4874 + aprintf(out, "%s commitid: %s", (editscript) ? ";" : "",
4875 + node->commitid);
4876 +
4877 newbranch = node->branches;
4878 if ( newbranch ) {
4879 bufautobegin(&branchnum);