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