]> git.pld-linux.org Git - packages/ruby.git/blame - ruby-20070426.patch
projects / packages / ruby.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 2
[packages/ruby.git] / ruby-20070426.patch
CommitLineData
9b1e6d37 1diff -ur ruby-1.8.6/bignum.c ruby/bignum.c
2--- ruby-1.8.6/bignum.c 2007-02-12 16:01:19.000000000 -0700
3+++ ruby/bignum.c 2007-03-21 02:04:11.000000000 -0600
4@@ -2,8 +2,8 @@
5
6 bignum.c -
7
8- $Author$
9- $Date$
10+ $Author$
11+ $Date$
12 created at: Fri Jun 10 00:48:55 JST 1994
13
14 Copyright (C) 1993-2003 Yukihiro Matsumoto
15@@ -642,10 +642,10 @@
16 j = j * 53L / 84 + 1;
17 break;
18 case 4: case 5: case 6: case 7:
19- j /= 2;
20+ j = (j + 1) / 2;
21 break;
22 case 8: case 9:
23- j /= 3;
24+ j = (j + 2) / 3;
25 break;
26 case 10: case 11: case 12: case 13: case 14: case 15:
27 j = j * 28L / 93 + 1;
28@@ -653,10 +653,10 @@
29 case 16: case 17: case 18: case 19: case 20: case 21:
30 case 22: case 23: case 24: case 25: case 26: case 27:
31 case 28: case 29: case 30: case 31:
32- j /= 4;
33+ j = (j + 3) / 4;
34 break;
35 case 32: case 33: case 34: case 35: case 36:
36- j /= 5;
37+ j = (j + 4) / 5;
38 break;
39 default:
40 rb_raise(rb_eArgError, "illegal radix %d", base);
41diff -ur ruby-1.8.6/ChangeLog ruby/ChangeLog
42--- ruby-1.8.6/ChangeLog 2007-03-12 13:15:06.000000000 -0600
43+++ ruby/ChangeLog 2007-04-26 11:06:54.000000000 -0600
44@@ -1,8 +1,270 @@
45-Tue Mar 13 04:04:04 2007 Akinori MUSHA <knu@iDaemons.org>
46+Fri Apr 27 02:00:17 2007 Ryan Davis <ryand-ruby@zenspider.com>
47
48- * stable version 1.8.6 released.
49+ * signal.c: Fixed backwards compatibility for 'raise Interrupt'.
50+
51+ * lib/yaml/tag.rb: Running rdoc over the 1.8.6 tree skips
52+ Module. Patch from James Britt
53+
54+Thu Apr 26 13:54:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
55+
56+ * misc/ruby-style.el: new file. C/C++ style for ruby source code.
57+
58+Wed Apr 25 19:49:16 2007 Tanaka Akira <akr@fsij.org>
59+
60+ * ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
61+ align file descriptor appropriately.
62+
63+Tue Apr 24 09:33:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
64+
65+ * dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
66+ [ruby-talk:248288]
67+
68+Mon Apr 23 22:14:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
69+
70+ * ext/extmk.rb ($ruby): add extout directory to include path.
71+ [ruby-core:11003]
72+
73+ * lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
74+ directory.
75+
76+ * lib/mkmf.rb (init_mkmf): add current directory to default
77+ library path with highest priority. [ruby-core:10960]
78+
79+ * lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
80+
81+Fri Apr 20 16:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
82+
83+ * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
84+ it is done by libpathflag in mkmf.rb.
85+
86+Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
87+
88+ * lib/optparse.rb: fix to override conv proc.
89+
90+Fri Apr 20 12:17:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
91+
92+ * eval.c (ruby_cleanup): inversed the order of errinfos.
93+
94+Thu Apr 19 14:53:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
95+
96+ * lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
97+ ensures Thread.critical to be false. [ruby-talk:248300]
98+
99+Wed Apr 18 10:41:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
100+
101+ * util.c (ruby_strtod): exponent is radix 10. [ruby-talk:248272]
102+
103+Wed Apr 18 02:30:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
104+
105+ * configure.in (LDFLAGS): prepend -L. instead appending it to
106+ XLDFLAGS. [ruby-core:10933]
107+
108+ * configure.in (Makefile): remove $U for automake from MISSING.
109+ [ruby-talk:248171]
110+
111+Tue Apr 17 16:46:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
112+
113+ * eval.c (rb_yield_0): should not clear state on TAG_NEXT when
114+ it's invoked from within lambda body. [ruby-talk:248136]
115+
116+ * eval.c (proc_invoke): handle TAG_NEXT which would be caused by
117+ next in the lambda body as well.
118+
119+Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
120+
121+ * ext/pty/expect_sample.rb: avoid symbolic link representation for
122+ expect. a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
123+ [ruby-dev:30714]
124+
125+Mon Apr 16 22:51:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
126+
127+ * sample: replace TRUE, FALSE with true, false respectively.
128+ a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
129+ [ruby-dev:30713]
130+
131+Mon Apr 16 17:08:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
132+
133+ * lib/optparse.rb (make_switch): do not clobber converter if pattern
134+ has no convert method. reported by sheepman in [ruby-dev:30709].
135+
136+Mon Apr 16 16:49:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
137+
138+ * ext/stringio/stringio.c (strio_seek): consistent behavior with
139+ IO#seek. patch by sheepman in [ruby-dev:30710].
140+
141+Mon Apr 16 16:34:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
142+
143+ * parse.y (parser_yylex): should set command_start after block
144+ starting "do"s and braces. [ruby-core:10916]
145+
146+Sun Apr 15 09:19:57 2007 Tadayoshi Funaba <tadf@dotrb.org>
147+
148+ * lib/date/format.rb: added some zone names.
149+
150+ * lib/date/format.rb (_parse): now interprets doted numerical
151+ dates as a big endian (except dd.mm.yyyy).
152+
153+Tue Apr 10 17:37:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
154+
155+ * win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
156+ before calling original fclose()/close().
157+
158+Mon Apr 9 09:30:44 2007 Shugo Maeda <shugo@ruby-lang.org>
159+
160+ * lib/net/imap.rb (disconnect): call shutdown for
161+ SSLSocket. Thanks, Technorama Ltd.
162+
163+Thu Apr 5 00:42:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
164+
165+ * error.c (rb_notimplement), io.c (pipe_open): removed definite
166+ articles and UNIX manual section from messages. [ruby-dev:30690]
167+
168+Wed Apr 4 17:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
169+
170+ * io.c (pipe_open): refined the message of NotImplementedError.
171+ [ruby-dev:30685]
172+
173+Wed Apr 4 10:18:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
174+
175+ * io.c (pipe_open): raise NotImplementedError for command "-" on
176+ platforms where fork(2) is not available. [ruby-dev:30681]
177+
178+Tue Apr 3 15:45:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
179+
180+ * ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
181+ windows) doesn't set fromlen if the socket is connection-oriented.
182+ reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
183
184-Tue Mar 13 02:54:17 2007 Akinori MUSHA <knu@iDaemons.org>
185+Sat Mar 24 23:40:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
186+
187+ * node.h (struct rb_thread.locals): explicit as struct.
188+ [ruby-core:10585]
189+
190+ * eval.c, node.h (enum rb_thread_status, struct rb_thread,
191+ rb_curr_thread, rb_main_thread): prefixed. [ruby-core:10586]
192+
193+ * file.c (chompdirsep): made an unprefixed name static.
194+
195+ * io.c (io_fread): ditto.
196+
197+Sat Mar 24 01:54:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
198+
199+ * eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
200+ block. [ruby-core:10609]
201+
202+ * test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
203+ test for exit in END block. [ruby-core:10760]
204+
205+ * test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
206+ test for signal in END block.
207+
208+Thu Mar 22 23:13:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
209+
210+ * eval.c (rb_provided): check for extension library if SOEXT is
211+ explicitly given. [ruby-dev:30657]
212+
213+Thu Mar 22 10:29:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
214+
215+ * test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
216+
217+Wed Mar 21 17:04:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
218+
219+ * bignum.c (rb_big2str0): round up for the most significant digit.
220+ [ruby-core:10686]
221+
222+Wed Mar 21 07:21:24 2007 Akinori MUSHA <knu@iDaemons.org>
223+
224+ * ext/thread/thread.c (remove_one): Preserve List invariants;
225+ submitted by: MenTaLguY <mental AT rydia.net>
226+ in [ruby-core:10598] and [ruby-bugs:PR#9388].
227+
228+Tue Mar 20 22:54:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
229+
230+ * marshal.c (w_extended): erroneous check condition when dump
231+ method is defined. [ruby-core:10646]
232+
233+Tue Mar 20 15:37:24 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
234+
235+ * distruby.rb: Add zip generation.
236+
237+Tue Mar 20 11:28:41 2007 Akinori MUSHA <knu@iDaemons.org>
238+
239+ * lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
240+ the Gauss-Jordan algorithm, making it stable. a patch from
241+ Peter Vanbroekhoven. [ruby-core:10641]
242+
243+Mon Mar 19 11:39:29 2007 Minero Aoki <aamine@loveruby.net>
244+
245+ * lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
246+
247+Sun Mar 18 04:23:52 2007 Akinori MUSHA <knu@iDaemons.org>
248+
249+ * NEWS: Add a note about the new `date' library defining
250+ Time#to_date and Time#to_datetime private methods.
251+
252+ * NEWS: Inform that the old `thread' library is considered to be
253+ stable.
254+
255+ * NEWS: Sort library entries in alphabetical order.
256+
257+Fri Mar 16 21:48:11 2007 Akinori MUSHA <knu@iDaemons.org>
258+
259+ * ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
260+ submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
261+ in [ruby-dev:30554].
262+
263+Fri Mar 16 18:28:06 2007 Akinori MUSHA <knu@iDaemons.org>
264+
265+ * ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
266+ always returning the (real) group entry of the running process;
267+ reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
268+ in [ruby-dev:30586].
269+
270+Fri Mar 16 16:33:58 2007 Akinori MUSHA <knu@iDaemons.org>
271+
272+ * ext/thread/thread.c (unlock_mutex_inner): Make sure that the
273+ given mutex is actually owned by the caller; submitted by:
274+ Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
275+
276+Fri Mar 16 16:21:35 2007 Akinori MUSHA <knu@iDaemons.org>
277+
278+ * ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
279+ ConditionVariable#wait that occurs when two threads that are
280+ trying to access the condition variable are also in concurrence
281+ for the given mutex; submitted by: Sylvain Joyeux
282+ <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
283+ in [ruby-core:10598].
284+
285+Fri Mar 16 16:17:27 2007 Akinori MUSHA <knu@iDaemons.org>
286+
287+ * test/thread/test_thread.rb: Add a test script for the `thread'
288+ library. This should result in failure as of now with
289+ ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
290+ m4x.org> in [ruby-core:10598].
291+
292+Wed Mar 14 12:30:00 2007 Shigeo Kobayashi <shigeo@tinyforest.jp>
293+
294+ * ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
295+ treated as ("-0.31") not as ("0.31").
296+
297+Tue Mar 13 09:25:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
298+
299+ * common.mk (clear-installed-list): separated from install-prereq.
300+
301+Tue Mar 13 06:38:43 2007 Akinori MUSHA <knu@iDaemons.org>
302+
303+ * NEWS: Reword and improve entries.
304+
305+Tue Mar 13 06:03:46 2007 Akinori MUSHA <knu@iDaemons.org>
306+
307+ * stable version 1.8.6 released from the ruby_1_8_6 branch.
308+
309+Tue Mar 13 03:24:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
310+
311+ * runruby.rb: added --pure (turned on by default) and --debugger
312+ options.
313+
314+Tue Mar 13 02:50:28 2007 Akinori MUSHA <knu@iDaemons.org>
315
316 * lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
317 assumption any more; submitted by MIYASAKA Masaru <alkaid AT
318@@ -34,7 +296,7 @@
319
320 * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
321
322-Mon Mar 12 01:23:50 2007 Akinori MUSHA <knu@iDaemons.org>
323+Mon Mar 12 01:05:17 2007 Akinori MUSHA <knu@iDaemons.org>
324
325 * ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
326 This might not be very right but it is commonly used in other
327@@ -43,12 +305,14 @@
328
329 * ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
330
331+Mon Mar 12 00:59:19 2007 Akinori MUSHA <knu@iDaemons.org>
332+
333 * ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
334 DL::Importable::Internal::callback): Avoid race condition for an
335 instance variable; submitted by sheepman <sheepman AT
336 sheepman.sakura.ne.jp> in [ruby-dev:30530].
337
338-Sun Mar 11 19:04:29 2007 Akinori MUSHA <knu@iDaemons.org>
339+Sun Mar 11 18:57:50 2007 Akinori MUSHA <knu@iDaemons.org>
340
341 * misc/README: Add a note about ruby-electric.el.
342
343@@ -61,14 +325,14 @@
344 interface based on rubydb3x.el; submitted by Martin Nordholts
345 <enselic AT gmail.com> in [ruby-bugs:PR#9023].
346
347-Sun Mar 11 17:51:46 2007 Akinori MUSHA <knu@iDaemons.org>
348+Sun Mar 11 17:45:51 2007 Akinori MUSHA <knu@iDaemons.org>
349
350 * ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
351 function is found in the function table before trying to call
352 it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
353 in [ruby-dev:30524].
354
355-Sun Mar 11 17:30:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
356+Sun Mar 11 12:09:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
357
358 * eval.c (error_handle): no message when exiting by signal.
359
360@@ -91,15 +355,19 @@
361
362 * signal.c (rb_signal_exec, trap): handle SIGTERM. [ruby-dev:30505]
363
364-Tue Mar 6 19:03:42 2007 Akinori MUSHA <knu@iDaemons.org>
365+Tue Mar 6 19:08:46 2007 Akinori MUSHA <knu@iDaemons.org>
366
367 * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
368 Digest::MD5.
369
370 * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
371
372+Tue Mar 6 18:58:37 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
373+
374 * lib/shell/process-controller.rb: fix thread synchronization
375 problem for [ruby-dev:30477].
376+
377+Tue Mar 6 18:44:26 2007 Akinori MUSHA <knu@iDaemons.org>
378
379 * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
380 Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
381@@ -107,47 +375,63 @@
382
383 * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
384
385+Tue Mar 6 18:24:19 2007 Akinori MUSHA <knu@iDaemons.org>
386+
387 * time.c (time_to_s): Back out the format changes; discussed
388 in [ruby-dev:30495].
389
390+Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
391+
392 * ext/tk/sample/irbtkw.rbw: fails to exit process.
393
394-Mon Mar 5 20:26:10 2007 Akinori MUSHA <knu@iDaemons.org>
395+Mon Mar 5 20:14:49 2007 Akinori MUSHA <knu@iDaemons.org>
396
397 * time.c (time_to_s): Correct the wrong format which did not
398 really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
399 iij.ad.jp> in [ruby-dev:30487].
400
401-Sun Mar 4 23:53:27 2007 Minero Aoki <aamine@loveruby.net>
402+Sun Mar 4 23:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
403
404- * lib/fileutils.rb (mv): could not move a directory between
405- different filesystems. [ruby-dev:30411]
406-
407-Sun Mar 4 23:46:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
408-
409- * file.c (rb_file_s_utime): allow nil to set the current time.
410+ * file.c (rb_stat_s_utime): fixed a commit miss for the platforms
411+ where utimes() does not exist.
412
413- * lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
414- options. fixed: [ruby-talk:219037]
415+ * lib/fileutils.rb (touch): ditto.
416
417-Sun Mar 4 23:19:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
418+Sun Mar 4 14:46:56 2007 WATANABE Hirofumi <eban@ruby-lang.org>
419
420 * util.c (push_element): should return a int value.
421
422-Sun Mar 4 01:06:55 2007 Akinori MUSHA <knu@iDaemons.org>
423+Sun Mar 4 01:05:57 2007 Akinori MUSHA <knu@iDaemons.org>
424
425 * lib/set.rb (Set#^, Set#&): Correct documentation. Those methods
426 return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
427 mangabrain.de>.
428
429-Sat Mar 3 21:41:31 2007 Akinori MUSHA <knu@iDaemons.org>
430+Sat Mar 3 23:01:07 2007 Minero Aoki <aamine@loveruby.net>
431+
432+ * lib/fileutils.rb (mv): could not move a directory between
433+ different filesystems. [ruby-dev:30411]
434+
435+Sat Mar 3 22:57:11 2007 Minero Aoki <aamine@loveruby.net>
436+
437+ * lib/fileutils.rb (touch): last commit causes error if :mtime
438+ option was not given.
439+
440+Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
441+
442+ * file.c (rb_file_s_utime): allow nil to set the current time.
443+
444+ * lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
445+ options. fixed: [ruby-talk:219037]
446+
447+Sat Mar 3 21:17:35 2007 Akinori MUSHA <knu@iDaemons.org>
448
449 * eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
450 submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
451 [ruby-list:43218].
452 cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
453
454-Sat Mar 3 19:07:05 2007 Akinori MUSHA <knu@iDaemons.org>
455+Sat Mar 3 19:05:31 2007 Akinori MUSHA <knu@iDaemons.org>
456
457 * ext/thread/thread.c (push_list): Use ALLOC().
458
459@@ -155,21 +439,11 @@
460
461 * ext/thread/thread.c (rb_condvar_alloc): Ditto.
462
463-Sat Mar 3 18:56:40 2007 Akinori MUSHA <knu@iDaemons.org>
464+Sat Mar 3 18:53:11 2007 Akinori MUSHA <knu@iDaemons.org>
465
466 * NEWS: Add a note for String#intern.
467
468-Sat Mar 3 18:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
469-
470- * eval.c (rb_provided): return true only for features loaded from
471- .rb files, and not search actual library type. [ruby-dev:30414]
472-
473- * eval.c (rb_feature_p): check loading_tbl if the given ext is
474- empty. [ruby-dev:30452]
475-
476- * eval.c (rb_feature_p): fix possible buffer overrun.
477-
478-Sat Mar 3 16:30:39 2007 Akinori MUSHA <knu@iDaemons.org>
479+Sat Mar 3 16:23:13 2007 Akinori MUSHA <knu@iDaemons.org>
480
481 * env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
482 local_tbl region from getting freed many times; submitted by
483@@ -182,78 +456,108 @@
484
485 * parse.y (top_local_setup_gen): Ditto.
486
487-Sat Mar 3 16:09:27 2007 Akinori MUSHA <knu@iDaemons.org>
488+Sat Mar 3 16:07:02 2007 Akinori MUSHA <knu@iDaemons.org>
489
490 * object.c (rb_obj_ivar_set): RDoc updated according to a
491 suggestion from Brian Candler <B.Candler AT pobox.com>.
492 [ruby-core:10469]
493
494-Sat Mar 3 15:41:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
495+Thu Mar 1 21:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
496
497 * parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
498- empty. [ruby-dev:30452]
499+ empty. [ruby-dev:30455]
500
501-Thu Mar 1 04:08:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
502+Thu Mar 1 08:55:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
503
504- * mkconfig.rb (patchlevel): read from version.h.
505+ * eval.c (rb_feature_p): check loading_tbl if the given ext is
506+ empty. [ruby-dev:30452]
507
508-Thu Mar 1 03:42:09 2007 Akinori MUSHA <knu@iDaemons.org>
509+ * eval.c (rb_feature_p): fix possible buffer overrun.
510+
511+Thu Mar 1 03:30:21 2007 Akinori MUSHA <knu@iDaemons.org>
512
513 * ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
514 Digest::Base subclasses, which was unintentionally made
515 impossible while restructuring Digest classes.
516
517-Wed Feb 28 22:10:55 2007 Akinori MUSHA <knu@iDaemons.org>
518+Thu Mar 1 02:05:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
519
520- * doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
521- NEWS.
522+ * mkconfig.rb (patchlevel): read from version.h.
523
524- * NEWS: Add NEWS, a document file to keep user visible feature
525- changes between releases.
526+Thu Mar 1 00:09:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
527+
528+ * eval.c (rb_provided): return true only for features loaded from
529+ .rb files, and not search actual library type. [ruby-dev:30414]
530+
531+Wed Feb 28 21:15:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
532
533 * configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
534
535 * missing/flock.c: workaround for MinGW.
536
537+Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
538+
539+ * pack.c (pack_unpack): properly ignore non-base64 octets such as
540+ UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
541+ to fix [ruby-core:10437]
542+
543+Wed Feb 28 18:59:57 2007 Akinori MUSHA <knu@iDaemons.org>
544+
545+ * NEWS: Add NEWS, a document file to keep user visible feature
546+ changes between releases.
547+
548+Wed Feb 28 18:35:50 2007 NAKAMURA Usaku <usa@ruby-lang.org>
549+
550 * ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
551 they are already checked at configure.
552 reported by KOBAYASHI Yasuhiro [ruby-list:43225]
553
554+Wed Feb 28 18:34:48 2007 NAKAMURA Usaku <usa@ruby-lang.org>
555+
556 * lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
557 should be the first elements of library paths list.
558 reported by KOBAYASHI Yasuhiro [ruby-list:43225]
559
560+Wed Feb 28 18:31:32 2007 Akinori MUSHA <knu@iDaemons.org>
561+
562+ * doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
563+ NEWS.
564+
565+Wed Feb 28 01:22:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
566+
567 * test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
568 target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
569
570+Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
571+
572 * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
573
574 * common.mk: new target dist
575
576 * distruby.rb: new file
577
578+Tue Feb 27 22:18:45 2007 WATANABE Hirofumi <eban@ruby-lang.org>
579+
580 * configure.in (--enable-auto-image-base): avoid the neccessity to
581 rebase the shared libs as much as possible;
582 submitted by Corinna Vinschen <spam at vinschen.de> in
583 [ruby-talk:240964].
584
585-Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
586-
587- * pack.c (pack_unpack): properly ignore non-base64 octets such as
588- UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
589- to fix [ruby-core:10437]
590-
591-Tue Feb 27 21:50:10 2007 WATANABE Hirofumi <eban@ruby-lang.org>
592+Tue Feb 27 21:36:47 2007 WATANABE Hirofumi <eban@ruby-lang.org>
593
594 * util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
595
596+Tue Feb 27 21:33:04 2007 WATANABE Hirofumi <eban@ruby-lang.org>
597+
598 * configure.in (ac_cv_func_setrlimit): workaround for djgpp.
599
600-Tue Feb 27 20:49:19 2007 Akinori MUSHA <knu@iDaemons.org>
601+Tue Feb 27 19:38:52 2007 Akinori MUSHA <knu@iDaemons.org>
602
603 * lib/base64.rb (Base64::b64encode): Fix documentation; submitted
604 by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
605
606+Tue Feb 27 19:36:57 2007 Akinori MUSHA <knu@iDaemons.org>
607+
608 * regex.c (calculate_must_string, slow_search, re_search): Silence
609 warnings regarding char * vs. unsigned char * mismatch;
610 submitted by Lyle Johnson <lyle.johnson@gmail.com>
611@@ -271,6 +575,8 @@
612 * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
613 rb_nkf_guess2): Ditto.
614
615+Tue Feb 27 03:40:09 2007 Akinori MUSHA <knu@iDaemons.org>
616+
617 * ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
618 Eliminate rb_thread_critical switching where unnecessary;
619 implied by shugo in [ruby-dev:30412].
620@@ -281,28 +587,35 @@
621 * ext/thread/thread.c: Consistently use 0 and 1 for
622 rb_thread_critical values.
623
624+Mon Feb 26 15:18:23 2007 Akinori MUSHA <knu@iDaemons.org>
625+
626 * ext/thread/thread.c: Use xmalloc()/xfree() instead of
627 malloc()/free(); pointed out by shugo in [ruby-dev:30412].
628
629+Sun Feb 25 23:02:55 2007 Akinori MUSHA <knu@iDaemons.org>
630+
631 * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
632 Initialize @workdir properly to silence a warning under -w.
633 Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
634
635-Sun Feb 25 02:50:51 2007 Akinori MUSHA <knu@iDaemons.org>
636+Sun Feb 25 02:47:43 2007 Akinori MUSHA <knu@iDaemons.org>
637
638 * defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
639 which is necessary for dir.c to compile on djgpp and emx.
640
641-Sat Feb 24 17:04:01 2007 Tadayoshi Funaba <tadf@dotrb.org>
642-
643- * lib/date/format.rb: updated based on date2 4.0.3.
644-
645-Sat Feb 24 17:01:02 2007 Minero Aoki <aamine@loveruby.net>
646+Sat Feb 24 10:42:01 2007 Minero Aoki <aamine@loveruby.net>
647
648 * ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
649 rb_gc_mark. Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
650
651-Sat Feb 24 16:53:09 2007 NAKAMURA Usaku <usa@ruby-lang.org>
652+Fri Feb 23 15:10:46 2007 NAKAMURA Usaku <usa@ruby-lang.org>
653+
654+ * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
655+ workaround. [ruby-core:10259]
656+
657+ * win32/win32.c (NtInitialize): call above function.
658+
659+Fri Feb 23 14:19:40 2007 NAKAMURA Usaku <usa@ruby-lang.org>
660
661 * signal.c (sighandler): need to tell to be interrupted to main
662 context when handler is installed.
663@@ -310,19 +623,14 @@
664 * win32/win32.[ch] (rb_win32_interrupted): new function to listen
665 interrupt.
666
667- * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
668- workaround. [ruby-core:10259]
669-
670- * win32/win32.c (NtInitialize): call above function.
671-
672-Fri Feb 23 13:04:43 2007 Akinori MUSHA <knu@iDaemons.org>
673+Fri Feb 23 13:02:17 2007 Akinori MUSHA <knu@iDaemons.org>
674
675 * numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
676 suggested in
677 http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
678 [ruby-talk:240223]
679
680-Fri Feb 23 12:47:13 2007 James Edward Gray II <james@grayproductions.net>
681+Fri Feb 23 12:43:17 2007 James Edward Gray II <james@grayproductions.net>
682
683 * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
684 Content-Length parameter optional for responses in
685@@ -332,23 +640,23 @@
686 * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
687 support to xmlrpc; approved by the maintainer.
688
689-Mon Feb 19 18:33:30 2007 Akinori MUSHA <knu@iDaemons.org>
690+Mon Feb 19 18:22:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
691+
692+ * configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
693+ load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
694+ a bug where a statically linked extension cannot be autoloaded.
695+ [ruby-dev:30023] / [ruby-dev:30239]
696+
697+Mon Feb 19 17:14:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
698
699 * ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
700 message for #peeraddr. a patch from Sam Roberts
701 <sroberts at uniserve.com>. [ruby-core:10366]
702
703-Mon Feb 19 18:27:42 2007 Akinori MUSHA <knu@iDaemons.org>
704+Sun Feb 18 19:35:21 2007 Tadayoshi Funaba <tadf@dotrb.org>
705
706- * configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
707- load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
708- a bug where a statically linked extension cannot be autoloaded.
709- [ruby-dev:30023] / [ruby-dev:30239]
710+ * lib/date/format.rb: updated based on date2 4.0.3.
711
712-Thu Feb 15 20:31:07 2007 Akinori MUSHA <knu@iDaemons.org>
713-
714- * lib/uri/ftp.rb: Revert the previous change pending discussion.
715-
716 Fri Feb 16 11:18:21 2007 Eric Hodel <drbrain@segment7.net>
717
718 * lib/.document: Apply patch for irb, e2mmap and README by Hugh Sasse
719@@ -356,14 +664,19 @@
720
721 * lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
722
723-Thu Feb 15 18:10:09 2007 Akinori MUSHA <knu@iDaemons.org>
724+Thu Feb 15 20:26:30 2007 Akinori MUSHA <knu@iDaemons.org>
725+
726+ * lib/uri/ftp.rb: Revert the previous change pending discussion.
727+
728+Thu Feb 15 18:08:17 2007 Akinori MUSHA <knu@iDaemons.org>
729
730 * dir.c (glob_helper): Fix the function declaration.
731
732-Thu Feb 15 16:55:33 2007 Akinori MUSHA <knu@iDaemons.org>
733+Thu Feb 15 17:13:32 2007 Akinori MUSHA <knu@iDaemons.org>
734
735- * version.h: Branch off ruby_1_8_6 from ruby_1_8 in preparation
736- for the forthcoming 1.8.6 release.
737+ * version.h: Welcome to the post-1.8.6 world. Radical changes are
738+ inhibited in the ruby_1_8 branch until the 1.8.6 final release
739+ goes out of the door.
740
741 Thu Feb 15 16:44:14 2007 Akinori MUSHA <knu@iDaemons.org>
742
743diff -ur ruby-1.8.6/common.mk ruby/common.mk
744--- ruby-1.8.6/common.mk 2007-02-28 06:23:42.000000000 -0700
745+++ ruby/common.mk 2007-03-12 18:24:58.000000000 -0600
746@@ -257,7 +257,11 @@
747 post-no-install-doc::
748 @$(NULLCMD)
749
750-install-prereq:
751+CLEAR_INSTALLED_LIST = clear-installed-list
752+
753+install-prereq: $(CLEAR_INSTALLED_LIST)
754+
755+clear-installed-list:
756 @exit > $(INSTALLED_LIST)
757
758 clean: clean-ext clean-local
759diff -ur ruby-1.8.6/configure ruby/configure
760--- ruby-1.8.6/configure 2007-03-12 13:19:03.000000000 -0600
761+++ ruby/configure 2007-04-28 13:00:47.000000000 -0600
762@@ -1,54 +1,25 @@
763 #! /bin/sh
764 # Guess values for system-dependent variables and create Makefiles.
765-# Generated by GNU Autoconf 2.61.
766+# Generated by GNU Autoconf 2.59.
767 #
768-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
769-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
770+# Copyright (C) 2003 Free Software Foundation, Inc.
771 # This configure script is free software; the Free Software Foundation
772 # gives unlimited permission to copy, distribute and modify it.
773 ## --------------------- ##
774 ## M4sh Initialization. ##
775 ## --------------------- ##
776
777-# Be more Bourne compatible
778-DUALCASE=1; export DUALCASE # for MKS sh
779+# Be Bourne compatible
780 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
781 emulate sh
782 NULLCMD=:
783 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
784 # is contrary to our usage. Disable this feature.
785 alias -g '${1+"$@"}'='"$@"'
786- setopt NO_GLOB_SUBST
787-else
788- case `(set -o) 2>/dev/null` in
789- *posix*) set -o posix ;;
790-esac
791-
792-fi
793-
794-
795-
796-
797-# PATH needs CR
798-# Avoid depending upon Character Ranges.
799-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
800-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
801-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
802-as_cr_digits='0123456789'
803-as_cr_alnum=$as_cr_Letters$as_cr_digits
804-
805-# The user is always right.
806-if test "${PATH_SEPARATOR+set}" != set; then
807- echo "#! /bin/sh" >conf$$.sh
808- echo "exit 0" >>conf$$.sh
809- chmod +x conf$$.sh
810- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
811- PATH_SEPARATOR=';'
812- else
813- PATH_SEPARATOR=:
814- fi
815- rm -f conf$$.sh
816+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
817+ set -o posix
818 fi
819+DUALCASE=1; export DUALCASE # for MKS sh
820
821 # Support unset when possible.
822 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
823@@ -58,43 +29,8 @@
824 fi
825
826
827-# IFS
828-# We need space, tab and new line, in precisely that order. Quoting is
829-# there to prevent editors from complaining about space-tab.
830-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
831-# splitting by setting IFS to empty value.)
832-as_nl='
833-'
834-IFS=" "" $as_nl"
835-
836-# Find who we are. Look in the path if we contain no directory separator.
837-case $0 in
838- *[\\/]* ) as_myself=$0 ;;
839- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
840-for as_dir in $PATH
841-do
842- IFS=$as_save_IFS
843- test -z "$as_dir" && as_dir=.
844- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
845-done
846-IFS=$as_save_IFS
847-
848- ;;
849-esac
850-# We did not find ourselves, most probably we were run as `sh COMMAND'
851-# in which case we are not to be found in the path.
852-if test "x$as_myself" = x; then
853- as_myself=$0
854-fi
855-if test ! -f "$as_myself"; then
856- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
857- { (exit 1); exit 1; }
858-fi
859-
860 # Work around bugs in pre-3.0 UWIN ksh.
861-for as_var in ENV MAIL MAILPATH
862-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
863-done
864+$as_unset ENV MAIL MAILPATH
865 PS1='$ '
866 PS2='> '
867 PS4='+ '
868@@ -108,19 +44,18 @@
869 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
870 eval $as_var=C; export $as_var
871 else
872- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
873+ $as_unset $as_var
874 fi
875 done
876
877 # Required to use basename.
878-if expr a : '\(a\)' >/dev/null 2>&1 &&
879- test "X`expr 00001 : '.*\(...\)'`" = X001; then
880+if expr a : '\(a\)' >/dev/null 2>&1; then
881 as_expr=expr
882 else
883 as_expr=false
884 fi
885
886-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
887+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
888 as_basename=basename
889 else
890 as_basename=false
891@@ -128,388 +63,157 @@
892
893
894 # Name of the executable.
895-as_me=`$as_basename -- "$0" ||
896+as_me=`$as_basename "$0" ||
897 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
898 X"$0" : 'X\(//\)$' \| \
899- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
900+ X"$0" : 'X\(/\)$' \| \
901+ . : '\(.\)' 2>/dev/null ||
902 echo X/"$0" |
903- sed '/^.*\/\([^/][^/]*\)\/*$/{
904- s//\1/
905- q
906- }
907- /^X\/\(\/\/\)$/{
908- s//\1/
909- q
910- }
911- /^X\/\(\/\).*/{
912- s//\1/
913- q
914- }
915- s/.*/./; q'`
916-
917-# CDPATH.
918-$as_unset CDPATH
919-
920+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
921+ /^X\/\(\/\/\)$/{ s//\1/; q; }
922+ /^X\/\(\/\).*/{ s//\1/; q; }
923+ s/.*/./; q'`
924
925-if test "x$CONFIG_SHELL" = x; then
926- if (eval ":") 2>/dev/null; then
927- as_have_required=yes
928-else
929- as_have_required=no
930-fi
931-
932- if test $as_have_required = yes && (eval ":
933-(as_func_return () {
934- (exit \$1)
935-}
936-as_func_success () {
937- as_func_return 0
938-}
939-as_func_failure () {
940- as_func_return 1
941-}
942-as_func_ret_success () {
943- return 0
944-}
945-as_func_ret_failure () {
946- return 1
947-}
948
949-exitcode=0
950-if as_func_success; then
951- :
952-else
953- exitcode=1
954- echo as_func_success failed.
955-fi
956-
957-if as_func_failure; then
958- exitcode=1
959- echo as_func_failure succeeded.
960-fi
961-
962-if as_func_ret_success; then
963- :
964-else
965- exitcode=1
966- echo as_func_ret_success failed.
967-fi
968+# PATH needs CR, and LINENO needs CR and PATH.
969+# Avoid depending upon Character Ranges.
970+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
971+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
972+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
973+as_cr_digits='0123456789'
974+as_cr_alnum=$as_cr_Letters$as_cr_digits
975
976-if as_func_ret_failure; then
977- exitcode=1
978- echo as_func_ret_failure succeeded.
979+# The user is always right.
980+if test "${PATH_SEPARATOR+set}" != set; then
981+ echo "#! /bin/sh" >conf$$.sh
982+ echo "exit 0" >>conf$$.sh
983+ chmod +x conf$$.sh
984+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
985+ PATH_SEPARATOR=';'
986+ else
987+ PATH_SEPARATOR=:
988+ fi
989+ rm -f conf$$.sh
990 fi
991
992-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
993- :
994-else
995- exitcode=1
996- echo positional parameters were not saved.
997-fi
998
999-test \$exitcode = 0) || { (exit 1); exit 1; }
1000+ as_lineno_1=$LINENO
1001+ as_lineno_2=$LINENO
1002+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
1003+ test "x$as_lineno_1" != "x$as_lineno_2" &&
1004+ test "x$as_lineno_3" = "x$as_lineno_2" || {
1005+ # Find who we are. Look in the path if we contain no path at all
1006+ # relative or not.
1007+ case $0 in
1008+ *[\\/]* ) as_myself=$0 ;;
1009+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1010+for as_dir in $PATH
1011+do
1012+ IFS=$as_save_IFS
1013+ test -z "$as_dir" && as_dir=.
1014+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1015+done
1016
1017-(
1018- as_lineno_1=\$LINENO
1019- as_lineno_2=\$LINENO
1020- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
1021- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
1022-") 2> /dev/null; then
1023- :
1024-else
1025- as_candidate_shells=
1026+ ;;
1027+ esac
1028+ # We did not find ourselves, most probably we were run as `sh COMMAND'
1029+ # in which case we are not to be found in the path.
1030+ if test "x$as_myself" = x; then
1031+ as_myself=$0
1032+ fi
1033+ if test ! -f "$as_myself"; then
1034+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
1035+ { (exit 1); exit 1; }; }
1036+ fi
1037+ case $CONFIG_SHELL in
1038+ '')
1039 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1040 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
1041 do
1042 IFS=$as_save_IFS
1043 test -z "$as_dir" && as_dir=.
1044- case $as_dir in
1045+ for as_base in sh bash ksh sh5; do
1046+ case $as_dir in
1047 /*)
1048- for as_base in sh bash ksh sh5; do
1049- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
1050- done;;
1051- esac
1052-done
1053-IFS=$as_save_IFS
1054-
1055-
1056- for as_shell in $as_candidate_shells $SHELL; do
1057- # Try only shells that exist, to save several forks.
1058- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1059- { ("$as_shell") 2> /dev/null <<\_ASEOF
1060-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1061- emulate sh
1062- NULLCMD=:
1063- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1064- # is contrary to our usage. Disable this feature.
1065- alias -g '${1+"$@"}'='"$@"'
1066- setopt NO_GLOB_SUBST
1067-else
1068- case `(set -o) 2>/dev/null` in
1069- *posix*) set -o posix ;;
1070-esac
1071-
1072-fi
1073-
1074-
1075-:
1076-_ASEOF
1077-}; then
1078- CONFIG_SHELL=$as_shell
1079- as_have_required=yes
1080- if { "$as_shell" 2> /dev/null <<\_ASEOF
1081-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1082- emulate sh
1083- NULLCMD=:
1084- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1085- # is contrary to our usage. Disable this feature.
1086- alias -g '${1+"$@"}'='"$@"'
1087- setopt NO_GLOB_SUBST
1088-else
1089- case `(set -o) 2>/dev/null` in
1090- *posix*) set -o posix ;;
1091-esac
1092-
1093-fi
1094-
1095-
1096-:
1097-(as_func_return () {
1098- (exit $1)
1099-}
1100-as_func_success () {
1101- as_func_return 0
1102-}
1103-as_func_failure () {
1104- as_func_return 1
1105-}
1106-as_func_ret_success () {
1107- return 0
1108-}
1109-as_func_ret_failure () {
1110- return 1
1111-}
1112-
1113-exitcode=0
1114-if as_func_success; then
1115- :
1116-else
1117- exitcode=1
1118- echo as_func_success failed.
1119-fi
1120-
1121-if as_func_failure; then
1122- exitcode=1
1123- echo as_func_failure succeeded.
1124-fi
1125-
1126-if as_func_ret_success; then
1127- :
1128-else
1129- exitcode=1
1130- echo as_func_ret_success failed.
1131-fi
1132-
1133-if as_func_ret_failure; then
1134- exitcode=1
1135- echo as_func_ret_failure succeeded.
1136-fi
1137-
1138-if ( set x; as_func_ret_success y && test x = "$1" ); then
1139- :
1140-else
1141- exitcode=1
1142- echo positional parameters were not saved.
1143-fi
1144-
1145-test $exitcode = 0) || { (exit 1); exit 1; }
1146-
1147-(
1148- as_lineno_1=$LINENO
1149- as_lineno_2=$LINENO
1150- test "x$as_lineno_1" != "x$as_lineno_2" &&
1151- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
1152-
1153-_ASEOF
1154-}; then
1155- break
1156-fi
1157-
1158-fi
1159-
1160- done
1161-
1162- if test "x$CONFIG_SHELL" != x; then
1163- for as_var in BASH_ENV ENV
1164- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1165- done
1166- export CONFIG_SHELL
1167- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1168-fi
1169-
1170-
1171- if test $as_have_required = no; then
1172- echo This script requires a shell more modern than all the
1173- echo shells that I found on your system. Please install a
1174- echo modern shell, or manually run the script under such a
1175- echo shell if you do have one.
1176- { (exit 1); exit 1; }
1177-fi
1178-
1179-
1180-fi
1181-
1182-fi
1183-
1184-
1185-
1186-(eval "as_func_return () {
1187- (exit \$1)
1188-}
1189-as_func_success () {
1190- as_func_return 0
1191-}
1192-as_func_failure () {
1193- as_func_return 1
1194-}
1195-as_func_ret_success () {
1196- return 0
1197-}
1198-as_func_ret_failure () {
1199- return 1
1200-}
1201-
1202-exitcode=0
1203-if as_func_success; then
1204- :
1205-else
1206- exitcode=1
1207- echo as_func_success failed.
1208-fi
1209-
1210-if as_func_failure; then
1211- exitcode=1
1212- echo as_func_failure succeeded.
1213-fi
1214-
1215-if as_func_ret_success; then
1216- :
1217-else
1218- exitcode=1
1219- echo as_func_ret_success failed.
1220-fi
1221-
1222-if as_func_ret_failure; then
1223- exitcode=1
1224- echo as_func_ret_failure succeeded.
1225-fi
1226-
1227-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
1228- :
1229-else
1230- exitcode=1
1231- echo positional parameters were not saved.
1232-fi
1233-
1234-test \$exitcode = 0") || {
1235- echo No shell found that supports shell functions.
1236- echo Please tell autoconf@gnu.org about your system,
1237- echo including any error possibly output before this
1238- echo message
1239-}
1240-
1241-
1242-
1243+ if ("$as_dir/$as_base" -c '
1244 as_lineno_1=$LINENO
1245 as_lineno_2=$LINENO
1246+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
1247 test "x$as_lineno_1" != "x$as_lineno_2" &&
1248- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
1249+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
1250+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
1251+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
1252+ CONFIG_SHELL=$as_dir/$as_base
1253+ export CONFIG_SHELL
1254+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
1255+ fi;;
1256+ esac
1257+ done
1258+done
1259+;;
1260+ esac
1261
1262 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
1263 # uniformly replaced by the line number. The first 'sed' inserts a
1264- # line-number line after each line using $LINENO; the second 'sed'
1265- # does the real work. The second script uses 'N' to pair each
1266- # line-number line with the line containing $LINENO, and appends
1267- # trailing '-' during substitution so that $LINENO is not a special
1268- # case at line end.
1269+ # line-number line before each line; the second 'sed' does the real
1270+ # work. The second script uses 'N' to pair each line-number line
1271+ # with the numbered line, and appends trailing '-' during
1272+ # substitution so that $LINENO is not a special case at line end.
1273 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
1274- # scripts with optimization help from Paolo Bonzini. Blame Lee
1275- # E. McMahon (1931-1989) for sed's syntax. :-)
1276- sed -n '
1277- p
1278- /[$]LINENO/=
1279- ' <$as_myself |
1280+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
1281+ sed '=' <$as_myself |
1282 sed '
1283- s/[$]LINENO.*/&-/
1284- t lineno
1285- b
1286- :lineno
1287 N
1288- :loop
1289- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
1290+ s,$,-,
1291+ : loop
1292+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
1293 t loop
1294- s/-\n.*//
1295+ s,-$,,
1296+ s,^['$as_cr_digits']*\n,,
1297 ' >$as_me.lineno &&
1298- chmod +x "$as_me.lineno" ||
1299+ chmod +x $as_me.lineno ||
1300 { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1301 { (exit 1); exit 1; }; }
1302
1303 # Don't try to exec as it changes $[0], causing all sort of problems
1304 # (the dirname of $[0] is not the place where we might find the
1305- # original and so on. Autoconf is especially sensitive to this).
1306- . "./$as_me.lineno"
1307+ # original and so on. Autoconf is especially sensible to this).
1308+ . ./$as_me.lineno
1309 # Exit status is that of the last command.
1310 exit
1311 }
1312
1313
1314-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1315- as_dirname=dirname
1316-else
1317- as_dirname=false
1318-fi
1319-
1320-ECHO_C= ECHO_N= ECHO_T=
1321-case `echo -n x` in
1322--n*)
1323- case `echo 'x\c'` in
1324- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
1325- *) ECHO_C='\c';;
1326- esac;;
1327-*)
1328- ECHO_N='-n';;
1329+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
1330+ *c*,-n*) ECHO_N= ECHO_C='
1331+' ECHO_T=' ' ;;
1332+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
1333+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
1334 esac
1335
1336-if expr a : '\(a\)' >/dev/null 2>&1 &&
1337- test "X`expr 00001 : '.*\(...\)'`" = X001; then
1338+if expr a : '\(a\)' >/dev/null 2>&1; then
1339 as_expr=expr
1340 else
1341 as_expr=false
1342 fi
1343
1344 rm -f conf$$ conf$$.exe conf$$.file
1345-if test -d conf$$.dir; then
1346- rm -f conf$$.dir/conf$$.file
1347-else
1348- rm -f conf$$.dir
1349- mkdir conf$$.dir
1350-fi
1351 echo >conf$$.file
1352 if ln -s conf$$.file conf$$ 2>/dev/null; then
1353- as_ln_s='ln -s'
1354- # ... but there are two gotchas:
1355- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1356- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1357- # In both cases, we have to default to `cp -p'.
1358- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1359+ # We could just check for DJGPP; but this test a) works b) is more generic
1360+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
1361+ if test -f conf$$.exe; then
1362+ # Don't use ln at all; we don't have any links
1363 as_ln_s='cp -p'
1364+ else
1365+ as_ln_s='ln -s'
1366+ fi
1367 elif ln conf$$.file conf$$ 2>/dev/null; then
1368 as_ln_s=ln
1369 else
1370 as_ln_s='cp -p'
1371 fi
1372-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1373-rmdir conf$$.dir 2>/dev/null
1374+rm -f conf$$ conf$$.exe conf$$.file
1375
1376 if mkdir -p . 2>/dev/null; then
1377 as_mkdir_p=:
1378@@ -518,28 +222,7 @@
1379 as_mkdir_p=false
1380 fi
1381
1382-if test -x / >/dev/null 2>&1; then
1383- as_test_x='test -x'
1384-else
1385- if ls -dL / >/dev/null 2>&1; then
1386- as_ls_L_option=L
1387- else
1388- as_ls_L_option=
1389- fi
1390- as_test_x='
1391- eval sh -c '\''
1392- if test -d "$1"; then
1393- test -d "$1/.";
1394- else
1395- case $1 in
1396- -*)set "./$1";;
1397- esac;
1398- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
1399- ???[sx]*):;;*)false;;esac;fi
1400- '\'' sh
1401- '
1402-fi
1403-as_executable_p=$as_test_x
1404+as_executable_p="test -f"
1405
1406 # Sed expression to map a string onto a valid CPP name.
1407 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1408@@ -548,27 +231,39 @@
1409 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
1410
1411
1412+# IFS
1413+# We need space, tab and new line, in precisely that order.
1414+as_nl='
1415+'
1416+IFS=" $as_nl"
1417+
1418+# CDPATH.
1419+$as_unset CDPATH
1420
1421-exec 7<&0 </dev/null 6>&1
1422
1423 # Name of the host.
1424 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
1425 # so uname gets run too.
1426 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
1427
1428+exec 6>&1
1429+
1430 #
1431 # Initializations.
1432 #
1433 ac_default_prefix=/usr/local
1434-ac_clean_files=
1435 ac_config_libobj_dir=.
1436-LIBOBJS=
1437 cross_compiling=no
1438 subdirs=
1439 MFLAGS=
1440 MAKEFLAGS=
1441 SHELL=${CONFIG_SHELL-/bin/sh}
1442
1443+# Maximum number of lines to put in a shell here document.
1444+# This variable seems obsolete. It should probably be removed, and
1445+# only ac_max_sed_lines should be used.
1446+: ${ac_max_here_lines=38}
1447+
1448 # Identity of this package.
1449 PACKAGE_NAME=
1450 PACKAGE_TARNAME=
1451@@ -579,191 +274,42 @@
1452 # Factoring default headers for most tests.
1453 ac_includes_default="\
1454 #include <stdio.h>
1455-#ifdef HAVE_SYS_TYPES_H
1456+#if HAVE_SYS_TYPES_H
1457 # include <sys/types.h>
1458 #endif
1459-#ifdef HAVE_SYS_STAT_H
1460+#if HAVE_SYS_STAT_H
1461 # include <sys/stat.h>
1462 #endif
1463-#ifdef STDC_HEADERS
1464+#if STDC_HEADERS
1465 # include <stdlib.h>
1466 # include <stddef.h>
1467 #else
1468-# ifdef HAVE_STDLIB_H
1469+# if HAVE_STDLIB_H
1470 # include <stdlib.h>
1471 # endif
1472 #endif
1473-#ifdef HAVE_STRING_H
1474-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
1475+#if HAVE_STRING_H
1476+# if !STDC_HEADERS && HAVE_MEMORY_H
1477 # include <memory.h>
1478 # endif
1479 # include <string.h>
1480 #endif
1481-#ifdef HAVE_STRINGS_H
1482+#if HAVE_STRINGS_H
1483 # include <strings.h>
1484 #endif
1485-#ifdef HAVE_INTTYPES_H
1486+#if HAVE_INTTYPES_H
1487 # include <inttypes.h>
1488+#else
1489+# if HAVE_STDINT_H
1490+# include <stdint.h>
1491+# endif
1492 #endif
1493-#ifdef HAVE_STDINT_H
1494-# include <stdint.h>
1495-#endif
1496-#ifdef HAVE_UNISTD_H
1497+#if HAVE_UNISTD_H
1498 # include <unistd.h>
1499 #endif"
1500
1501-ac_subst_vars='SHELL
1502-PATH_SEPARATOR
1503-PACKAGE_NAME
1504-PACKAGE_TARNAME
1505-PACKAGE_VERSION
1506-PACKAGE_STRING
1507-PACKAGE_BUGREPORT
1508-exec_prefix
1509-prefix
1510-program_transform_name
1511-bindir
1512-sbindir
1513-libexecdir
1514-datarootdir
1515-datadir
1516-sysconfdir
1517-sharedstatedir
1518-localstatedir
1519-includedir
1520-oldincludedir
1521-docdir
1522-infodir
1523-htmldir
1524-dvidir
1525-pdfdir
1526-psdir
1527-libdir
1528-localedir
1529-mandir
1530-DEFS
1531-ECHO_C
1532-ECHO_N
1533-ECHO_T
1534-LIBS
1535-build_alias
1536-host_alias
1537-target_alias
1538-MAJOR
1539-MINOR
1540-TEENY
1541-build
1542-build_cpu
1543-build_vendor
1544-build_os
1545-host
1546-host_cpu
1547-host_vendor
1548-host_os
1549-target
1550-target_cpu
1551-target_vendor
1552-target_os
1553-CC
1554-CFLAGS
1555-LDFLAGS
1556-CPPFLAGS
1557-ac_ct_CC
1558-EXEEXT
1559-OBJEXT
1560-CPP
1561-GREP
1562-EGREP
1563-GNU_LD
1564-CPPOUTFILE
1565-OUTFLAG
1566-YACC
1567-YFLAGS
1568-RANLIB
1569-AR
1570-AS
1571-ASFLAGS
1572-NM
1573-WINDRES
1574-DLLWRAP
1575-OBJDUMP
1576-LN_S
1577-SET_MAKE
1578-INSTALL_PROGRAM
1579-INSTALL_SCRIPT
1580-INSTALL_DATA
1581-RM
1582-CP
1583-MAKEDIRS
1584-LIBOBJS
1585-ALLOCA
1586-DLDFLAGS
1587-ARCH_FLAG
1588-STATIC
1589-CCDLFLAGS
1590-LDSHARED
1591-DLEXT
1592-DLEXT2
1593-LIBEXT
1594-LINK_SO
1595-LIBPATHFLAG
1596-RPATHFLAG
1597-LIBPATHENV
1598-TRY_LINK
1599-STRIP
1600-EXTSTATIC
1601-setup
1602-MINIRUBY
1603-PREP
1604-RUNRUBY
1605-EXTOUT
1606-ARCHFILE
1607-RDOCTARGET
1608-XCFLAGS
1609-XLDFLAGS
1610-LIBRUBY_LDSHARED
1611-LIBRUBY_DLDFLAGS
1612-RUBY_INSTALL_NAME
1613-rubyw_install_name
1614-RUBYW_INSTALL_NAME
1615-RUBY_SO_NAME
1616-LIBRUBY_A
1617-LIBRUBY_SO
1618-LIBRUBY_ALIASES
1619-LIBRUBY
1620-LIBRUBYARG
1621-LIBRUBYARG_STATIC
1622-LIBRUBYARG_SHARED
1623-SOLIBS
1624-DLDLIBS
1625-ENABLE_SHARED
1626-MAINLIBS
1627-COMMON_LIBS
1628-COMMON_MACROS
1629-COMMON_HEADERS
1630-EXPORT_PREFIX
1631-MINIOBJS
1632-MAKEFILES
1633-arch
1634-sitearch
1635-sitedir
1636-configure_args
1637-NROFF
1638-MANTYPE
1639-LTLIBOBJS'
1640+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 MAJOR MINOR TEENY build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT CPP EGREP GNU_LD CPPOUTFILE OUTFLAG YACC RANLIB ac_ct_RANLIB AR ac_ct_AR AS ac_ct_AS ASFLAGS NM ac_ct_NM WINDRES ac_ct_WINDRES DLLWRAP ac_ct_DLLWRAP OBJDUMP ac_ct_OBJDUMP LN_S SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RM CP MAKEDIRS LIBOBJS ALLOCA DLDFLAGS ARCH_FLAG STATIC CCDLFLAGS LDSHARED DLEXT DLEXT2 LIBEXT LINK_SO LIBPATHFLAG RPATHFLAG LIBPATHENV TRY_LINK STRIP EXTSTATIC setup MINIRUBY PREP RUNRUBY EXTOUT ARCHFILE RDOCTARGET XCFLAGS XLDFLAGS LIBRUBY_LDSHARED LIBRUBY_DLDFLAGS RUBY_INSTALL_NAME rubyw_install_name RUBYW_INSTALL_NAME RUBY_SO_NAME LIBRUBY_A LIBRUBY_SO LIBRUBY_ALIASES LIBRUBY LIBRUBYARG LIBRUBYARG_STATIC LIBRUBYARG_SHARED SOLIBS DLDLIBS ENABLE_SHARED MAINLIBS COMMON_LIBS COMMON_MACROS COMMON_HEADERS EXPORT_PREFIX MINIOBJS MAKEFILES arch sitearch sitedir configure_args NROFF MANTYPE LTLIBOBJS'
1641 ac_subst_files=''
1642- ac_precious_vars='build_alias
1643-host_alias
1644-target_alias
1645-CC
1646-CFLAGS
1647-LDFLAGS
1648-LIBS
1649-CPPFLAGS
1650-CPP
1651-YACC
1652-YFLAGS'
1653-
1654
1655 # Initialize some variables set by options.
1656 ac_init_help=
1657@@ -790,48 +336,34 @@
1658 # and all the variables that are supposed to be based on exec_prefix
1659 # by default will actually change.
1660 # Use braces instead of parens because sh, perl, etc. also accept them.
1661-# (The list follows the same order as the GNU Coding Standards.)
1662 bindir='${exec_prefix}/bin'
1663 sbindir='${exec_prefix}/sbin'
1664 libexecdir='${exec_prefix}/libexec'
1665-datarootdir='${prefix}/share'
1666-datadir='${datarootdir}'
1667+datadir='${prefix}/share'
1668 sysconfdir='${prefix}/etc'
1669 sharedstatedir='${prefix}/com'
1670 localstatedir='${prefix}/var'
1671+libdir='${exec_prefix}/lib'
1672 includedir='${prefix}/include'
1673 oldincludedir='/usr/include'
1674-docdir='${datarootdir}/doc/${PACKAGE}'
1675-infodir='${datarootdir}/info'
1676-htmldir='${docdir}'
1677-dvidir='${docdir}'
1678-pdfdir='${docdir}'
1679-psdir='${docdir}'
1680-libdir='${exec_prefix}/lib'
1681-localedir='${datarootdir}/locale'
1682-mandir='${datarootdir}/man'
1683+infodir='${prefix}/info'
1684+mandir='${prefix}/man'
1685
1686 ac_prev=
1687-ac_dashdash=
1688 for ac_option
1689 do
1690 # If the previous option needs an argument, assign it.
1691 if test -n "$ac_prev"; then
1692- eval $ac_prev=\$ac_option
1693+ eval "$ac_prev=\$ac_option"
1694 ac_prev=
1695 continue
1696 fi
1697
1698- case $ac_option in
1699- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1700- *) ac_optarg=yes ;;
1701- esac
1702+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
1703
1704 # Accept the important Cygnus configure options, so we can diagnose typos.
1705
1706- case $ac_dashdash$ac_option in
1707- --)
1708- ac_dashdash=yes ;;
1709+ case $ac_option in
1710
1711 -bindir | --bindir | --bindi | --bind | --bin | --bi)
1712 ac_prev=bindir ;;
1713@@ -853,45 +385,33 @@
1714 --config-cache | -C)
1715 cache_file=config.cache ;;
1716
1717- -datadir | --datadir | --datadi | --datad)
1718+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
1719 ac_prev=datadir ;;
1720- -datadir=* | --datadir=* | --datadi=* | --datad=*)
1721+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
1722+ | --da=*)
1723 datadir=$ac_optarg ;;
1724
1725- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
1726- | --dataroo | --dataro | --datar)
1727- ac_prev=datarootdir ;;
1728- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
1729- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
1730- datarootdir=$ac_optarg ;;
1731-
1732 -disable-* | --disable-*)
1733 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1734 # Reject names that are not valid shell variable names.
1735- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1736+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1737 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1738 { (exit 1); exit 1; }; }
1739- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1740- eval enable_$ac_feature=no ;;
1741-
1742- -docdir | --docdir | --docdi | --doc | --do)
1743- ac_prev=docdir ;;
1744- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
1745- docdir=$ac_optarg ;;
1746-
1747- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
1748- ac_prev=dvidir ;;
1749- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
1750- dvidir=$ac_optarg ;;
1751+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
1752+ eval "enable_$ac_feature=no" ;;
1753
1754 -enable-* | --enable-*)
1755 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1756 # Reject names that are not valid shell variable names.
1757- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1758+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1759 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1760 { (exit 1); exit 1; }; }
1761- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1762- eval enable_$ac_feature=\$ac_optarg ;;
1763+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
1764+ case $ac_option in
1765+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
1766+ *) ac_optarg=yes ;;
1767+ esac
1768+ eval "enable_$ac_feature='$ac_optarg'" ;;
1769
1770 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
1771 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
1772@@ -918,12 +438,6 @@
1773 -host=* | --host=* | --hos=* | --ho=*)
1774 host_alias=$ac_optarg ;;
1775
1776- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
1777- ac_prev=htmldir ;;
1778- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
1779- | --ht=*)
1780- htmldir=$ac_optarg ;;
1781-
1782 -includedir | --includedir | --includedi | --included | --include \
1783 | --includ | --inclu | --incl | --inc)
1784 ac_prev=includedir ;;
1785@@ -948,16 +462,13 @@
1786 | --libexe=* | --libex=* | --libe=*)
1787 libexecdir=$ac_optarg ;;
1788
1789- -localedir | --localedir | --localedi | --localed | --locale)
1790- ac_prev=localedir ;;
1791- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
1792- localedir=$ac_optarg ;;
1793-
1794 -localstatedir | --localstatedir | --localstatedi | --localstated \
1795- | --localstate | --localstat | --localsta | --localst | --locals)
1796+ | --localstate | --localstat | --localsta | --localst \
1797+ | --locals | --local | --loca | --loc | --lo)
1798 ac_prev=localstatedir ;;
1799 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
1800- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
1801+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
1802+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
1803 localstatedir=$ac_optarg ;;
1804
1805 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
1806@@ -1022,16 +533,6 @@
1807 | --progr-tra=* | --program-tr=* | --program-t=*)
1808 program_transform_name=$ac_optarg ;;
1809
1810- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
1811- ac_prev=pdfdir ;;
1812- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
1813- pdfdir=$ac_optarg ;;
1814-
1815- -psdir | --psdir | --psdi | --psd | --ps)
1816- ac_prev=psdir ;;
1817- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
1818- psdir=$ac_optarg ;;
1819-
1820 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1821 | -silent | --silent | --silen | --sile | --sil)
1822 silent=yes ;;
1823@@ -1084,20 +585,24 @@
1824 -with-* | --with-*)
1825 ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1826 # Reject names that are not valid shell variable names.
1827- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1828+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1829 { echo "$as_me: error: invalid package name: $ac_package" >&2
1830 { (exit 1); exit 1; }; }
1831- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1832- eval with_$ac_package=\$ac_optarg ;;
1833+ ac_package=`echo $ac_package| sed 's/-/_/g'`
1834+ case $ac_option in
1835+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
1836+ *) ac_optarg=yes ;;
1837+ esac
1838+ eval "with_$ac_package='$ac_optarg'" ;;
1839
1840 -without-* | --without-*)
1841 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1842 # Reject names that are not valid shell variable names.
1843- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1844+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1845 { echo "$as_me: error: invalid package name: $ac_package" >&2
1846 { (exit 1); exit 1; }; }
1847- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1848- eval with_$ac_package=no ;;
1849+ ac_package=`echo $ac_package | sed 's/-/_/g'`
1850+ eval "with_$ac_package=no" ;;
1851
1852 --x)
1853 # Obsolete; use --with-x.
1854@@ -1128,7 +633,8 @@
1855 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1856 { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1857 { (exit 1); exit 1; }; }
1858- eval $ac_envvar=\$ac_optarg
1859+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
1860+ eval "$ac_envvar='$ac_optarg'"
1861 export $ac_envvar ;;
1862
1863 *)
1864@@ -1148,19 +654,27 @@
1865 { (exit 1); exit 1; }; }
1866 fi
1867
1868-# Be sure to have absolute directory names.
1869-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1870- datadir sysconfdir sharedstatedir localstatedir includedir \
1871- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1872- libdir localedir mandir
1873+# Be sure to have absolute paths.
1874+for ac_var in exec_prefix prefix
1875 do
1876- eval ac_val=\$$ac_var
1877+ eval ac_val=$`echo $ac_var`
1878 case $ac_val in
1879- [\\/$]* | ?:[\\/]* ) continue;;
1880- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1881+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
1882+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1883+ { (exit 1); exit 1; }; };;
1884+ esac
1885+done
1886+
1887+# Be sure to have absolute paths.
1888+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
1889+ localstatedir libdir includedir oldincludedir infodir mandir
1890+do
1891+ eval ac_val=$`echo $ac_var`
1892+ case $ac_val in
1893+ [\\/$]* | ?:[\\/]* ) ;;
1894+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1895+ { (exit 1); exit 1; }; };;
1896 esac
1897- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1898- { (exit 1); exit 1; }; }
1899 done
1900
1901 # There might be people who depend on the old broken behavior: `$host'
1902@@ -1187,76 +701,74 @@
1903 test "$silent" = yes && exec 6>/dev/null
1904
1905
1906-ac_pwd=`pwd` && test -n "$ac_pwd" &&
1907-ac_ls_di=`ls -di .` &&
1908-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1909- { echo "$as_me: error: Working directory cannot be determined" >&2
1910- { (exit 1); exit 1; }; }
1911-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1912- { echo "$as_me: error: pwd does not report name of working directory" >&2
1913- { (exit 1); exit 1; }; }
1914-
1915-
1916 # Find the source files, if location was not specified.
1917 if test -z "$srcdir"; then
1918 ac_srcdir_defaulted=yes
1919- # Try the directory containing this script, then the parent directory.
1920- ac_confdir=`$as_dirname -- "$0" ||
1921+ # Try the directory containing this script, then its parent.
1922+ ac_confdir=`(dirname "$0") 2>/dev/null ||
1923 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1924 X"$0" : 'X\(//\)[^/]' \| \
1925 X"$0" : 'X\(//\)$' \| \
1926- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1927+ X"$0" : 'X\(/\)' \| \
1928+ . : '\(.\)' 2>/dev/null ||
1929 echo X"$0" |
1930- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1931- s//\1/
1932- q
1933- }
1934- /^X\(\/\/\)[^/].*/{
1935- s//\1/
1936- q
1937- }
1938- /^X\(\/\/\)$/{
1939- s//\1/
1940- q
1941- }
1942- /^X\(\/\).*/{
1943- s//\1/
1944- q
1945- }
1946- s/.*/./; q'`
1947+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
1948+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
1949+ /^X\(\/\/\)$/{ s//\1/; q; }
1950+ /^X\(\/\).*/{ s//\1/; q; }
1951+ s/.*/./; q'`
1952 srcdir=$ac_confdir
1953- if test ! -r "$srcdir/$ac_unique_file"; then
1954+ if test ! -r $srcdir/$ac_unique_file; then
1955 srcdir=..
1956 fi
1957 else
1958 ac_srcdir_defaulted=no
1959 fi
1960-if test ! -r "$srcdir/$ac_unique_file"; then
1961- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1962- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1963+if test ! -r $srcdir/$ac_unique_file; then
1964+ if test "$ac_srcdir_defaulted" = yes; then
1965+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
1966 { (exit 1); exit 1; }; }
1967-fi
1968-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1969-ac_abs_confdir=`(
1970- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
1971+ else
1972+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1973 { (exit 1); exit 1; }; }
1974- pwd)`
1975-# When building in place, set srcdir=.
1976-if test "$ac_abs_confdir" = "$ac_pwd"; then
1977- srcdir=.
1978-fi
1979-# Remove unnecessary trailing slashes from srcdir.
1980-# Double slashes in file names in object file debugging info
1981-# mess up M-x gdb in Emacs.
1982-case $srcdir in
1983-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
1984-esac
1985-for ac_var in $ac_precious_vars; do
1986- eval ac_env_${ac_var}_set=\${${ac_var}+set}
1987- eval ac_env_${ac_var}_value=\$${ac_var}
1988- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
1989- eval ac_cv_env_${ac_var}_value=\$${ac_var}
1990-done
1991+ fi
1992+fi
1993+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
1994+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
1995+ { (exit 1); exit 1; }; }
1996+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
1997+ac_env_build_alias_set=${build_alias+set}
1998+ac_env_build_alias_value=$build_alias
1999+ac_cv_env_build_alias_set=${build_alias+set}
2000+ac_cv_env_build_alias_value=$build_alias
2001+ac_env_host_alias_set=${host_alias+set}
2002+ac_env_host_alias_value=$host_alias
2003+ac_cv_env_host_alias_set=${host_alias+set}
2004+ac_cv_env_host_alias_value=$host_alias
2005+ac_env_target_alias_set=${target_alias+set}
2006+ac_env_target_alias_value=$target_alias
2007+ac_cv_env_target_alias_set=${target_alias+set}
2008+ac_cv_env_target_alias_value=$target_alias
2009+ac_env_CC_set=${CC+set}
2010+ac_env_CC_value=$CC
2011+ac_cv_env_CC_set=${CC+set}
2012+ac_cv_env_CC_value=$CC
2013+ac_env_CFLAGS_set=${CFLAGS+set}
2014+ac_env_CFLAGS_value=$CFLAGS
2015+ac_cv_env_CFLAGS_set=${CFLAGS+set}
2016+ac_cv_env_CFLAGS_value=$CFLAGS
2017+ac_env_LDFLAGS_set=${LDFLAGS+set}
2018+ac_env_LDFLAGS_value=$LDFLAGS
2019+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
2020+ac_cv_env_LDFLAGS_value=$LDFLAGS
2021+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
2022+ac_env_CPPFLAGS_value=$CPPFLAGS
2023+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
2024+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
2025+ac_env_CPP_set=${CPP+set}
2026+ac_env_CPP_value=$CPP
2027+ac_cv_env_CPP_set=${CPP+set}
2028+ac_cv_env_CPP_value=$CPP
2029
2030 #
2031 # Report the --help message.
2032@@ -1285,6 +797,9 @@
2033 -n, --no-create do not create output files
2034 --srcdir=DIR find the sources in DIR [configure dir or \`..']
2035
2036+_ACEOF
2037+
2038+ cat <<_ACEOF
2039 Installation directories:
2040 --prefix=PREFIX install architecture-independent files in PREFIX
2041 [$ac_default_prefix]
2042@@ -1302,22 +817,15 @@
2043 --bindir=DIR user executables [EPREFIX/bin]
2044 --sbindir=DIR system admin executables [EPREFIX/sbin]
2045 --libexecdir=DIR program executables [EPREFIX/libexec]
2046+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
2047 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
2048 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
2049 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
2050 --libdir=DIR object code libraries [EPREFIX/lib]
2051 --includedir=DIR C header files [PREFIX/include]
2052 --oldincludedir=DIR C header files for non-gcc [/usr/include]
2053- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
2054- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
2055- --infodir=DIR info documentation [DATAROOTDIR/info]
2056- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
2057- --mandir=DIR man documentation [DATAROOTDIR/man]
2058- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
2059- --htmldir=DIR html documentation [DOCDIR]
2060- --dvidir=DIR dvi documentation [DOCDIR]
2061- --pdfdir=DIR pdf documentation [DOCDIR]
2062- --psdir=DIR ps documentation [DOCDIR]
2063+ --infodir=DIR info documentation [PREFIX/info]
2064+ --mandir=DIR man documentation [PREFIX/man]
2065 _ACEOF
2066
2067 cat <<\_ACEOF
2068@@ -1378,100 +886,126 @@
2069 CFLAGS C compiler flags
2070 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
2071 nonstandard directory <lib dir>
2072- LIBS libraries to pass to the linker, e.g. -l<library>
2073- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
2074- you have headers in a nonstandard directory <include dir>
2075+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
2076+ headers in a nonstandard directory <include dir>
2077 CPP C preprocessor
2078- YACC The `Yet Another C Compiler' implementation to use. Defaults to
2079- the first program found out of: `bison -y', `byacc', `yacc'.
2080- YFLAGS The list of arguments that will be passed by default to $YACC.
2081- This script will default YFLAGS to the empty string to avoid a
2082- default value of `-d' given by some make applications.
2083
2084 Use these variables to override the choices made by `configure' or to help
2085 it to find libraries and programs with nonstandard names/locations.
2086
2087 _ACEOF
2088-ac_status=$?
2089 fi
2090
2091 if test "$ac_init_help" = "recursive"; then
2092 # If there are subdirs, report their specific --help.
2093+ ac_popdir=`pwd`
2094 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
2095- test -d "$ac_dir" || continue
2096+ test -d $ac_dir || continue
2097 ac_builddir=.
2098
2099-case "$ac_dir" in
2100-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
2101-*)
2102+if test "$ac_dir" != .; then
2103 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
2104- # A ".." for each directory in $ac_dir_suffix.
2105- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
2106- case $ac_top_builddir_sub in
2107- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
2108- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
2109- esac ;;
2110-esac
2111-ac_abs_top_builddir=$ac_pwd
2112-ac_abs_builddir=$ac_pwd$ac_dir_suffix
2113-# for backward compatibility:
2114-ac_top_builddir=$ac_top_build_prefix
2115+ # A "../" for each directory in $ac_dir_suffix.
2116+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
2117+else
2118+ ac_dir_suffix= ac_top_builddir=
2119+fi
2120
2121 case $srcdir in
2122- .) # We are building in place.
2123+ .) # No --srcdir option. We are building in place.
2124 ac_srcdir=.
2125- ac_top_srcdir=$ac_top_builddir_sub
2126- ac_abs_top_srcdir=$ac_pwd ;;
2127- [\\/]* | ?:[\\/]* ) # Absolute name.
2128+ if test -z "$ac_top_builddir"; then
2129+ ac_top_srcdir=.
2130+ else
2131+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
2132+ fi ;;
2133+ [\\/]* | ?:[\\/]* ) # Absolute path.
2134 ac_srcdir=$srcdir$ac_dir_suffix;
2135- ac_top_srcdir=$srcdir
2136- ac_abs_top_srcdir=$srcdir ;;
2137- *) # Relative name.
2138- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
2139- ac_top_srcdir=$ac_top_build_prefix$srcdir
2140- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
2141+ ac_top_srcdir=$srcdir ;;
2142+ *) # Relative path.
2143+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
2144+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
2145+esac
2146+
2147+# Do not use `cd foo && pwd` to compute absolute paths, because
2148+# the directories may not exist.
2149+case `pwd` in
2150+.) ac_abs_builddir="$ac_dir";;
2151+*)
2152+ case "$ac_dir" in
2153+ .) ac_abs_builddir=`pwd`;;
2154+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
2155+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
2156+ esac;;
2157+esac
2158+case $ac_abs_builddir in
2159+.) ac_abs_top_builddir=${ac_top_builddir}.;;
2160+*)
2161+ case ${ac_top_builddir}. in
2162+ .) ac_abs_top_builddir=$ac_abs_builddir;;
2163+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
2164+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
2165+ esac;;
2166+esac
2167+case $ac_abs_builddir in
2168+.) ac_abs_srcdir=$ac_srcdir;;
2169+*)
2170+ case $ac_srcdir in
2171+ .) ac_abs_srcdir=$ac_abs_builddir;;
2172+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
2173+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
2174+ esac;;
2175+esac
2176+case $ac_abs_builddir in
2177+.) ac_abs_top_srcdir=$ac_top_srcdir;;
2178+*)
2179+ case $ac_top_srcdir in
2180+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
2181+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
2182+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
2183+ esac;;
2184 esac
2185-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
2186
2187- cd "$ac_dir" || { ac_status=$?; continue; }
2188- # Check for guested configure.
2189- if test -f "$ac_srcdir/configure.gnu"; then
2190- echo &&
2191- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
2192- elif test -f "$ac_srcdir/configure"; then
2193- echo &&
2194- $SHELL "$ac_srcdir/configure" --help=recursive
2195+ cd $ac_dir
2196+ # Check for guested configure; otherwise get Cygnus style configure.
2197+ if test -f $ac_srcdir/configure.gnu; then
2198+ echo
2199+ $SHELL $ac_srcdir/configure.gnu --help=recursive
2200+ elif test -f $ac_srcdir/configure; then
2201+ echo
2202+ $SHELL $ac_srcdir/configure --help=recursive
2203+ elif test -f $ac_srcdir/configure.ac ||
2204+ test -f $ac_srcdir/configure.in; then
2205+ echo
2206+ $ac_configure --help
2207 else
2208 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
2209- fi || ac_status=$?
2210- cd "$ac_pwd" || { ac_status=$?; break; }
2211+ fi
2212+ cd "$ac_popdir"
2213 done
2214 fi
2215
2216-test -n "$ac_init_help" && exit $ac_status
2217+test -n "$ac_init_help" && exit 0
2218 if $ac_init_version; then
2219 cat <<\_ACEOF
2220-configure
2221-generated by GNU Autoconf 2.61
2222
2223-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2224-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
2225+Copyright (C) 2003 Free Software Foundation, Inc.
2226 This configure script is free software; the Free Software Foundation
2227 gives unlimited permission to copy, distribute and modify it.
2228 _ACEOF
2229- exit
2230+ exit 0
2231 fi
2232-cat >config.log <<_ACEOF
2233+exec 5>config.log
2234+cat >&5 <<_ACEOF
2235 This file contains any messages produced by compilers while
2236 running configure, to aid debugging if configure makes a mistake.
2237
2238 It was created by $as_me, which was
2239-generated by GNU Autoconf 2.61. Invocation command line was
2240+generated by GNU Autoconf 2.59. Invocation command line was
2241
2242 $ $0 $@
2243
2244 _ACEOF
2245-exec 5>>config.log
2246 {
2247 cat <<_ASUNAME
2248 ## --------- ##
2249@@ -1490,7 +1024,7 @@
2250 /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
2251 /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
2252 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
2253-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
2254+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
2255 /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
2256 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
2257 /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
2258@@ -1504,7 +1038,6 @@
2259 test -z "$as_dir" && as_dir=.
2260 echo "PATH: $as_dir"
2261 done
2262-IFS=$as_save_IFS
2263
2264 } >&5
2265
2266@@ -1526,6 +1059,7 @@
2267 ac_configure_args=
2268 ac_configure_args0=
2269 ac_configure_args1=
2270+ac_sep=
2271 ac_must_keep_next=false
2272 for ac_pass in 1 2
2273 do
2274@@ -1536,7 +1070,7 @@
2275 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
2276 | -silent | --silent | --silen | --sile | --sil)
2277 continue ;;
2278- *\'*)
2279+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
2280 ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
2281 esac
2282 case $ac_pass in
2283@@ -1558,7 +1092,9 @@
2284 -* ) ac_must_keep_next=true ;;
2285 esac
2286 fi
2287- ac_configure_args="$ac_configure_args '$ac_arg'"
2288+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
2289+ # Get rid of the leading space.
2290+ ac_sep=" "
2291 ;;
2292 esac
2293 done
2294@@ -1569,8 +1105,8 @@
2295 # When interrupted or exit'd, cleanup temporary files, and complete
2296 # config.log. We remove comments because anyway the quotes in there
2297 # would cause problems or look ugly.
2298-# WARNING: Use '\'' to represent an apostrophe within the trap.
2299-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
2300+# WARNING: Be sure not to use single quotes in there, as some shells,
2301+# such as our DU 5.0 friend, will then `close' the trap.
2302 trap 'exit_status=$?
2303 # Save into config.log some information that might help in debugging.
2304 {
2305@@ -1583,34 +1119,20 @@
2306 _ASBOX
2307 echo
2308 # The following way of writing the cache mishandles newlines in values,
2309-(
2310- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
2311- eval ac_val=\$$ac_var
2312- case $ac_val in #(
2313- *${as_nl}*)
2314- case $ac_var in #(
2315- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
2316-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
2317- esac
2318- case $ac_var in #(
2319- _ | IFS | as_nl) ;; #(
2320- *) $as_unset $ac_var ;;
2321- esac ;;
2322- esac
2323- done
2324+{
2325 (set) 2>&1 |
2326- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
2327- *${as_nl}ac_space=\ *)
2328+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
2329+ *ac_space=\ *)
2330 sed -n \
2331- "s/'\''/'\''\\\\'\'''\''/g;
2332- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
2333- ;; #(
2334+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
2335+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
2336+ ;;
2337 *)
2338- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
2339+ sed -n \
2340+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
2341 ;;
2342- esac |
2343- sort
2344-)
2345+ esac;
2346+}
2347 echo
2348
2349 cat <<\_ASBOX
2350@@ -1621,28 +1143,22 @@
2351 echo
2352 for ac_var in $ac_subst_vars
2353 do
2354- eval ac_val=\$$ac_var
2355- case $ac_val in
2356- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
2357- esac
2358- echo "$ac_var='\''$ac_val'\''"
2359+ eval ac_val=$`echo $ac_var`
2360+ echo "$ac_var='"'"'$ac_val'"'"'"
2361 done | sort
2362 echo
2363
2364 if test -n "$ac_subst_files"; then
2365 cat <<\_ASBOX
2366-## ------------------- ##
2367-## File substitutions. ##
2368-## ------------------- ##
2369+## ------------- ##
2370+## Output files. ##
2371+## ------------- ##
2372 _ASBOX
2373 echo
2374 for ac_var in $ac_subst_files
2375 do
2376- eval ac_val=\$$ac_var
2377- case $ac_val in
2378- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
2379- esac
2380- echo "$ac_var='\''$ac_val'\''"
2381+ eval ac_val=$`echo $ac_var`
2382+ echo "$ac_var='"'"'$ac_val'"'"'"
2383 done | sort
2384 echo
2385 fi
2386@@ -1654,24 +1170,26 @@
2387 ## ----------- ##
2388 _ASBOX
2389 echo
2390- cat confdefs.h
2391+ sed "/^$/d" confdefs.h | sort
2392 echo
2393 fi
2394 test "$ac_signal" != 0 &&
2395 echo "$as_me: caught signal $ac_signal"
2396 echo "$as_me: exit $exit_status"
2397 } >&5
2398- rm -f core *.core core.conftest.* &&
2399- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
2400+ rm -f core *.core &&
2401+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
2402 exit $exit_status
2403-' 0
2404+ ' 0
2405 for ac_signal in 1 2 13 15; do
2406 trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
2407 done
2408 ac_signal=0
2409
2410 # confdefs.h avoids OS command line length limits that DEFS can exceed.
2411-rm -f -r conftest* confdefs.h
2412+rm -rf conftest* confdefs.h
2413+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
2414+echo >confdefs.h
2415
2416 # Predefined preprocessor variables.
2417
2418@@ -1702,17 +1220,14 @@
2419
2420 # Let the site file select an alternate cache file if it wants to.
2421 # Prefer explicitly selected file to automatically selected ones.
2422-if test -n "$CONFIG_SITE"; then
2423- set x "$CONFIG_SITE"
2424-elif test "x$prefix" != xNONE; then
2425- set x "$prefix/share/config.site" "$prefix/etc/config.site"
2426-else
2427- set x "$ac_default_prefix/share/config.site" \
2428- "$ac_default_prefix/etc/config.site"
2429+if test -z "$CONFIG_SITE"; then
2430+ if test "x$prefix" != xNONE; then
2431+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
2432+ else
2433+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
2434+ fi
2435 fi
2436-shift
2437-for ac_site_file
2438-do
2439+for ac_site_file in $CONFIG_SITE; do
2440 if test -r "$ac_site_file"; then
2441 { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
2442 echo "$as_me: loading site script $ac_site_file" >&6;}
2443@@ -1728,8 +1243,8 @@
2444 { echo "$as_me:$LINENO: loading cache $cache_file" >&5
2445 echo "$as_me: loading cache $cache_file" >&6;}
2446 case $cache_file in
2447- [\\/]* | ?:[\\/]* ) . "$cache_file";;
2448- *) . "./$cache_file";;
2449+ [\\/]* | ?:[\\/]* ) . $cache_file;;
2450+ *) . ./$cache_file;;
2451 esac
2452 fi
2453 else
2454@@ -1741,11 +1256,12 @@
2455 # Check that the precious variables saved in the cache have kept the same
2456 # value.
2457 ac_cache_corrupted=false
2458-for ac_var in $ac_precious_vars; do
2459+for ac_var in `(set) 2>&1 |
2460+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
2461 eval ac_old_set=\$ac_cv_env_${ac_var}_set
2462 eval ac_new_set=\$ac_env_${ac_var}_set
2463- eval ac_old_val=\$ac_cv_env_${ac_var}_value
2464- eval ac_new_val=\$ac_env_${ac_var}_value
2465+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
2466+ eval ac_new_val="\$ac_env_${ac_var}_value"
2467 case $ac_old_set,$ac_new_set in
2468 set,)
2469 { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2470@@ -1770,7 +1286,8 @@
2471 # Pass precious variables to config.status.
2472 if test "$ac_new_set" = set; then
2473 case $ac_new_val in
2474- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
2475+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
2476+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
2477 *) ac_arg=$ac_var=$ac_new_val ;;
2478 esac
2479 case " $ac_configure_args " in
2480@@ -1787,6 +1304,12 @@
2481 { (exit 1); exit 1; }; }
2482 fi
2483
2484+ac_ext=c
2485+ac_cpp='$CPP $CPPFLAGS'
2486+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2487+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2488+ac_compiler_gnu=$ac_cv_c_compiler_gnu
2489+
2490
2491
2492
2493@@ -1803,11 +1326,6 @@
2494
2495
2496
2497-ac_ext=c
2498-ac_cpp='$CPP $CPPFLAGS'
2499-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2500-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2501-ac_compiler_gnu=$ac_cv_c_compiler_gnu
2502
2503
2504
2505@@ -1827,9 +1345,10 @@
2506
2507
2508
2509-# Check whether --with-gcc was given.
2510+# Check whether --with-gcc or --without-gcc was given.
2511 if test "${with_gcc+set}" = set; then
2512- withval=$with_gcc;
2513+ withval="$with_gcc"
2514+
2515 case $withval in
2516 no) : ${CC=cc}
2517 ;;
2518@@ -1838,8 +1357,7 @@
2519 *) CC=$withval
2520 ;;
2521 esac
2522-fi
2523-
2524+fi;
2525 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
2526 then
2527 { { echo "$as_me:$LINENO: error: cached CC is different -- throw away $cache_file
2528@@ -1853,154 +1371,104 @@
2529 program_prefix=
2530 fi
2531 ac_aux_dir=
2532-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2533- if test -f "$ac_dir/install-sh"; then
2534+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
2535+ if test -f $ac_dir/install-sh; then
2536 ac_aux_dir=$ac_dir
2537 ac_install_sh="$ac_aux_dir/install-sh -c"
2538 break
2539- elif test -f "$ac_dir/install.sh"; then
2540+ elif test -f $ac_dir/install.sh; then
2541 ac_aux_dir=$ac_dir
2542 ac_install_sh="$ac_aux_dir/install.sh -c"
2543 break
2544- elif test -f "$ac_dir/shtool"; then
2545+ elif test -f $ac_dir/shtool; then
2546 ac_aux_dir=$ac_dir
2547 ac_install_sh="$ac_aux_dir/shtool install -c"
2548 break
2549 fi
2550 done
2551 if test -z "$ac_aux_dir"; then
2552- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
2553-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
2554+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
2555+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
2556 { (exit 1); exit 1; }; }
2557 fi
2558-
2559-# These three variables are undocumented and unsupported,
2560-# and are intended to be withdrawn in a future Autoconf release.
2561-# They can cause serious problems if a builder's source tree is in a directory
2562-# whose full name contains unusual characters.
2563-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
2564-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
2565-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
2566-
2567+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
2568+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
2569+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
2570
2571 # Make sure we can run config.sub.
2572-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
2573- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
2574-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
2575+$ac_config_sub sun4 >/dev/null 2>&1 ||
2576+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
2577+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
2578 { (exit 1); exit 1; }; }
2579
2580-{ echo "$as_me:$LINENO: checking build system type" >&5
2581-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
2582+echo "$as_me:$LINENO: checking build system type" >&5
2583+echo $ECHO_N "checking build system type... $ECHO_C" >&6
2584 if test "${ac_cv_build+set}" = set; then
2585 echo $ECHO_N "(cached) $ECHO_C" >&6
2586 else
2587- ac_build_alias=$build_alias
2588-test "x$ac_build_alias" = x &&
2589- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
2590-test "x$ac_build_alias" = x &&
2591+ ac_cv_build_alias=$build_alias
2592+test -z "$ac_cv_build_alias" &&
2593+ ac_cv_build_alias=`$ac_config_guess`
2594+test -z "$ac_cv_build_alias" &&
2595 { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
2596 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
2597 { (exit 1); exit 1; }; }
2598-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
2599- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
2600-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
2601+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
2602+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
2603+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
2604 { (exit 1); exit 1; }; }
2605
2606 fi
2607-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
2608-echo "${ECHO_T}$ac_cv_build" >&6; }
2609-case $ac_cv_build in
2610-*-*-*) ;;
2611-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
2612-echo "$as_me: error: invalid value of canonical build" >&2;}
2613- { (exit 1); exit 1; }; };;
2614-esac
2615+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
2616+echo "${ECHO_T}$ac_cv_build" >&6
2617 build=$ac_cv_build
2618-ac_save_IFS=$IFS; IFS='-'
2619-set x $ac_cv_build
2620-shift
2621-build_cpu=$1
2622-build_vendor=$2
2623-shift; shift
2624-# Remember, the first character of IFS is used to create $*,
2625-# except with old shells:
2626-build_os=$*
2627-IFS=$ac_save_IFS
2628-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
2629+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
2630+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
2631+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
2632
2633
2634-{ echo "$as_me:$LINENO: checking host system type" >&5
2635-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
2636+echo "$as_me:$LINENO: checking host system type" >&5
2637+echo $ECHO_N "checking host system type... $ECHO_C" >&6
2638 if test "${ac_cv_host+set}" = set; then
2639 echo $ECHO_N "(cached) $ECHO_C" >&6
2640 else
2641- if test "x$host_alias" = x; then
2642- ac_cv_host=$ac_cv_build
2643-else
2644- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
2645- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
2646-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
2647+ ac_cv_host_alias=$host_alias
2648+test -z "$ac_cv_host_alias" &&
2649+ ac_cv_host_alias=$ac_cv_build_alias
2650+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
2651+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
2652+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
2653 { (exit 1); exit 1; }; }
2654-fi
2655
2656 fi
2657-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
2658-echo "${ECHO_T}$ac_cv_host" >&6; }
2659-case $ac_cv_host in
2660-*-*-*) ;;
2661-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
2662-echo "$as_me: error: invalid value of canonical host" >&2;}
2663- { (exit 1); exit 1; }; };;
2664-esac
2665+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
2666+echo "${ECHO_T}$ac_cv_host" >&6
2667 host=$ac_cv_host
2668-ac_save_IFS=$IFS; IFS='-'
2669-set x $ac_cv_host
2670-shift
2671-host_cpu=$1
2672-host_vendor=$2
2673-shift; shift
2674-# Remember, the first character of IFS is used to create $*,
2675-# except with old shells:
2676-host_os=$*
2677-IFS=$ac_save_IFS
2678-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
2679+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
2680+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
2681+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
2682
2683
2684-{ echo "$as_me:$LINENO: checking target system type" >&5
2685-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
2686+echo "$as_me:$LINENO: checking target system type" >&5
2687+echo $ECHO_N "checking target system type... $ECHO_C" >&6
2688 if test "${ac_cv_target+set}" = set; then
2689 echo $ECHO_N "(cached) $ECHO_C" >&6
2690 else
2691- if test "x$target_alias" = x; then
2692- ac_cv_target=$ac_cv_host
2693-else
2694- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
2695- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
2696-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
2697+ ac_cv_target_alias=$target_alias
2698+test "x$ac_cv_target_alias" = "x" &&
2699+ ac_cv_target_alias=$ac_cv_host_alias
2700+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
2701+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
2702+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
2703 { (exit 1); exit 1; }; }
2704-fi
2705
2706 fi
2707-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
2708-echo "${ECHO_T}$ac_cv_target" >&6; }
2709-case $ac_cv_target in
2710-*-*-*) ;;
2711-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
2712-echo "$as_me: error: invalid value of canonical target" >&2;}
2713- { (exit 1); exit 1; }; };;
2714-esac
2715+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
2716+echo "${ECHO_T}$ac_cv_target" >&6
2717 target=$ac_cv_target
2718-ac_save_IFS=$IFS; IFS='-'
2719-set x $ac_cv_target
2720-shift
2721-target_cpu=$1
2722-target_vendor=$2
2723-shift; shift
2724-# Remember, the first character of IFS is used to create $*,
2725-# except with old shells:
2726-target_os=$*
2727-IFS=$ac_save_IFS
2728-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
2729+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
2730+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
2731+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
2732
2733
2734 # The aliases save the names the user supplied, while $host etc.
2735@@ -2012,17 +1480,17 @@
2736 target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
2737 ac_install_sh='' # unusable for extension libraries.
2738
2739-# Check whether --enable-fat-binary was given.
2740+# Check whether --enable-fat-binary or --disable-fat-binary was given.
2741 if test "${enable_fat_binary+set}" = set; then
2742- enableval=$enable_fat_binary; fat_binary=$enableval
2743+ enableval="$enable_fat_binary"
2744+ fat_binary=$enableval
2745 else
2746 fat_binary=no
2747-fi
2748-
2749+fi;
2750 if test "$fat_binary" != no; then
2751
2752- { echo "$as_me:$LINENO: checking target architectures" >&5
2753-echo $ECHO_N "checking target architectures... $ECHO_C" >&6; }
2754+ echo "$as_me:$LINENO: checking target architectures" >&5
2755+echo $ECHO_N "checking target architectures... $ECHO_C" >&6
2756
2757 # Respect TARGET_ARCHS setting from environment if available.
2758 if test -z "$TARGET_ARCHS"; then
2759@@ -2050,8 +1518,8 @@
2760 fi
2761 fi
2762
2763- { echo "$as_me:$LINENO: result: $TARGET_ARCHS" >&5
2764-echo "${ECHO_T}$TARGET_ARCHS" >&6; }
2765+ echo "$as_me:$LINENO: result: $TARGET_ARCHS" >&5
2766+echo "${ECHO_T}$TARGET_ARCHS" >&6
2767
2768 # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
2769 ARCH_FLAG=
2770@@ -2069,11 +1537,11 @@
2771 i?86) frame_address=yes;;
2772 *) frame_address=no;;
2773 esac
2774-# Check whether --enable-frame-address was given.
2775+# Check whether --enable-frame-address or --disable-frame-address was given.
2776 if test "${enable_frame_address+set}" = set; then
2777- enableval=$enable_frame_address; frame_address=$enableval
2778-fi
2779-
2780+ enableval="$enable_frame_address"
2781+ frame_address=$enableval
2782+fi;
2783 if test $frame_address = yes; then
2784 cat >>confdefs.h <<\_ACEOF
2785 #define USE_BUILTIN_FRAME_ADDRESS 1
2786@@ -2082,17 +1550,17 @@
2787 fi
2788
2789 test "$program_prefix" != NONE &&
2790- program_transform_name="s&^&$program_prefix&;$program_transform_name"
2791+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
2792 # Use a double $ so make ignores it.
2793 test "$program_suffix" != NONE &&
2794- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
2795+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
2796 # Double any \ or $. echo might interpret backslashes.
2797 # By default was `s,x,x', remove it if useless.
2798 cat <<\_ACEOF >conftest.sed
2799 s/[\\$]/&&/g;s/;s,x,x,$//
2800 _ACEOF
2801 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
2802-rm -f conftest.sed
2803+rm conftest.sed
2804
2805
2806
2807@@ -2100,8 +1568,8 @@
2808 if test -n "$ac_tool_prefix"; then
2809 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2810 set dummy ${ac_tool_prefix}gcc; ac_word=$2
2811-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2812-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2813+echo "$as_me:$LINENO: checking for $ac_word" >&5
2814+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2815 if test "${ac_cv_prog_CC+set}" = set; then
2816 echo $ECHO_N "(cached) $ECHO_C" >&6
2817 else
2818@@ -2114,34 +1582,32 @@
2819 IFS=$as_save_IFS
2820 test -z "$as_dir" && as_dir=.
2821 for ac_exec_ext in '' $ac_executable_extensions; do
2822- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2823+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2824 ac_cv_prog_CC="${ac_tool_prefix}gcc"
2825 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2826 break 2
2827 fi
2828 done
2829 done
2830-IFS=$as_save_IFS
2831
2832 fi
2833 fi
2834 CC=$ac_cv_prog_CC
2835 if test -n "$CC"; then
2836- { echo "$as_me:$LINENO: result: $CC" >&5
2837-echo "${ECHO_T}$CC" >&6; }
2838+ echo "$as_me:$LINENO: result: $CC" >&5
2839+echo "${ECHO_T}$CC" >&6
2840 else
2841- { echo "$as_me:$LINENO: result: no" >&5
2842-echo "${ECHO_T}no" >&6; }
2843+ echo "$as_me:$LINENO: result: no" >&5
2844+echo "${ECHO_T}no" >&6
2845 fi
2846
2847-
2848 fi
2849 if test -z "$ac_cv_prog_CC"; then
2850 ac_ct_CC=$CC
2851 # Extract the first word of "gcc", so it can be a program name with args.
2852 set dummy gcc; ac_word=$2
2853-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2854-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2855+echo "$as_me:$LINENO: checking for $ac_word" >&5
2856+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2857 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2858 echo $ECHO_N "(cached) $ECHO_C" >&6
2859 else
2860@@ -2154,41 +1620,26 @@
2861 IFS=$as_save_IFS
2862 test -z "$as_dir" && as_dir=.
2863 for ac_exec_ext in '' $ac_executable_extensions; do
2864- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2865+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2866 ac_cv_prog_ac_ct_CC="gcc"
2867 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2868 break 2
2869 fi
2870 done
2871 done
2872-IFS=$as_save_IFS
2873
2874 fi
2875 fi
2876 ac_ct_CC=$ac_cv_prog_ac_ct_CC
2877 if test -n "$ac_ct_CC"; then
2878- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2879-echo "${ECHO_T}$ac_ct_CC" >&6; }
2880+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2881+echo "${ECHO_T}$ac_ct_CC" >&6
2882 else
2883- { echo "$as_me:$LINENO: result: no" >&5
2884-echo "${ECHO_T}no" >&6; }
2885+ echo "$as_me:$LINENO: result: no" >&5
2886+echo "${ECHO_T}no" >&6
2887 fi
2888
2889- if test "x$ac_ct_CC" = x; then
2890- CC=""
2891- else
2892- case $cross_compiling:$ac_tool_warned in
2893-yes:)
2894-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2895-whose name does not start with the host triplet. If you think this
2896-configuration is useful to you, please write to autoconf@gnu.org." >&5
2897-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2898-whose name does not start with the host triplet. If you think this
2899-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2900-ac_tool_warned=yes ;;
2901-esac
2902- CC=$ac_ct_CC
2903- fi
2904+ CC=$ac_ct_CC
2905 else
2906 CC="$ac_cv_prog_CC"
2907 fi
2908@@ -2202,8 +1653,8 @@
2909 if test -n "$ac_tool_prefix"; then
2910 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
2911 set dummy ${ac_tool_prefix}gcc; ac_word=$2
2912-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2913-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2914+echo "$as_me:$LINENO: checking for $ac_word" >&5
2915+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2916 if test "${ac_cv_prog_CC+set}" = set; then
2917 echo $ECHO_N "(cached) $ECHO_C" >&6
2918 else
2919@@ -2216,34 +1667,32 @@
2920 IFS=$as_save_IFS
2921 test -z "$as_dir" && as_dir=.
2922 for ac_exec_ext in '' $ac_executable_extensions; do
2923- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2924+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2925 ac_cv_prog_CC="${ac_tool_prefix}gcc"
2926 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2927 break 2
2928 fi
2929 done
2930 done
2931-IFS=$as_save_IFS
2932
2933 fi
2934 fi
2935 CC=$ac_cv_prog_CC
2936 if test -n "$CC"; then
2937- { echo "$as_me:$LINENO: result: $CC" >&5
2938-echo "${ECHO_T}$CC" >&6; }
2939+ echo "$as_me:$LINENO: result: $CC" >&5
2940+echo "${ECHO_T}$CC" >&6
2941 else
2942- { echo "$as_me:$LINENO: result: no" >&5
2943-echo "${ECHO_T}no" >&6; }
2944+ echo "$as_me:$LINENO: result: no" >&5
2945+echo "${ECHO_T}no" >&6
2946 fi
2947
2948-
2949 fi
2950 if test -z "$ac_cv_prog_CC"; then
2951 ac_ct_CC=$CC
2952 # Extract the first word of "gcc", so it can be a program name with args.
2953 set dummy gcc; ac_word=$2
2954-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2955-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2956+echo "$as_me:$LINENO: checking for $ac_word" >&5
2957+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2958 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
2959 echo $ECHO_N "(cached) $ECHO_C" >&6
2960 else
2961@@ -2256,51 +1705,36 @@
2962 IFS=$as_save_IFS
2963 test -z "$as_dir" && as_dir=.
2964 for ac_exec_ext in '' $ac_executable_extensions; do
2965- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2966+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2967 ac_cv_prog_ac_ct_CC="gcc"
2968 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2969 break 2
2970 fi
2971 done
2972 done
2973-IFS=$as_save_IFS
2974
2975 fi
2976 fi
2977 ac_ct_CC=$ac_cv_prog_ac_ct_CC
2978 if test -n "$ac_ct_CC"; then
2979- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2980-echo "${ECHO_T}$ac_ct_CC" >&6; }
2981+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
2982+echo "${ECHO_T}$ac_ct_CC" >&6
2983 else
2984- { echo "$as_me:$LINENO: result: no" >&5
2985-echo "${ECHO_T}no" >&6; }
2986+ echo "$as_me:$LINENO: result: no" >&5
2987+echo "${ECHO_T}no" >&6
2988 fi
2989
2990- if test "x$ac_ct_CC" = x; then
2991- CC=""
2992- else
2993- case $cross_compiling:$ac_tool_warned in
2994-yes:)
2995-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2996-whose name does not start with the host triplet. If you think this
2997-configuration is useful to you, please write to autoconf@gnu.org." >&5
2998-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2999-whose name does not start with the host triplet. If you think this
3000-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3001-ac_tool_warned=yes ;;
3002-esac
3003- CC=$ac_ct_CC
3004- fi
3005+ CC=$ac_ct_CC
3006 else
3007 CC="$ac_cv_prog_CC"
3008 fi
3009
3010 if test -z "$CC"; then
3011- if test -n "$ac_tool_prefix"; then
3012- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
3013+ if test -n "$ac_tool_prefix"; then
3014+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
3015 set dummy ${ac_tool_prefix}cc; ac_word=$2
3016-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3017-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3018+echo "$as_me:$LINENO: checking for $ac_word" >&5
3019+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3020 if test "${ac_cv_prog_CC+set}" = set; then
3021 echo $ECHO_N "(cached) $ECHO_C" >&6
3022 else
3023@@ -2313,34 +1747,74 @@
3024 IFS=$as_save_IFS
3025 test -z "$as_dir" && as_dir=.
3026 for ac_exec_ext in '' $ac_executable_extensions; do
3027- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3028+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3029 ac_cv_prog_CC="${ac_tool_prefix}cc"
3030 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3031 break 2
3032 fi
3033 done
3034 done
3035-IFS=$as_save_IFS
3036
3037 fi
3038 fi
3039 CC=$ac_cv_prog_CC
3040 if test -n "$CC"; then
3041- { echo "$as_me:$LINENO: result: $CC" >&5
3042-echo "${ECHO_T}$CC" >&6; }
3043+ echo "$as_me:$LINENO: result: $CC" >&5
3044+echo "${ECHO_T}$CC" >&6
3045 else
3046- { echo "$as_me:$LINENO: result: no" >&5
3047-echo "${ECHO_T}no" >&6; }
3048+ echo "$as_me:$LINENO: result: no" >&5
3049+echo "${ECHO_T}no" >&6
3050 fi
3051
3052-
3053+fi
3054+if test -z "$ac_cv_prog_CC"; then
3055+ ac_ct_CC=$CC
3056+ # Extract the first word of "cc", so it can be a program name with args.
3057+set dummy cc; ac_word=$2
3058+echo "$as_me:$LINENO: checking for $ac_word" >&5
3059+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3060+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3061+ echo $ECHO_N "(cached) $ECHO_C" >&6
3062+else
3063+ if test -n "$ac_ct_CC"; then
3064+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
3065+else
3066+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3067+for as_dir in $PATH
3068+do
3069+ IFS=$as_save_IFS
3070+ test -z "$as_dir" && as_dir=.
3071+ for ac_exec_ext in '' $ac_executable_extensions; do
3072+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3073+ ac_cv_prog_ac_ct_CC="cc"
3074+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3075+ break 2
3076 fi
3077+done
3078+done
3079+
3080+fi
3081+fi
3082+ac_ct_CC=$ac_cv_prog_ac_ct_CC
3083+if test -n "$ac_ct_CC"; then
3084+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3085+echo "${ECHO_T}$ac_ct_CC" >&6
3086+else
3087+ echo "$as_me:$LINENO: result: no" >&5
3088+echo "${ECHO_T}no" >&6
3089+fi
3090+
3091+ CC=$ac_ct_CC
3092+else
3093+ CC="$ac_cv_prog_CC"
3094+fi
3095+
3096 fi
3097 if test -z "$CC"; then
3098 # Extract the first word of "cc", so it can be a program name with args.
3099 set dummy cc; ac_word=$2
3100-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3101-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3102+echo "$as_me:$LINENO: checking for $ac_word" >&5
3103+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3104 if test "${ac_cv_prog_CC+set}" = set; then
3105 echo $ECHO_N "(cached) $ECHO_C" >&6
3106 else
3107@@ -2354,7 +1828,7 @@
3108 IFS=$as_save_IFS
3109 test -z "$as_dir" && as_dir=.
3110 for ac_exec_ext in '' $ac_executable_extensions; do
3111- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3112+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3113 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3114 ac_prog_rejected=yes
3115 continue
3116@@ -2365,7 +1839,6 @@
3117 fi
3118 done
3119 done
3120-IFS=$as_save_IFS
3121
3122 if test $ac_prog_rejected = yes; then
3123 # We found a bogon in the path, so make sure we never use it.
3124@@ -2383,23 +1856,22 @@
3125 fi
3126 CC=$ac_cv_prog_CC
3127 if test -n "$CC"; then
3128- { echo "$as_me:$LINENO: result: $CC" >&5
3129-echo "${ECHO_T}$CC" >&6; }
3130+ echo "$as_me:$LINENO: result: $CC" >&5
3131+echo "${ECHO_T}$CC" >&6
3132 else
3133- { echo "$as_me:$LINENO: result: no" >&5
3134-echo "${ECHO_T}no" >&6; }
3135+ echo "$as_me:$LINENO: result: no" >&5
3136+echo "${ECHO_T}no" >&6
3137 fi
3138
3139-
3140 fi
3141 if test -z "$CC"; then
3142 if test -n "$ac_tool_prefix"; then
3143- for ac_prog in cl.exe
3144+ for ac_prog in cl
3145 do
3146 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3147 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3148-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3149-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3150+echo "$as_me:$LINENO: checking for $ac_word" >&5
3151+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3152 if test "${ac_cv_prog_CC+set}" = set; then
3153 echo $ECHO_N "(cached) $ECHO_C" >&6
3154 else
3155@@ -2412,38 +1884,36 @@
3156 IFS=$as_save_IFS
3157 test -z "$as_dir" && as_dir=.
3158 for ac_exec_ext in '' $ac_executable_extensions; do
3159- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3160+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3161 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3162 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3163 break 2
3164 fi
3165 done
3166 done
3167-IFS=$as_save_IFS
3168
3169 fi
3170 fi
3171 CC=$ac_cv_prog_CC
3172 if test -n "$CC"; then
3173- { echo "$as_me:$LINENO: result: $CC" >&5
3174-echo "${ECHO_T}$CC" >&6; }
3175+ echo "$as_me:$LINENO: result: $CC" >&5
3176+echo "${ECHO_T}$CC" >&6
3177 else
3178- { echo "$as_me:$LINENO: result: no" >&5
3179-echo "${ECHO_T}no" >&6; }
3180+ echo "$as_me:$LINENO: result: no" >&5
3181+echo "${ECHO_T}no" >&6
3182 fi
3183
3184-
3185 test -n "$CC" && break
3186 done
3187 fi
3188 if test -z "$CC"; then
3189 ac_ct_CC=$CC
3190- for ac_prog in cl.exe
3191+ for ac_prog in cl
3192 do
3193 # Extract the first word of "$ac_prog", so it can be a program name with args.
3194 set dummy $ac_prog; ac_word=$2
3195-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
3196-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
3197+echo "$as_me:$LINENO: checking for $ac_word" >&5
3198+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3199 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
3200 echo $ECHO_N "(cached) $ECHO_C" >&6
3201 else
3202@@ -2456,45 +1926,29 @@
3203 IFS=$as_save_IFS
3204 test -z "$as_dir" && as_dir=.
3205 for ac_exec_ext in '' $ac_executable_extensions; do
3206- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3207+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3208 ac_cv_prog_ac_ct_CC="$ac_prog"
3209 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3210 break 2
3211 fi
3212 done
3213 done
3214-IFS=$as_save_IFS
3215
3216 fi
3217 fi
3218 ac_ct_CC=$ac_cv_prog_ac_ct_CC
3219 if test -n "$ac_ct_CC"; then
3220- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3221-echo "${ECHO_T}$ac_ct_CC" >&6; }
3222+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
3223+echo "${ECHO_T}$ac_ct_CC" >&6
3224 else
3225- { echo "$as_me:$LINENO: result: no" >&5
3226-echo "${ECHO_T}no" >&6; }
3227+ echo "$as_me:$LINENO: result: no" >&5
3228+echo "${ECHO_T}no" >&6
3229 fi
3230
3231-
3232 test -n "$ac_ct_CC" && break
3233 done
3234
3235- if test "x$ac_ct_CC" = x; then
3236- CC=""
3237- else
3238- case $cross_compiling:$ac_tool_warned in
3239-yes:)
3240-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
3241-whose name does not start with the host triplet. If you think this
3242-configuration is useful to you, please write to autoconf@gnu.org." >&5
3243-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
3244-whose name does not start with the host triplet. If you think this
3245-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
3246-ac_tool_warned=yes ;;
3247-esac
3248- CC=$ac_ct_CC
3249- fi
3250+ CC=$ac_ct_CC
3251 fi
3252
3253 fi
3254@@ -2507,35 +1961,21 @@
3255 { (exit 1); exit 1; }; }
3256
3257 # Provide some information about the compiler.
3258-echo "$as_me:$LINENO: checking for C compiler version" >&5
3259+echo "$as_me:$LINENO:" \
3260+ "checking for C compiler version" >&5
3261 ac_compiler=`set X $ac_compile; echo $2`
3262-{ (ac_try="$ac_compiler --version >&5"
3263-case "(($ac_try" in
3264- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3265- *) ac_try_echo=$ac_try;;
3266-esac
3267-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3268- (eval "$ac_compiler --version >&5") 2>&5
3269+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
3270+ (eval $ac_compiler --version </dev/null >&5) 2>&5
3271 ac_status=$?
3272 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3273 (exit $ac_status); }
3274-{ (ac_try="$ac_compiler -v >&5"
3275-case "(($ac_try" in
3276- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3277- *) ac_try_echo=$ac_try;;
3278-esac
3279-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3280- (eval "$ac_compiler -v >&5") 2>&5
3281+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
3282+ (eval $ac_compiler -v </dev/null >&5) 2>&5
3283 ac_status=$?
3284 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3285 (exit $ac_status); }
3286-{ (ac_try="$ac_compiler -V >&5"
3287-case "(($ac_try" in
3288- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3289- *) ac_try_echo=$ac_try;;
3290-esac
3291-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3292- (eval "$ac_compiler -V >&5") 2>&5
3293+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
3294+ (eval $ac_compiler -V </dev/null >&5) 2>&5
3295 ac_status=$?
3296 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3297 (exit $ac_status); }
3298@@ -2560,77 +2000,47 @@
3299 # Try to create an executable without -o first, disregard a.out.
3300 # It will help us diagnose broken compilers, and finding out an intuition
3301 # of exeext.
3302-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3303-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
3304+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
3305+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
3306 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3307-#
3308-# List of possible output files, starting from the most likely.
3309-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
3310-# only as a last resort. b.out is created by i960 compilers.
3311-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
3312-#
3313-# The IRIX 6 linker writes into existing files which may not be
3314-# executable, retaining their permissions. Remove them first so a
3315-# subsequent execution test works.
3316-ac_rmfiles=
3317-for ac_file in $ac_files
3318-do
3319- case $ac_file in
3320- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
3321- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
3322- esac
3323-done
3324-rm -f $ac_rmfiles
3325-
3326-if { (ac_try="$ac_link_default"
3327-case "(($ac_try" in
3328- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3329- *) ac_try_echo=$ac_try;;
3330-esac
3331-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3332- (eval "$ac_link_default") 2>&5
3333+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
3334+ (eval $ac_link_default) 2>&5
3335 ac_status=$?
3336 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3337 (exit $ac_status); }; then
3338- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
3339-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
3340-# in a Makefile. We should not override ac_cv_exeext if it was cached,
3341-# so that the user can short-circuit this test for compilers unknown to
3342-# Autoconf.
3343-for ac_file in $ac_files ''
3344+ # Find the output, starting from the most likely. This scheme is
3345+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
3346+# resort.
3347+
3348+# Be careful to initialize this variable, since it used to be cached.
3349+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
3350+ac_cv_exeext=
3351+# b.out is created by i960 compilers.
3352+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
3353 do
3354 test -f "$ac_file" || continue
3355 case $ac_file in
3356- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
3357+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
3358+ ;;
3359+ conftest.$ac_ext )
3360+ # This is the source file.
3361 ;;
3362 [ab].out )
3363 # We found the default executable, but exeext='' is most
3364 # certainly right.
3365 break;;
3366 *.* )
3367- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3368- then :; else
3369- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3370- fi
3371- # We set ac_cv_exeext here because the later test for it is not
3372- # safe: cross compilers may not add the suffix if given an `-o'
3373- # argument, so we may need to know it at that point already.
3374- # Even if this section looks crufty: it has the advantage of
3375- # actually working.
3376+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3377+ # FIXME: I believe we export ac_cv_exeext for Libtool,
3378+ # but it would be cool to find out if it's true. Does anybody
3379+ # maintain Libtool? --akim.
3380+ export ac_cv_exeext
3381 break;;
3382 * )
3383 break;;
3384 esac
3385 done
3386-test "$ac_cv_exeext" = no && ac_cv_exeext=
3387-
3388 else
3389- ac_file=''
3390-fi
3391-
3392-{ echo "$as_me:$LINENO: result: $ac_file" >&5
3393-echo "${ECHO_T}$ac_file" >&6; }
3394-if test -z "$ac_file"; then
3395 echo "$as_me: failed program was:" >&5
3396 sed 's/^/| /' conftest.$ac_ext >&5
3397
3398@@ -2642,21 +2052,19 @@
3399 fi
3400
3401 ac_exeext=$ac_cv_exeext
3402+echo "$as_me:$LINENO: result: $ac_file" >&5
3403+echo "${ECHO_T}$ac_file" >&6
3404
3405-# Check that the compiler produces executables we can run. If not, either
3406+# Check the compiler produces executables we can run. If not, either
3407 # the compiler is broken, or we cross compile.
3408-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3409-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
3410+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
3411+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
3412 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
3413 # If not cross compiling, check that we can run a simple program.
3414 if test "$cross_compiling" != yes; then
3415 if { ac_try='./$ac_file'
3416- { (case "(($ac_try" in
3417- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3418- *) ac_try_echo=$ac_try;;
3419-esac
3420-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3421- (eval "$ac_try") 2>&5
3422+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3423+ (eval $ac_try) 2>&5
3424 ac_status=$?
3425 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3426 (exit $ac_status); }; }; then
3427@@ -2675,27 +2083,22 @@
3428 fi
3429 fi
3430 fi
3431-{ echo "$as_me:$LINENO: result: yes" >&5
3432-echo "${ECHO_T}yes" >&6; }
3433+echo "$as_me:$LINENO: result: yes" >&5
3434+echo "${ECHO_T}yes" >&6
3435
3436 rm -f a.out a.exe conftest$ac_cv_exeext b.out
3437 ac_clean_files=$ac_clean_files_save
3438-# Check that the compiler produces executables we can run. If not, either
3439+# Check the compiler produces executables we can run. If not, either
3440 # the compiler is broken, or we cross compile.
3441-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3442-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
3443-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
3444-echo "${ECHO_T}$cross_compiling" >&6; }
3445-
3446-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
3447-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
3448-if { (ac_try="$ac_link"
3449-case "(($ac_try" in
3450- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3451- *) ac_try_echo=$ac_try;;
3452-esac
3453-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3454- (eval "$ac_link") 2>&5
3455+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3456+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
3457+echo "$as_me:$LINENO: result: $cross_compiling" >&5
3458+echo "${ECHO_T}$cross_compiling" >&6
3459+
3460+echo "$as_me:$LINENO: checking for suffix of executables" >&5
3461+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
3462+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3463+ (eval $ac_link) 2>&5
3464 ac_status=$?
3465 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3466 (exit $ac_status); }; then
3467@@ -2706,8 +2109,9 @@
3468 for ac_file in conftest.exe conftest conftest.*; do
3469 test -f "$ac_file" || continue
3470 case $ac_file in
3471- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
3472+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
3473 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3474+ export ac_cv_exeext
3475 break;;
3476 * ) break;;
3477 esac
3478@@ -2721,14 +2125,14 @@
3479 fi
3480
3481 rm -f conftest$ac_cv_exeext
3482-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3483-echo "${ECHO_T}$ac_cv_exeext" >&6; }
3484+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3485+echo "${ECHO_T}$ac_cv_exeext" >&6
3486
3487 rm -f conftest.$ac_ext
3488 EXEEXT=$ac_cv_exeext
3489 ac_exeext=$EXEEXT
3490-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
3491-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
3492+echo "$as_me:$LINENO: checking for suffix of object files" >&5
3493+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
3494 if test "${ac_cv_objext+set}" = set; then
3495 echo $ECHO_N "(cached) $ECHO_C" >&6
3496 else
3497@@ -2748,20 +2152,14 @@
3498 }
3499 _ACEOF
3500 rm -f conftest.o conftest.obj
3501-if { (ac_try="$ac_compile"
3502-case "(($ac_try" in
3503- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3504- *) ac_try_echo=$ac_try;;
3505-esac
3506-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3507- (eval "$ac_compile") 2>&5
3508+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3509+ (eval $ac_compile) 2>&5
3510 ac_status=$?
3511 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3512 (exit $ac_status); }; then
3513- for ac_file in conftest.o conftest.obj conftest.*; do
3514- test -f "$ac_file" || continue;
3515+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
3516 case $ac_file in
3517- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
3518+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
3519 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
3520 break;;
3521 esac
3522@@ -2779,12 +2177,12 @@
3523
3524 rm -f conftest.$ac_cv_objext conftest.$ac_ext
3525 fi
3526-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3527-echo "${ECHO_T}$ac_cv_objext" >&6; }
3528+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
3529+echo "${ECHO_T}$ac_cv_objext" >&6
3530 OBJEXT=$ac_cv_objext
3531 ac_objext=$OBJEXT
3532-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3533-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
3534+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
3535+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
3536 if test "${ac_cv_c_compiler_gnu+set}" = set; then
3537 echo $ECHO_N "(cached) $ECHO_C" >&6
3538 else
3539@@ -2807,49 +2205,49 @@
3540 }
3541 _ACEOF
3542 rm -f conftest.$ac_objext
3543-if { (ac_try="$ac_compile"
3544-case "(($ac_try" in
3545- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3546- *) ac_try_echo=$ac_try;;
3547-esac
3548-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3549- (eval "$ac_compile") 2>conftest.er1
3550+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3551+ (eval $ac_compile) 2>conftest.er1
3552 ac_status=$?
3553 grep -v '^ *+' conftest.er1 >conftest.err
3554 rm -f conftest.er1
3555 cat conftest.err >&5
3556 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3557- (exit $ac_status); } && {
3558- test -z "$ac_c_werror_flag" ||
3559- test ! -s conftest.err
3560- } && test -s conftest.$ac_objext; then
3561+ (exit $ac_status); } &&
3562+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3563+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3564+ (eval $ac_try) 2>&5
3565+ ac_status=$?
3566+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3567+ (exit $ac_status); }; } &&
3568+ { ac_try='test -s conftest.$ac_objext'
3569+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3570+ (eval $ac_try) 2>&5
3571+ ac_status=$?
3572+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3573+ (exit $ac_status); }; }; then
3574 ac_compiler_gnu=yes
3575 else
3576 echo "$as_me: failed program was:" >&5
3577 sed 's/^/| /' conftest.$ac_ext >&5
3578
3579- ac_compiler_gnu=no
3580+ac_compiler_gnu=no
3581 fi
3582-
3583-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3584+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3585 ac_cv_c_compiler_gnu=$ac_compiler_gnu
3586
3587 fi
3588-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3589-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
3590+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
3591+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
3592 GCC=`test $ac_compiler_gnu = yes && echo yes`
3593 ac_test_CFLAGS=${CFLAGS+set}
3594 ac_save_CFLAGS=$CFLAGS
3595-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3596-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
3597+CFLAGS="-g"
3598+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
3599+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
3600 if test "${ac_cv_prog_cc_g+set}" = set; then
3601 echo $ECHO_N "(cached) $ECHO_C" >&6
3602 else
3603- ac_save_c_werror_flag=$ac_c_werror_flag
3604- ac_c_werror_flag=yes
3605- ac_cv_prog_cc_g=no
3606- CFLAGS="-g"
3607- cat >conftest.$ac_ext <<_ACEOF
3608+ cat >conftest.$ac_ext <<_ACEOF
3609 /* confdefs.h. */
3610 _ACEOF
3611 cat confdefs.h >>conftest.$ac_ext
3612@@ -2865,118 +2263,37 @@
3613 }
3614 _ACEOF
3615 rm -f conftest.$ac_objext
3616-if { (ac_try="$ac_compile"
3617-case "(($ac_try" in
3618- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3619- *) ac_try_echo=$ac_try;;
3620-esac
3621-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3622- (eval "$ac_compile") 2>conftest.er1
3623+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3624+ (eval $ac_compile) 2>conftest.er1
3625 ac_status=$?
3626 grep -v '^ *+' conftest.er1 >conftest.err
3627 rm -f conftest.er1
3628 cat conftest.err >&5
3629 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3630- (exit $ac_status); } && {
3631- test -z "$ac_c_werror_flag" ||
3632- test ! -s conftest.err
3633- } && test -s conftest.$ac_objext; then
3634- ac_cv_prog_cc_g=yes
3635-else
3636- echo "$as_me: failed program was:" >&5
3637-sed 's/^/| /' conftest.$ac_ext >&5
3638-
3639- CFLAGS=""
3640- cat >conftest.$ac_ext <<_ACEOF
3641-/* confdefs.h. */
3642-_ACEOF
3643-cat confdefs.h >>conftest.$ac_ext
3644-cat >>conftest.$ac_ext <<_ACEOF
3645-/* end confdefs.h. */
3646-
3647-int
3648-main ()
3649-{
3650-
3651- ;
3652- return 0;
3653-}
3654-_ACEOF
3655-rm -f conftest.$ac_objext
3656-if { (ac_try="$ac_compile"
3657-case "(($ac_try" in
3658- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3659- *) ac_try_echo=$ac_try;;
3660-esac
3661-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3662- (eval "$ac_compile") 2>conftest.er1
3663+ (exit $ac_status); } &&
3664+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3665+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3666+ (eval $ac_try) 2>&5
3667 ac_status=$?
3668- grep -v '^ *+' conftest.er1 >conftest.err
3669- rm -f conftest.er1
3670- cat conftest.err >&5
3671 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3672- (exit $ac_status); } && {
3673- test -z "$ac_c_werror_flag" ||
3674- test ! -s conftest.err
3675- } && test -s conftest.$ac_objext; then
3676- :
3677-else
3678- echo "$as_me: failed program was:" >&5
3679-sed 's/^/| /' conftest.$ac_ext >&5
3680-
3681- ac_c_werror_flag=$ac_save_c_werror_flag
3682- CFLAGS="-g"
3683- cat >conftest.$ac_ext <<_ACEOF
3684-/* confdefs.h. */
3685-_ACEOF
3686-cat confdefs.h >>conftest.$ac_ext
3687-cat >>conftest.$ac_ext <<_ACEOF
3688-/* end confdefs.h. */
3689-
3690-int
3691-main ()
3692-{
3693-
3694- ;
3695- return 0;
3696-}
3697-_ACEOF
3698-rm -f conftest.$ac_objext
3699-if { (ac_try="$ac_compile"
3700-case "(($ac_try" in
3701- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3702- *) ac_try_echo=$ac_try;;
3703-esac
3704-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3705- (eval "$ac_compile") 2>conftest.er1
3706+ (exit $ac_status); }; } &&
3707+ { ac_try='test -s conftest.$ac_objext'
3708+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3709+ (eval $ac_try) 2>&5
3710 ac_status=$?
3711- grep -v '^ *+' conftest.er1 >conftest.err
3712- rm -f conftest.er1
3713- cat conftest.err >&5
3714 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3715- (exit $ac_status); } && {
3716- test -z "$ac_c_werror_flag" ||
3717- test ! -s conftest.err
3718- } && test -s conftest.$ac_objext; then
3719+ (exit $ac_status); }; }; then
3720 ac_cv_prog_cc_g=yes
3721 else
3722 echo "$as_me: failed program was:" >&5
3723 sed 's/^/| /' conftest.$ac_ext >&5
3724
3725-
3726-fi
3727-
3728-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3729-fi
3730-
3731-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3732+ac_cv_prog_cc_g=no
3733 fi
3734-
3735-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3736- ac_c_werror_flag=$ac_save_c_werror_flag
3737+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3738 fi
3739-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3740-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
3741+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
3742+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
3743 if test "$ac_test_CFLAGS" = set; then
3744 CFLAGS=$ac_save_CFLAGS
3745 elif test $ac_cv_prog_cc_g = yes; then
3746@@ -2992,12 +2309,12 @@
3747 CFLAGS=
3748 fi
3749 fi
3750-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
3751-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
3752-if test "${ac_cv_prog_cc_c89+set}" = set; then
3753+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
3754+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
3755+if test "${ac_cv_prog_cc_stdc+set}" = set; then
3756 echo $ECHO_N "(cached) $ECHO_C" >&6
3757 else
3758- ac_cv_prog_cc_c89=no
3759+ ac_cv_prog_cc_stdc=no
3760 ac_save_CC=$CC
3761 cat >conftest.$ac_ext <<_ACEOF
3762 /* confdefs.h. */
3763@@ -3031,17 +2348,12 @@
3764 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
3765 function prototypes and stuff, but not '\xHH' hex character constants.
3766 These don't provoke an error unfortunately, instead are silently treated
3767- as 'x'. The following induces an error, until -std is added to get
3768+ as 'x'. The following induces an error, until -std1 is added to get
3769 proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
3770 array size at least. It's necessary to write '\x00'==0 to get something
3771- that's true only with -std. */
3772+ that's true only with -std1. */
3773 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
3774
3775-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
3776- inside strings and character constants. */
3777-#define FOO(x) 'x'
3778-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
3779-
3780 int test (int i, double x);
3781 struct s1 {int (*f) (int a);};
3782 struct s2 {int (*f) (double a);};
3783@@ -3056,92 +2368,236 @@
3784 return 0;
3785 }
3786 _ACEOF
3787-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
3788- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3789+# Don't try gcc -ansi; that turns off useful extensions and
3790+# breaks some systems' header files.
3791+# AIX -qlanglvl=ansi
3792+# Ultrix and OSF/1 -std1
3793+# HP-UX 10.20 and later -Ae
3794+# HP-UX older versions -Aa -D_HPUX_SOURCE
3795+# SVR4 -Xc -D__EXTENSIONS__
3796+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3797 do
3798 CC="$ac_save_CC $ac_arg"
3799 rm -f conftest.$ac_objext
3800-if { (ac_try="$ac_compile"
3801-case "(($ac_try" in
3802- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3803- *) ac_try_echo=$ac_try;;
3804-esac
3805-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3806- (eval "$ac_compile") 2>conftest.er1
3807+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3808+ (eval $ac_compile) 2>conftest.er1
3809 ac_status=$?
3810 grep -v '^ *+' conftest.er1 >conftest.err
3811 rm -f conftest.er1
3812 cat conftest.err >&5
3813 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3814- (exit $ac_status); } && {
3815- test -z "$ac_c_werror_flag" ||
3816- test ! -s conftest.err
3817- } && test -s conftest.$ac_objext; then
3818- ac_cv_prog_cc_c89=$ac_arg
3819+ (exit $ac_status); } &&
3820+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3821+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3822+ (eval $ac_try) 2>&5
3823+ ac_status=$?
3824+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3825+ (exit $ac_status); }; } &&
3826+ { ac_try='test -s conftest.$ac_objext'
3827+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3828+ (eval $ac_try) 2>&5
3829+ ac_status=$?
3830+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3831+ (exit $ac_status); }; }; then
3832+ ac_cv_prog_cc_stdc=$ac_arg
3833+break
3834 else
3835 echo "$as_me: failed program was:" >&5
3836 sed 's/^/| /' conftest.$ac_ext >&5
3837
3838-
3839 fi
3840-
3841-rm -f core conftest.err conftest.$ac_objext
3842- test "x$ac_cv_prog_cc_c89" != "xno" && break
3843+rm -f conftest.err conftest.$ac_objext
3844 done
3845-rm -f conftest.$ac_ext
3846+rm -f conftest.$ac_ext conftest.$ac_objext
3847 CC=$ac_save_CC
3848
3849 fi
3850-# AC_CACHE_VAL
3851-case "x$ac_cv_prog_cc_c89" in
3852- x)
3853- { echo "$as_me:$LINENO: result: none needed" >&5
3854-echo "${ECHO_T}none needed" >&6; } ;;
3855- xno)
3856- { echo "$as_me:$LINENO: result: unsupported" >&5
3857-echo "${ECHO_T}unsupported" >&6; } ;;
3858+
3859+case "x$ac_cv_prog_cc_stdc" in
3860+ x|xno)
3861+ echo "$as_me:$LINENO: result: none needed" >&5
3862+echo "${ECHO_T}none needed" >&6 ;;
3863 *)
3864- CC="$CC $ac_cv_prog_cc_c89"
3865- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
3866-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
3867+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
3868+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
3869+ CC="$CC $ac_cv_prog_cc_stdc" ;;
3870 esac
3871
3872-
3873-ac_ext=c
3874-ac_cpp='$CPP $CPPFLAGS'
3875-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3876-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3877-ac_compiler_gnu=$ac_cv_c_compiler_gnu
3878-
3879-
3880-ac_ext=c
3881-ac_cpp='$CPP $CPPFLAGS'
3882-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3883-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3884-ac_compiler_gnu=$ac_cv_c_compiler_gnu
3885-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
3886-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
3887-# On Suns, sometimes $CPP names a directory.
3888-if test -n "$CPP" && test -d "$CPP"; then
3889- CPP=
3890-fi
3891-if test -z "$CPP"; then
3892- if test "${ac_cv_prog_CPP+set}" = set; then
3893- echo $ECHO_N "(cached) $ECHO_C" >&6
3894-else
3895- # Double quotes because CPP needs to be expanded
3896- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
3897- do
3898- ac_preproc_ok=false
3899-for ac_c_preproc_warn_flag in '' yes
3900-do
3901- # Use a header file that comes with gcc, so configuring glibc
3902- # with a fresh cross-compiler works.
3903- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3904- # <limits.h> exists even on freestanding compilers.
3905- # On the NeXT, cc -E runs the code through the compiler's parser,
3906- # not just through cpp. "Syntax error" is here to catch this case.
3907- cat >conftest.$ac_ext <<_ACEOF
3908+# Some people use a C++ compiler to compile C. Since we use `exit',
3909+# in C++ we need to declare it. In case someone uses the same compiler
3910+# for both compiling C and C++ we need to have the C++ compiler decide
3911+# the declaration of exit, since it's the most demanding environment.
3912+cat >conftest.$ac_ext <<_ACEOF
3913+#ifndef __cplusplus
3914+ choke me
3915+#endif
3916+_ACEOF
3917+rm -f conftest.$ac_objext
3918+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3919+ (eval $ac_compile) 2>conftest.er1
3920+ ac_status=$?
3921+ grep -v '^ *+' conftest.er1 >conftest.err
3922+ rm -f conftest.er1
3923+ cat conftest.err >&5
3924+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3925+ (exit $ac_status); } &&
3926+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3927+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3928+ (eval $ac_try) 2>&5
3929+ ac_status=$?
3930+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3931+ (exit $ac_status); }; } &&
3932+ { ac_try='test -s conftest.$ac_objext'
3933+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3934+ (eval $ac_try) 2>&5
3935+ ac_status=$?
3936+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3937+ (exit $ac_status); }; }; then
3938+ for ac_declaration in \
3939+ '' \
3940+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
3941+ 'extern "C" void std::exit (int); using std::exit;' \
3942+ 'extern "C" void exit (int) throw ();' \
3943+ 'extern "C" void exit (int);' \
3944+ 'void exit (int);'
3945+do
3946+ cat >conftest.$ac_ext <<_ACEOF
3947+/* confdefs.h. */
3948+_ACEOF
3949+cat confdefs.h >>conftest.$ac_ext
3950+cat >>conftest.$ac_ext <<_ACEOF
3951+/* end confdefs.h. */
3952+$ac_declaration
3953+#include <stdlib.h>
3954+int
3955+main ()
3956+{
3957+exit (42);
3958+ ;
3959+ return 0;
3960+}
3961+_ACEOF
3962+rm -f conftest.$ac_objext
3963+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3964+ (eval $ac_compile) 2>conftest.er1
3965+ ac_status=$?
3966+ grep -v '^ *+' conftest.er1 >conftest.err
3967+ rm -f conftest.er1
3968+ cat conftest.err >&5
3969+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3970+ (exit $ac_status); } &&
3971+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3972+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3973+ (eval $ac_try) 2>&5
3974+ ac_status=$?
3975+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3976+ (exit $ac_status); }; } &&
3977+ { ac_try='test -s conftest.$ac_objext'
3978+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3979+ (eval $ac_try) 2>&5
3980+ ac_status=$?
3981+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3982+ (exit $ac_status); }; }; then
3983+ :
3984+else
3985+ echo "$as_me: failed program was:" >&5
3986+sed 's/^/| /' conftest.$ac_ext >&5
3987+
3988+continue
3989+fi
3990+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3991+ cat >conftest.$ac_ext <<_ACEOF
3992+/* confdefs.h. */
3993+_ACEOF
3994+cat confdefs.h >>conftest.$ac_ext
3995+cat >>conftest.$ac_ext <<_ACEOF
3996+/* end confdefs.h. */
3997+$ac_declaration
3998+int
3999+main ()
4000+{
4001+exit (42);
4002+ ;
4003+ return 0;
4004+}
4005+_ACEOF
4006+rm -f conftest.$ac_objext
4007+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4008+ (eval $ac_compile) 2>conftest.er1
4009+ ac_status=$?
4010+ grep -v '^ *+' conftest.er1 >conftest.err
4011+ rm -f conftest.er1
4012+ cat conftest.err >&5
4013+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4014+ (exit $ac_status); } &&
4015+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4016+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4017+ (eval $ac_try) 2>&5
4018+ ac_status=$?
4019+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4020+ (exit $ac_status); }; } &&
4021+ { ac_try='test -s conftest.$ac_objext'
4022+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4023+ (eval $ac_try) 2>&5
4024+ ac_status=$?
4025+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4026+ (exit $ac_status); }; }; then
4027+ break
4028+else
4029+ echo "$as_me: failed program was:" >&5
4030+sed 's/^/| /' conftest.$ac_ext >&5
4031+
4032+fi
4033+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4034+done
4035+rm -f conftest*
4036+if test -n "$ac_declaration"; then
4037+ echo '#ifdef __cplusplus' >>confdefs.h
4038+ echo $ac_declaration >>confdefs.h
4039+ echo '#endif' >>confdefs.h
4040+fi
4041+
4042+else
4043+ echo "$as_me: failed program was:" >&5
4044+sed 's/^/| /' conftest.$ac_ext >&5
4045+
4046+fi
4047+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4048+ac_ext=c
4049+ac_cpp='$CPP $CPPFLAGS'
4050+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4051+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4052+ac_compiler_gnu=$ac_cv_c_compiler_gnu
4053+
4054+
4055+ac_ext=c
4056+ac_cpp='$CPP $CPPFLAGS'
4057+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4058+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4059+ac_compiler_gnu=$ac_cv_c_compiler_gnu
4060+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
4061+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
4062+# On Suns, sometimes $CPP names a directory.
4063+if test -n "$CPP" && test -d "$CPP"; then
4064+ CPP=
4065+fi
4066+if test -z "$CPP"; then
4067+ if test "${ac_cv_prog_CPP+set}" = set; then
4068+ echo $ECHO_N "(cached) $ECHO_C" >&6
4069+else
4070+ # Double quotes because CPP needs to be expanded
4071+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
4072+ do
4073+ ac_preproc_ok=false
4074+for ac_c_preproc_warn_flag in '' yes
4075+do
4076+ # Use a header file that comes with gcc, so configuring glibc
4077+ # with a fresh cross-compiler works.
4078+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
4079+ # <limits.h> exists even on freestanding compilers.
4080+ # On the NeXT, cc -E runs the code through the compiler's parser,
4081+ # not just through cpp. "Syntax error" is here to catch this case.
4082+ cat >conftest.$ac_ext <<_ACEOF
4083 /* confdefs.h. */
4084 _ACEOF
4085 cat confdefs.h >>conftest.$ac_ext
4086@@ -3154,22 +2610,24 @@
4087 #endif
4088 Syntax error
4089 _ACEOF
4090-if { (ac_try="$ac_cpp conftest.$ac_ext"
4091-case "(($ac_try" in
4092- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4093- *) ac_try_echo=$ac_try;;
4094-esac
4095-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4096- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4097+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4098+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4099 ac_status=$?
4100 grep -v '^ *+' conftest.er1 >conftest.err
4101 rm -f conftest.er1
4102 cat conftest.err >&5
4103 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4104- (exit $ac_status); } >/dev/null && {
4105- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4106- test ! -s conftest.err
4107- }; then
4108+ (exit $ac_status); } >/dev/null; then
4109+ if test -s conftest.err; then
4110+ ac_cpp_err=$ac_c_preproc_warn_flag
4111+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4112+ else
4113+ ac_cpp_err=
4114+ fi
4115+else
4116+ ac_cpp_err=yes
4117+fi
4118+if test -z "$ac_cpp_err"; then
4119 :
4120 else
4121 echo "$as_me: failed program was:" >&5
4122@@ -3178,10 +2636,9 @@
4123 # Broken: fails on valid input.
4124 continue
4125 fi
4126-
4127 rm -f conftest.err conftest.$ac_ext
4128
4129- # OK, works on sane cases. Now check whether nonexistent headers
4130+ # OK, works on sane cases. Now check whether non-existent headers
4131 # can be detected and how.
4132 cat >conftest.$ac_ext <<_ACEOF
4133 /* confdefs.h. */
4134@@ -3191,22 +2648,24 @@
4135 /* end confdefs.h. */
4136 #include <ac_nonexistent.h>
4137 _ACEOF
4138-if { (ac_try="$ac_cpp conftest.$ac_ext"
4139-case "(($ac_try" in
4140- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4141- *) ac_try_echo=$ac_try;;
4142-esac
4143-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4144- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4145+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4146+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4147 ac_status=$?
4148 grep -v '^ *+' conftest.er1 >conftest.err
4149 rm -f conftest.er1
4150 cat conftest.err >&5
4151 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4152- (exit $ac_status); } >/dev/null && {
4153- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4154- test ! -s conftest.err
4155- }; then
4156+ (exit $ac_status); } >/dev/null; then
4157+ if test -s conftest.err; then
4158+ ac_cpp_err=$ac_c_preproc_warn_flag
4159+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4160+ else
4161+ ac_cpp_err=
4162+ fi
4163+else
4164+ ac_cpp_err=yes
4165+fi
4166+if test -z "$ac_cpp_err"; then
4167 # Broken: success on invalid input.
4168 continue
4169 else
4170@@ -3217,7 +2676,6 @@
4171 ac_preproc_ok=:
4172 break
4173 fi
4174-
4175 rm -f conftest.err conftest.$ac_ext
4176
4177 done
4178@@ -3235,8 +2693,8 @@
4179 else
4180 ac_cv_prog_CPP=$CPP
4181 fi
4182-{ echo "$as_me:$LINENO: result: $CPP" >&5
4183-echo "${ECHO_T}$CPP" >&6; }
4184+echo "$as_me:$LINENO: result: $CPP" >&5
4185+echo "${ECHO_T}$CPP" >&6
4186 ac_preproc_ok=false
4187 for ac_c_preproc_warn_flag in '' yes
4188 do
4189@@ -3259,22 +2717,24 @@
4190 #endif
4191 Syntax error
4192 _ACEOF
4193-if { (ac_try="$ac_cpp conftest.$ac_ext"
4194-case "(($ac_try" in
4195- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4196- *) ac_try_echo=$ac_try;;
4197-esac
4198-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4199- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4200+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4201+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4202 ac_status=$?
4203 grep -v '^ *+' conftest.er1 >conftest.err
4204 rm -f conftest.er1
4205 cat conftest.err >&5
4206 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4207- (exit $ac_status); } >/dev/null && {
4208- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4209- test ! -s conftest.err
4210- }; then
4211+ (exit $ac_status); } >/dev/null; then
4212+ if test -s conftest.err; then
4213+ ac_cpp_err=$ac_c_preproc_warn_flag
4214+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4215+ else
4216+ ac_cpp_err=
4217+ fi
4218+else
4219+ ac_cpp_err=yes
4220+fi
4221+if test -z "$ac_cpp_err"; then
4222 :
4223 else
4224 echo "$as_me: failed program was:" >&5
4225@@ -3283,10 +2743,9 @@
4226 # Broken: fails on valid input.
4227 continue
4228 fi
4229-
4230 rm -f conftest.err conftest.$ac_ext
4231
4232- # OK, works on sane cases. Now check whether nonexistent headers
4233+ # OK, works on sane cases. Now check whether non-existent headers
4234 # can be detected and how.
4235 cat >conftest.$ac_ext <<_ACEOF
4236 /* confdefs.h. */
4237@@ -3296,22 +2755,24 @@
4238 /* end confdefs.h. */
4239 #include <ac_nonexistent.h>
4240 _ACEOF
4241-if { (ac_try="$ac_cpp conftest.$ac_ext"
4242-case "(($ac_try" in
4243- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4244- *) ac_try_echo=$ac_try;;
4245-esac
4246-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4247- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4248+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4249+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4250 ac_status=$?
4251 grep -v '^ *+' conftest.er1 >conftest.err
4252 rm -f conftest.er1
4253 cat conftest.err >&5
4254 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4255- (exit $ac_status); } >/dev/null && {
4256- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4257- test ! -s conftest.err
4258- }; then
4259+ (exit $ac_status); } >/dev/null; then
4260+ if test -s conftest.err; then
4261+ ac_cpp_err=$ac_c_preproc_warn_flag
4262+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4263+ else
4264+ ac_cpp_err=
4265+ fi
4266+else
4267+ ac_cpp_err=yes
4268+fi
4269+if test -z "$ac_cpp_err"; then
4270 # Broken: success on invalid input.
4271 continue
4272 else
4273@@ -3322,7 +2783,6 @@
4274 ac_preproc_ok=:
4275 break
4276 fi
4277-
4278 rm -f conftest.err conftest.$ac_ext
4279
4280 done
4281@@ -3345,171 +2805,24 @@
4282 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4283
4284
4285-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
4286-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
4287-if test "${ac_cv_path_GREP+set}" = set; then
4288- echo $ECHO_N "(cached) $ECHO_C" >&6
4289-else
4290- # Extract the first word of "grep ggrep" to use in msg output
4291-if test -z "$GREP"; then
4292-set dummy grep ggrep; ac_prog_name=$2
4293-if test "${ac_cv_path_GREP+set}" = set; then
4294- echo $ECHO_N "(cached) $ECHO_C" >&6
4295-else
4296- ac_path_GREP_found=false
4297-# Loop through the user's path and test for each of PROGNAME-LIST
4298-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4299-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4300-do
4301- IFS=$as_save_IFS
4302- test -z "$as_dir" && as_dir=.
4303- for ac_prog in grep ggrep; do
4304- for ac_exec_ext in '' $ac_executable_extensions; do
4305- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4306- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4307- # Check for GNU ac_path_GREP and select it if it is found.
4308- # Check for GNU $ac_path_GREP
4309-case `"$ac_path_GREP" --version 2>&1` in
4310-*GNU*)
4311- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
4312-*)
4313- ac_count=0
4314- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
4315- while :
4316- do
4317- cat "conftest.in" "conftest.in" >"conftest.tmp"
4318- mv "conftest.tmp" "conftest.in"
4319- cp "conftest.in" "conftest.nl"
4320- echo 'GREP' >> "conftest.nl"
4321- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4322- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4323- ac_count=`expr $ac_count + 1`
4324- if test $ac_count -gt ${ac_path_GREP_max-0}; then
4325- # Best one so far, save it but keep looking for a better one
4326- ac_cv_path_GREP="$ac_path_GREP"
4327- ac_path_GREP_max=$ac_count
4328- fi
4329- # 10*(2^10) chars as input seems more than enough
4330- test $ac_count -gt 10 && break
4331- done
4332- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4333-esac
4334-
4335-
4336- $ac_path_GREP_found && break 3
4337- done
4338-done
4339-
4340-done
4341-IFS=$as_save_IFS
4342-
4343-
4344-fi
4345-
4346-GREP="$ac_cv_path_GREP"
4347-if test -z "$GREP"; then
4348- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4349-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4350- { (exit 1); exit 1; }; }
4351-fi
4352-
4353-else
4354- ac_cv_path_GREP=$GREP
4355-fi
4356-
4357-
4358-fi
4359-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
4360-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
4361- GREP="$ac_cv_path_GREP"
4362-
4363-
4364-{ echo "$as_me:$LINENO: checking for egrep" >&5
4365-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
4366-if test "${ac_cv_path_EGREP+set}" = set; then
4367- echo $ECHO_N "(cached) $ECHO_C" >&6
4368-else
4369- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
4370- then ac_cv_path_EGREP="$GREP -E"
4371- else
4372- # Extract the first word of "egrep" to use in msg output
4373-if test -z "$EGREP"; then
4374-set dummy egrep; ac_prog_name=$2
4375-if test "${ac_cv_path_EGREP+set}" = set; then
4376+echo "$as_me:$LINENO: checking for egrep" >&5
4377+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
4378+if test "${ac_cv_prog_egrep+set}" = set; then
4379 echo $ECHO_N "(cached) $ECHO_C" >&6
4380 else
4381- ac_path_EGREP_found=false
4382-# Loop through the user's path and test for each of PROGNAME-LIST
4383-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4384-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4385-do
4386- IFS=$as_save_IFS
4387- test -z "$as_dir" && as_dir=.
4388- for ac_prog in egrep; do
4389- for ac_exec_ext in '' $ac_executable_extensions; do
4390- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4391- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4392- # Check for GNU ac_path_EGREP and select it if it is found.
4393- # Check for GNU $ac_path_EGREP
4394-case `"$ac_path_EGREP" --version 2>&1` in
4395-*GNU*)
4396- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
4397-*)
4398- ac_count=0
4399- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
4400- while :
4401- do
4402- cat "conftest.in" "conftest.in" >"conftest.tmp"
4403- mv "conftest.tmp" "conftest.in"
4404- cp "conftest.in" "conftest.nl"
4405- echo 'EGREP' >> "conftest.nl"
4406- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4407- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4408- ac_count=`expr $ac_count + 1`
4409- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
4410- # Best one so far, save it but keep looking for a better one
4411- ac_cv_path_EGREP="$ac_path_EGREP"
4412- ac_path_EGREP_max=$ac_count
4413+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
4414+ then ac_cv_prog_egrep='grep -E'
4415+ else ac_cv_prog_egrep='egrep'
4416 fi
4417- # 10*(2^10) chars as input seems more than enough
4418- test $ac_count -gt 10 && break
4419- done
4420- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4421-esac
4422-
4423-
4424- $ac_path_EGREP_found && break 3
4425- done
4426-done
4427-
4428-done
4429-IFS=$as_save_IFS
4430-
4431-
4432-fi
4433-
4434-EGREP="$ac_cv_path_EGREP"
4435-if test -z "$EGREP"; then
4436- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
4437-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
4438- { (exit 1); exit 1; }; }
4439 fi
4440-
4441-else
4442- ac_cv_path_EGREP=$EGREP
4443-fi
4444-
4445-
4446- fi
4447-fi
4448-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
4449-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
4450- EGREP="$ac_cv_path_EGREP"
4451+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
4452+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
4453+ EGREP=$ac_cv_prog_egrep
4454
4455
4456 if test $ac_cv_c_compiler_gnu = yes; then
4457- { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
4458-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
4459+ echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
4460+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
4461 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
4462 echo $ECHO_N "(cached) $ECHO_C" >&6
4463 else
4464@@ -3550,16 +2863,21 @@
4465
4466 fi
4467 fi
4468-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
4469-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
4470+echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
4471+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
4472 if test $ac_cv_prog_gcc_traditional = yes; then
4473 CC="$CC -traditional"
4474 fi
4475 fi
4476
4477+if test "$GCC" = yes; then
4478+ linker_flag=-Wl,
4479+else
4480+ linker_flag=
4481+fi
4482
4483-{ echo "$as_me:$LINENO: checking whether the linker is GNU ld" >&5
4484-echo $ECHO_N "checking whether the linker is GNU ld... $ECHO_C" >&6; }
4485+echo "$as_me:$LINENO: checking whether the linker is GNU ld" >&5
4486+echo $ECHO_N "checking whether the linker is GNU ld... $ECHO_C" >&6
4487 if test "${rb_cv_prog_gnu_ld+set}" = set; then
4488 echo $ECHO_N "(cached) $ECHO_C" >&6
4489 else
4490@@ -3570,12 +2888,12 @@
4491 fi
4492
4493 fi
4494-{ echo "$as_me:$LINENO: result: $rb_cv_prog_gnu_ld" >&5
4495-echo "${ECHO_T}$rb_cv_prog_gnu_ld" >&6; }
4496+echo "$as_me:$LINENO: result: $rb_cv_prog_gnu_ld" >&5
4497+echo "${ECHO_T}$rb_cv_prog_gnu_ld" >&6
4498 GNU_LD=$rb_cv_prog_gnu_ld
4499
4500-{ echo "$as_me:$LINENO: checking whether ${CPP} accepts -o" >&5
4501-echo $ECHO_N "checking whether ${CPP} accepts -o... $ECHO_C" >&6; }
4502+echo "$as_me:$LINENO: checking whether ${CPP} accepts -o" >&5
4503+echo $ECHO_N "checking whether ${CPP} accepts -o... $ECHO_C" >&6
4504 if test "${rb_cv_cppoutfile+set}" = set; then
4505 echo $ECHO_N "(cached) $ECHO_C" >&6
4506 else
4507@@ -3589,22 +2907,24 @@
4508 /* end confdefs.h. */
4509
4510 _ACEOF
4511-if { (ac_try="$ac_cpp conftest.$ac_ext"
4512-case "(($ac_try" in
4513- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4514- *) ac_try_echo=$ac_try;;
4515-esac
4516-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4517- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4518+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4519+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4520 ac_status=$?
4521 grep -v '^ *+' conftest.er1 >conftest.err
4522 rm -f conftest.er1
4523 cat conftest.err >&5
4524 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4525- (exit $ac_status); } >/dev/null && {
4526- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4527- test ! -s conftest.err
4528- }; then
4529+ (exit $ac_status); } >/dev/null; then
4530+ if test -s conftest.err; then
4531+ ac_cpp_err=$ac_c_preproc_warn_flag
4532+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4533+ else
4534+ ac_cpp_err=
4535+ fi
4536+else
4537+ ac_cpp_err=yes
4538+fi
4539+if test -z "$ac_cpp_err"; then
4540 rb_cv_cppoutfile=yes
4541 else
4542 echo "$as_me: failed program was:" >&5
4543@@ -3612,13 +2932,12 @@
4544
4545 rb_cv_cppoutfile=no
4546 fi
4547-
4548 rm -f conftest.err conftest.$ac_ext
4549 CPPFLAGS=$cppflags
4550 rm -f conftest*
4551 fi
4552-{ echo "$as_me:$LINENO: result: $rb_cv_cppoutfile" >&5
4553-echo "${ECHO_T}$rb_cv_cppoutfile" >&6; }
4554+echo "$as_me:$LINENO: result: $rb_cv_cppoutfile" >&5
4555+echo "${ECHO_T}$rb_cv_cppoutfile" >&6
4556 if test "$rb_cv_cppoutfile" = yes; then
4557 CPPOUTFILE='-o conftest.i'
4558 elif test "$rb_cv_cppoutfile" = no; then
4559@@ -3633,8 +2952,8 @@
4560
4561 case "$host_os" in
4562 cygwin*)
4563-{ echo "$as_me:$LINENO: checking for mingw32 environment" >&5
4564-echo $ECHO_N "checking for mingw32 environment... $ECHO_C" >&6; }
4565+echo "$as_me:$LINENO: checking for mingw32 environment" >&5
4566+echo $ECHO_N "checking for mingw32 environment... $ECHO_C" >&6
4567 if test "${rb_cv_mingw32+set}" = set; then
4568 echo $ECHO_N "(cached) $ECHO_C" >&6
4569 else
4570@@ -3650,22 +2969,24 @@
4571 #endif
4572
4573 _ACEOF
4574-if { (ac_try="$ac_cpp conftest.$ac_ext"
4575-case "(($ac_try" in
4576- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4577- *) ac_try_echo=$ac_try;;
4578-esac
4579-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4580- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4581+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
4582+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4583 ac_status=$?
4584 grep -v '^ *+' conftest.er1 >conftest.err
4585 rm -f conftest.er1
4586 cat conftest.err >&5
4587 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4588- (exit $ac_status); } >/dev/null && {
4589- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4590- test ! -s conftest.err
4591- }; then
4592+ (exit $ac_status); } >/dev/null; then
4593+ if test -s conftest.err; then
4594+ ac_cpp_err=$ac_c_preproc_warn_flag
4595+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4596+ else
4597+ ac_cpp_err=
4598+ fi
4599+else
4600+ ac_cpp_err=yes
4601+fi
4602+if test -z "$ac_cpp_err"; then
4603 rb_cv_mingw32=yes
4604 else
4605 echo "$as_me: failed program was:" >&5
4606@@ -3673,12 +2994,11 @@
4607
4608 rb_cv_mingw32=no
4609 fi
4610-
4611 rm -f conftest.err conftest.$ac_ext
4612 rm -f conftest*
4613 fi
4614-{ echo "$as_me:$LINENO: result: $rb_cv_mingw32" >&5
4615-echo "${ECHO_T}$rb_cv_mingw32" >&6; }
4616+echo "$as_me:$LINENO: result: $rb_cv_mingw32" >&5
4617+echo "${ECHO_T}$rb_cv_mingw32" >&6
4618 test "$rb_cv_mingw32" = yes && target_os="mingw32"
4619 ;;
4620 esac
4621@@ -3687,8 +3007,8 @@
4622 do
4623 # Extract the first word of "$ac_prog", so it can be a program name with args.
4624 set dummy $ac_prog; ac_word=$2
4625-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4626-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4627+echo "$as_me:$LINENO: checking for $ac_word" >&5
4628+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4629 if test "${ac_cv_prog_YACC+set}" = set; then
4630 echo $ECHO_N "(cached) $ECHO_C" >&6
4631 else
4632@@ -3701,27 +3021,25 @@
4633 IFS=$as_save_IFS
4634 test -z "$as_dir" && as_dir=.
4635 for ac_exec_ext in '' $ac_executable_extensions; do
4636- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4637+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4638 ac_cv_prog_YACC="$ac_prog"
4639 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4640 break 2
4641 fi
4642 done
4643 done
4644-IFS=$as_save_IFS
4645
4646 fi
4647 fi
4648 YACC=$ac_cv_prog_YACC
4649 if test -n "$YACC"; then
4650- { echo "$as_me:$LINENO: result: $YACC" >&5
4651-echo "${ECHO_T}$YACC" >&6; }
4652+ echo "$as_me:$LINENO: result: $YACC" >&5
4653+echo "${ECHO_T}$YACC" >&6
4654 else
4655- { echo "$as_me:$LINENO: result: no" >&5
4656-echo "${ECHO_T}no" >&6; }
4657+ echo "$as_me:$LINENO: result: no" >&5
4658+echo "${ECHO_T}no" >&6
4659 fi
4660
4661-
4662 test -n "$YACC" && break
4663 done
4664 test -n "$YACC" || YACC="yacc"
4665@@ -3736,8 +3054,8 @@
4666 if test -n "$ac_tool_prefix"; then
4667 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
4668 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
4669-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4670-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4671+echo "$as_me:$LINENO: checking for $ac_word" >&5
4672+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4673 if test "${ac_cv_prog_RANLIB+set}" = set; then
4674 echo $ECHO_N "(cached) $ECHO_C" >&6
4675 else
4676@@ -3750,34 +3068,32 @@
4677 IFS=$as_save_IFS
4678 test -z "$as_dir" && as_dir=.
4679 for ac_exec_ext in '' $ac_executable_extensions; do
4680- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4681+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4682 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
4683 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4684 break 2
4685 fi
4686 done
4687 done
4688-IFS=$as_save_IFS
4689
4690 fi
4691 fi
4692 RANLIB=$ac_cv_prog_RANLIB
4693 if test -n "$RANLIB"; then
4694- { echo "$as_me:$LINENO: result: $RANLIB" >&5
4695-echo "${ECHO_T}$RANLIB" >&6; }
4696+ echo "$as_me:$LINENO: result: $RANLIB" >&5
4697+echo "${ECHO_T}$RANLIB" >&6
4698 else
4699- { echo "$as_me:$LINENO: result: no" >&5
4700-echo "${ECHO_T}no" >&6; }
4701+ echo "$as_me:$LINENO: result: no" >&5
4702+echo "${ECHO_T}no" >&6
4703 fi
4704
4705-
4706 fi
4707 if test -z "$ac_cv_prog_RANLIB"; then
4708 ac_ct_RANLIB=$RANLIB
4709 # Extract the first word of "ranlib", so it can be a program name with args.
4710 set dummy ranlib; ac_word=$2
4711-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4712-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4713+echo "$as_me:$LINENO: checking for $ac_word" >&5
4714+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4715 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
4716 echo $ECHO_N "(cached) $ECHO_C" >&6
4717 else
4718@@ -3790,41 +3106,27 @@
4719 IFS=$as_save_IFS
4720 test -z "$as_dir" && as_dir=.
4721 for ac_exec_ext in '' $ac_executable_extensions; do
4722- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4723+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4724 ac_cv_prog_ac_ct_RANLIB="ranlib"
4725 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4726 break 2
4727 fi
4728 done
4729 done
4730-IFS=$as_save_IFS
4731
4732+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
4733 fi
4734 fi
4735 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
4736 if test -n "$ac_ct_RANLIB"; then
4737- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
4738-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
4739+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
4740+echo "${ECHO_T}$ac_ct_RANLIB" >&6
4741 else
4742- { echo "$as_me:$LINENO: result: no" >&5
4743-echo "${ECHO_T}no" >&6; }
4744+ echo "$as_me:$LINENO: result: no" >&5
4745+echo "${ECHO_T}no" >&6
4746 fi
4747
4748- if test "x$ac_ct_RANLIB" = x; then
4749- RANLIB=":"
4750- else
4751- case $cross_compiling:$ac_tool_warned in
4752-yes:)
4753-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4754-whose name does not start with the host triplet. If you think this
4755-configuration is useful to you, please write to autoconf@gnu.org." >&5
4756-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4757-whose name does not start with the host triplet. If you think this
4758-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4759-ac_tool_warned=yes ;;
4760-esac
4761- RANLIB=$ac_ct_RANLIB
4762- fi
4763+ RANLIB=$ac_ct_RANLIB
4764 else
4765 RANLIB="$ac_cv_prog_RANLIB"
4766 fi
4767@@ -3832,8 +3134,8 @@
4768 if test -n "$ac_tool_prefix"; then
4769 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
4770 set dummy ${ac_tool_prefix}ar; ac_word=$2
4771-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4772-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4773+echo "$as_me:$LINENO: checking for $ac_word" >&5
4774+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4775 if test "${ac_cv_prog_AR+set}" = set; then
4776 echo $ECHO_N "(cached) $ECHO_C" >&6
4777 else
4778@@ -3846,34 +3148,32 @@
4779 IFS=$as_save_IFS
4780 test -z "$as_dir" && as_dir=.
4781 for ac_exec_ext in '' $ac_executable_extensions; do
4782- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4783+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4784 ac_cv_prog_AR="${ac_tool_prefix}ar"
4785 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4786 break 2
4787 fi
4788 done
4789 done
4790-IFS=$as_save_IFS
4791
4792 fi
4793 fi
4794 AR=$ac_cv_prog_AR
4795 if test -n "$AR"; then
4796- { echo "$as_me:$LINENO: result: $AR" >&5
4797-echo "${ECHO_T}$AR" >&6; }
4798+ echo "$as_me:$LINENO: result: $AR" >&5
4799+echo "${ECHO_T}$AR" >&6
4800 else
4801- { echo "$as_me:$LINENO: result: no" >&5
4802-echo "${ECHO_T}no" >&6; }
4803+ echo "$as_me:$LINENO: result: no" >&5
4804+echo "${ECHO_T}no" >&6
4805 fi
4806
4807-
4808 fi
4809 if test -z "$ac_cv_prog_AR"; then
4810 ac_ct_AR=$AR
4811 # Extract the first word of "ar", so it can be a program name with args.
4812 set dummy ar; ac_word=$2
4813-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4814-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4815+echo "$as_me:$LINENO: checking for $ac_word" >&5
4816+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4817 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
4818 echo $ECHO_N "(cached) $ECHO_C" >&6
4819 else
4820@@ -3886,41 +3186,26 @@
4821 IFS=$as_save_IFS
4822 test -z "$as_dir" && as_dir=.
4823 for ac_exec_ext in '' $ac_executable_extensions; do
4824- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4825+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4826 ac_cv_prog_ac_ct_AR="ar"
4827 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4828 break 2
4829 fi
4830 done
4831 done
4832-IFS=$as_save_IFS
4833
4834 fi
4835 fi
4836 ac_ct_AR=$ac_cv_prog_ac_ct_AR
4837 if test -n "$ac_ct_AR"; then
4838- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
4839-echo "${ECHO_T}$ac_ct_AR" >&6; }
4840+ echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
4841+echo "${ECHO_T}$ac_ct_AR" >&6
4842 else
4843- { echo "$as_me:$LINENO: result: no" >&5
4844-echo "${ECHO_T}no" >&6; }
4845+ echo "$as_me:$LINENO: result: no" >&5
4846+echo "${ECHO_T}no" >&6
4847 fi
4848
4849- if test "x$ac_ct_AR" = x; then
4850- AR=""
4851- else
4852- case $cross_compiling:$ac_tool_warned in
4853-yes:)
4854-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4855-whose name does not start with the host triplet. If you think this
4856-configuration is useful to you, please write to autoconf@gnu.org." >&5
4857-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4858-whose name does not start with the host triplet. If you think this
4859-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4860-ac_tool_warned=yes ;;
4861-esac
4862- AR=$ac_ct_AR
4863- fi
4864+ AR=$ac_ct_AR
4865 else
4866 AR="$ac_cv_prog_AR"
4867 fi
4868@@ -3930,8 +3215,8 @@
4869 do
4870 # Extract the first word of "$ac_prog", so it can be a program name with args.
4871 set dummy $ac_prog; ac_word=$2
4872-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4873-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4874+echo "$as_me:$LINENO: checking for $ac_word" >&5
4875+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4876 if test "${ac_cv_prog_AR+set}" = set; then
4877 echo $ECHO_N "(cached) $ECHO_C" >&6
4878 else
4879@@ -3944,27 +3229,25 @@
4880 IFS=$as_save_IFS
4881 test -z "$as_dir" && as_dir=.
4882 for ac_exec_ext in '' $ac_executable_extensions; do
4883- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4884+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4885 ac_cv_prog_AR="$ac_prog"
4886 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4887 break 2
4888 fi
4889 done
4890 done
4891-IFS=$as_save_IFS
4892
4893 fi
4894 fi
4895 AR=$ac_cv_prog_AR
4896 if test -n "$AR"; then
4897- { echo "$as_me:$LINENO: result: $AR" >&5
4898-echo "${ECHO_T}$AR" >&6; }
4899+ echo "$as_me:$LINENO: result: $AR" >&5
4900+echo "${ECHO_T}$AR" >&6
4901 else
4902- { echo "$as_me:$LINENO: result: no" >&5
4903-echo "${ECHO_T}no" >&6; }
4904+ echo "$as_me:$LINENO: result: no" >&5
4905+echo "${ECHO_T}no" >&6
4906 fi
4907
4908-
4909 test -n "$AR" && break
4910 done
4911 test -n "$AR" || AR="ar"
4912@@ -3974,8 +3257,8 @@
4913 if test -n "$ac_tool_prefix"; then
4914 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
4915 set dummy ${ac_tool_prefix}as; ac_word=$2
4916-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4917-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4918+echo "$as_me:$LINENO: checking for $ac_word" >&5
4919+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4920 if test "${ac_cv_prog_AS+set}" = set; then
4921 echo $ECHO_N "(cached) $ECHO_C" >&6
4922 else
4923@@ -3988,34 +3271,32 @@
4924 IFS=$as_save_IFS
4925 test -z "$as_dir" && as_dir=.
4926 for ac_exec_ext in '' $ac_executable_extensions; do
4927- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4928+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4929 ac_cv_prog_AS="${ac_tool_prefix}as"
4930 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4931 break 2
4932 fi
4933 done
4934 done
4935-IFS=$as_save_IFS
4936
4937 fi
4938 fi
4939 AS=$ac_cv_prog_AS
4940 if test -n "$AS"; then
4941- { echo "$as_me:$LINENO: result: $AS" >&5
4942-echo "${ECHO_T}$AS" >&6; }
4943+ echo "$as_me:$LINENO: result: $AS" >&5
4944+echo "${ECHO_T}$AS" >&6
4945 else
4946- { echo "$as_me:$LINENO: result: no" >&5
4947-echo "${ECHO_T}no" >&6; }
4948+ echo "$as_me:$LINENO: result: no" >&5
4949+echo "${ECHO_T}no" >&6
4950 fi
4951
4952-
4953 fi
4954 if test -z "$ac_cv_prog_AS"; then
4955 ac_ct_AS=$AS
4956 # Extract the first word of "as", so it can be a program name with args.
4957 set dummy as; ac_word=$2
4958-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4959-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4960+echo "$as_me:$LINENO: checking for $ac_word" >&5
4961+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4962 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
4963 echo $ECHO_N "(cached) $ECHO_C" >&6
4964 else
4965@@ -4028,41 +3309,26 @@
4966 IFS=$as_save_IFS
4967 test -z "$as_dir" && as_dir=.
4968 for ac_exec_ext in '' $ac_executable_extensions; do
4969- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4970+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4971 ac_cv_prog_ac_ct_AS="as"
4972 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4973 break 2
4974 fi
4975 done
4976 done
4977-IFS=$as_save_IFS
4978
4979 fi
4980 fi
4981 ac_ct_AS=$ac_cv_prog_ac_ct_AS
4982 if test -n "$ac_ct_AS"; then
4983- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
4984-echo "${ECHO_T}$ac_ct_AS" >&6; }
4985+ echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
4986+echo "${ECHO_T}$ac_ct_AS" >&6
4987 else
4988- { echo "$as_me:$LINENO: result: no" >&5
4989-echo "${ECHO_T}no" >&6; }
4990+ echo "$as_me:$LINENO: result: no" >&5
4991+echo "${ECHO_T}no" >&6
4992 fi
4993
4994- if test "x$ac_ct_AS" = x; then
4995- AS=""
4996- else
4997- case $cross_compiling:$ac_tool_warned in
4998-yes:)
4999-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
5000-whose name does not start with the host triplet. If you think this
5001-configuration is useful to you, please write to autoconf@gnu.org." >&5
5002-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
5003-whose name does not start with the host triplet. If you think this
5004-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
5005-ac_tool_warned=yes ;;
5006-esac
5007- AS=$ac_ct_AS
5008- fi
5009+ AS=$ac_ct_AS
5010 else
5011 AS="$ac_cv_prog_AS"
5012 fi
5013@@ -4075,8 +3341,8 @@
5014 if test -n "$ac_tool_prefix"; then
5015 # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
5016 set dummy ${ac_tool_prefix}nm; ac_word=$2
5017-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5018-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5019+echo "$as_me:$LINENO: checking for $ac_word" >&5
5020+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5021 if test "${ac_cv_prog_NM+set}" = set; then
5022 echo $ECHO_N "(cached) $ECHO_C" >&6
5023 else
5024@@ -4089,34 +3355,32 @@
5025 IFS=$as_save_IFS
5026 test -z "$as_dir" && as_dir=.
5027 for ac_exec_ext in '' $ac_executable_extensions; do
5028- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5029+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5030 ac_cv_prog_NM="${ac_tool_prefix}nm"
5031 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5032 break 2
5033 fi
5034 done
5035 done
5036-IFS=$as_save_IFS
5037
5038 fi
5039 fi
5040 NM=$ac_cv_prog_NM
5041 if test -n "$NM"; then
5042- { echo "$as_me:$LINENO: result: $NM" >&5
5043-echo "${ECHO_T}$NM" >&6; }
5044+ echo "$as_me:$LINENO: result: $NM" >&5
5045+echo "${ECHO_T}$NM" >&6
5046 else
5047- { echo "$as_me:$LINENO: result: no" >&5
5048-echo "${ECHO_T}no" >&6; }
5049+ echo "$as_me:$LINENO: result: no" >&5
5050+echo "${ECHO_T}no" >&6
5051 fi
5052
5053-
5054 fi
5055 if test -z "$ac_cv_prog_NM"; then
5056 ac_ct_NM=$NM
5057 # Extract the first word of "nm", so it can be a program name with args.
5058 set dummy nm; ac_word=$2
5059-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5060-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5061+echo "$as_me:$LINENO: checking for $ac_word" >&5
5062+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5063 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
5064 echo $ECHO_N "(cached) $ECHO_C" >&6
5065 else
5066@@ -4129,41 +3393,26 @@
5067 IFS=$as_save_IFS
5068 test -z "$as_dir" && as_dir=.
5069 for ac_exec_ext in '' $ac_executable_extensions; do
5070- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5071+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5072 ac_cv_prog_ac_ct_NM="nm"
5073 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5074 break 2
5075 fi
5076 done
5077 done
5078-IFS=$as_save_IFS
5079
5080 fi
5081 fi
5082 ac_ct_NM=$ac_cv_prog_ac_ct_NM
5083 if test -n "$ac_ct_NM"; then
5084- { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
5085-echo "${ECHO_T}$ac_ct_NM" >&6; }
5086+ echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
5087+echo "${ECHO_T}$ac_ct_NM" >&6
5088 else
5089- { echo "$as_me:$LINENO: result: no" >&5
5090-echo "${ECHO_T}no" >&6; }
5091+ echo "$as_me:$LINENO: result: no" >&5
5092+echo "${ECHO_T}no" >&6
5093 fi
5094
5095- if test "x$ac_ct_NM" = x; then
5096- NM=""
5097- else
5098- case $cross_compiling:$ac_tool_warned in
5099-yes:)
5100-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
5101-whose name does not start with the host triplet. If you think this
5102-configuration is useful to you, please write to autoconf@gnu.org." >&5
5103-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
5104-whose name does not start with the host triplet. If you think this
5105-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
5106-ac_tool_warned=yes ;;
5107-esac
5108- NM=$ac_ct_NM
5109- fi
5110+ NM=$ac_ct_NM
5111 else
5112 NM="$ac_cv_prog_NM"
5113 fi
5114@@ -4171,8 +3420,8 @@
5115 if test -n "$ac_tool_prefix"; then
5116 # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
5117 set dummy ${ac_tool_prefix}windres; ac_word=$2
5118-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5119-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5120+echo "$as_me:$LINENO: checking for $ac_word" >&5
5121+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5122 if test "${ac_cv_prog_WINDRES+set}" = set; then
5123 echo $ECHO_N "(cached) $ECHO_C" >&6
5124 else
5125@@ -4185,34 +3434,32 @@
5126 IFS=$as_save_IFS
5127 test -z "$as_dir" && as_dir=.
5128 for ac_exec_ext in '' $ac_executable_extensions; do
5129- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5130+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5131 ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
5132 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5133 break 2
5134 fi
5135 done
5136 done
5137-IFS=$as_save_IFS
5138
5139 fi
5140 fi
5141 WINDRES=$ac_cv_prog_WINDRES
5142 if test -n "$WINDRES"; then
5143- { echo "$as_me:$LINENO: result: $WINDRES" >&5
5144-echo "${ECHO_T}$WINDRES" >&6; }
5145+ echo "$as_me:$LINENO: result: $WINDRES" >&5
5146+echo "${ECHO_T}$WINDRES" >&6
5147 else
5148- { echo "$as_me:$LINENO: result: no" >&5
5149-echo "${ECHO_T}no" >&6; }
5150+ echo "$as_me:$LINENO: result: no" >&5
5151+echo "${ECHO_T}no" >&6
5152 fi
5153
5154-
5155 fi
5156 if test -z "$ac_cv_prog_WINDRES"; then
5157 ac_ct_WINDRES=$WINDRES
5158 # Extract the first word of "windres", so it can be a program name with args.
5159 set dummy windres; ac_word=$2
5160-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5161-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5162+echo "$as_me:$LINENO: checking for $ac_word" >&5
5163+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5164 if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
5165 echo $ECHO_N "(cached) $ECHO_C" >&6
5166 else
5167@@ -4225,41 +3472,26 @@
5168 IFS=$as_save_IFS
5169 test -z "$as_dir" && as_dir=.
5170 for ac_exec_ext in '' $ac_executable_extensions; do
5171- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5172+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5173 ac_cv_prog_ac_ct_WINDRES="windres"
5174 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5175 break 2
5176 fi
5177 done
5178 done
5179-IFS=$as_save_IFS
5180
5181 fi
5182 fi
5183 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
5184 if test -n "$ac_ct_WINDRES"; then
5185- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
5186-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
5187+ echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
5188+echo "${ECHO_T}$ac_ct_WINDRES" >&6
5189 else
5190- { echo "$as_me:$LINENO: result: no" >&5
5191-echo "${ECHO_T}no" >&6; }
5192+ echo "$as_me:$LINENO: result: no" >&5
5193+echo "${ECHO_T}no" >&6
5194 fi
5195
5196- if test "x$ac_ct_WINDRES" = x; then
5197- WINDRES=""
5198- else
5199- case $cross_compiling:$ac_tool_warned in
5200-yes:)
5201-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
5202-whose name does not start with the host triplet. If you think this
5203-configuration is useful to you, please write to autoconf@gnu.org." >&5
5204-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
5205-whose name does not start with the host triplet. If you think this
5206-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
5207-ac_tool_warned=yes ;;
5208-esac
5209- WINDRES=$ac_ct_WINDRES
5210- fi
5211+ WINDRES=$ac_ct_WINDRES
5212 else
5213 WINDRES="$ac_cv_prog_WINDRES"
5214 fi
5215@@ -4267,8 +3499,8 @@
5216 if test -n "$ac_tool_prefix"; then
5217 # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
5218 set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
5219-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5220-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5221+echo "$as_me:$LINENO: checking for $ac_word" >&5
5222+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5223 if test "${ac_cv_prog_DLLWRAP+set}" = set; then
5224 echo $ECHO_N "(cached) $ECHO_C" >&6
5225 else
5226@@ -4281,34 +3513,32 @@
5227 IFS=$as_save_IFS
5228 test -z "$as_dir" && as_dir=.
5229 for ac_exec_ext in '' $ac_executable_extensions; do
5230- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5231+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5232 ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
5233 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5234 break 2
5235 fi
5236 done
5237 done
5238-IFS=$as_save_IFS
5239
5240 fi
5241 fi
5242 DLLWRAP=$ac_cv_prog_DLLWRAP
5243 if test -n "$DLLWRAP"; then
5244- { echo "$as_me:$LINENO: result: $DLLWRAP" >&5
5245-echo "${ECHO_T}$DLLWRAP" >&6; }
5246+ echo "$as_me:$LINENO: result: $DLLWRAP" >&5
5247+echo "${ECHO_T}$DLLWRAP" >&6
5248 else
5249- { echo "$as_me:$LINENO: result: no" >&5
5250-echo "${ECHO_T}no" >&6; }
5251+ echo "$as_me:$LINENO: result: no" >&5
5252+echo "${ECHO_T}no" >&6
5253 fi
5254
5255-
5256 fi
5257 if test -z "$ac_cv_prog_DLLWRAP"; then
5258 ac_ct_DLLWRAP=$DLLWRAP
5259 # Extract the first word of "dllwrap", so it can be a program name with args.
5260 set dummy dllwrap; ac_word=$2
5261-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5262-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5263+echo "$as_me:$LINENO: checking for $ac_word" >&5
5264+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5265 if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
5266 echo $ECHO_N "(cached) $ECHO_C" >&6
5267 else
5268@@ -4321,41 +3551,26 @@
5269 IFS=$as_save_IFS
5270 test -z "$as_dir" && as_dir=.
5271 for ac_exec_ext in '' $ac_executable_extensions; do
5272- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5273+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5274 ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
5275 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5276 break 2
5277 fi
5278 done
5279 done
5280-IFS=$as_save_IFS
5281
5282 fi
5283 fi
5284 ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
5285 if test -n "$ac_ct_DLLWRAP"; then
5286- { echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
5287-echo "${ECHO_T}$ac_ct_DLLWRAP" >&6; }
5288+ echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
5289+echo "${ECHO_T}$ac_ct_DLLWRAP" >&6
5290 else
5291- { echo "$as_me:$LINENO: result: no" >&5
5292-echo "${ECHO_T}no" >&6; }
5293+ echo "$as_me:$LINENO: result: no" >&5
5294+echo "${ECHO_T}no" >&6
5295 fi
5296
5297- if test "x$ac_ct_DLLWRAP" = x; then
5298- DLLWRAP=""
5299- else
5300- case $cross_compiling:$ac_tool_warned in
5301-yes:)
5302-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
5303-whose name does not start with the host triplet. If you think this
5304-configuration is useful to you, please write to autoconf@gnu.org." >&5
5305-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
5306-whose name does not start with the host triplet. If you think this
5307-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
5308-ac_tool_warned=yes ;;
5309-esac
5310- DLLWRAP=$ac_ct_DLLWRAP
5311- fi
5312+ DLLWRAP=$ac_ct_DLLWRAP
5313 else
5314 DLLWRAP="$ac_cv_prog_DLLWRAP"
5315 fi
5316@@ -4367,8 +3582,8 @@
5317 if test -n "$ac_tool_prefix"; then
5318 # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
5319 set dummy ${ac_tool_prefix}objdump; ac_word=$2
5320-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5321-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5322+echo "$as_me:$LINENO: checking for $ac_word" >&5
5323+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5324 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
5325 echo $ECHO_N "(cached) $ECHO_C" >&6
5326 else
5327@@ -4381,34 +3596,32 @@
5328 IFS=$as_save_IFS
5329 test -z "$as_dir" && as_dir=.
5330 for ac_exec_ext in '' $ac_executable_extensions; do
5331- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5332+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5333 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
5334 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5335 break 2
5336 fi
5337 done
5338 done
5339-IFS=$as_save_IFS
5340
5341 fi
5342 fi
5343 OBJDUMP=$ac_cv_prog_OBJDUMP
5344 if test -n "$OBJDUMP"; then
5345- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
5346-echo "${ECHO_T}$OBJDUMP" >&6; }
5347+ echo "$as_me:$LINENO: result: $OBJDUMP" >&5
5348+echo "${ECHO_T}$OBJDUMP" >&6
5349 else
5350- { echo "$as_me:$LINENO: result: no" >&5
5351-echo "${ECHO_T}no" >&6; }
5352+ echo "$as_me:$LINENO: result: no" >&5
5353+echo "${ECHO_T}no" >&6
5354 fi
5355
5356-
5357 fi
5358 if test -z "$ac_cv_prog_OBJDUMP"; then
5359 ac_ct_OBJDUMP=$OBJDUMP
5360 # Extract the first word of "objdump", so it can be a program name with args.
5361 set dummy objdump; ac_word=$2
5362-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5363-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5364+echo "$as_me:$LINENO: checking for $ac_word" >&5
5365+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5366 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
5367 echo $ECHO_N "(cached) $ECHO_C" >&6
5368 else
5369@@ -4421,47 +3634,32 @@
5370 IFS=$as_save_IFS
5371 test -z "$as_dir" && as_dir=.
5372 for ac_exec_ext in '' $ac_executable_extensions; do
5373- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5374+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5375 ac_cv_prog_ac_ct_OBJDUMP="objdump"
5376 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5377 break 2
5378 fi
5379 done
5380 done
5381-IFS=$as_save_IFS
5382
5383 fi
5384 fi
5385 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
5386 if test -n "$ac_ct_OBJDUMP"; then
5387- { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
5388-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
5389+ echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
5390+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
5391 else
5392- { echo "$as_me:$LINENO: result: no" >&5
5393-echo "${ECHO_T}no" >&6; }
5394+ echo "$as_me:$LINENO: result: no" >&5
5395+echo "${ECHO_T}no" >&6
5396 fi
5397
5398- if test "x$ac_ct_OBJDUMP" = x; then
5399- OBJDUMP=""
5400- else
5401- case $cross_compiling:$ac_tool_warned in
5402-yes:)
5403-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
5404-whose name does not start with the host triplet. If you think this
5405-configuration is useful to you, please write to autoconf@gnu.org." >&5
5406-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
5407-whose name does not start with the host triplet. If you think this
5408-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
5409-ac_tool_warned=yes ;;
5410-esac
5411- OBJDUMP=$ac_ct_OBJDUMP
5412- fi
5413+ OBJDUMP=$ac_ct_OBJDUMP
5414 else
5415 OBJDUMP="$ac_cv_prog_OBJDUMP"
5416 fi
5417
5418- { echo "$as_me:$LINENO: checking for mingw32 runtime DLL" >&5
5419-echo $ECHO_N "checking for mingw32 runtime DLL... $ECHO_C" >&6; }
5420+ echo "$as_me:$LINENO: checking for mingw32 runtime DLL" >&5
5421+echo $ECHO_N "checking for mingw32 runtime DLL... $ECHO_C" >&6
5422 if test "${rb_cv_msvcrt+set}" = set; then
5423 echo $ECHO_N "(cached) $ECHO_C" >&6
5424 else
5425@@ -4482,23 +3680,26 @@
5426 }
5427 _ACEOF
5428 rm -f conftest.$ac_objext conftest$ac_exeext
5429-if { (ac_try="$ac_link"
5430-case "(($ac_try" in
5431- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5432- *) ac_try_echo=$ac_try;;
5433-esac
5434-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5435- (eval "$ac_link") 2>conftest.er1
5436+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5437+ (eval $ac_link) 2>conftest.er1
5438 ac_status=$?
5439 grep -v '^ *+' conftest.er1 >conftest.err
5440 rm -f conftest.er1
5441 cat conftest.err >&5
5442 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5443- (exit $ac_status); } && {
5444- test -z "$ac_c_werror_flag" ||
5445- test ! -s conftest.err
5446- } && test -s conftest$ac_exeext &&
5447- $as_test_x conftest$ac_exeext; then
5448+ (exit $ac_status); } &&
5449+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5450+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5451+ (eval $ac_try) 2>&5
5452+ ac_status=$?
5453+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5454+ (exit $ac_status); }; } &&
5455+ { ac_try='test -s conftest$ac_exeext'
5456+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5457+ (eval $ac_try) 2>&5
5458+ ac_status=$?
5459+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5460+ (exit $ac_status); }; }; then
5461 rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
5462 tr A-Z a-z |
5463 sed -n '/^[ ]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`
5464@@ -4506,27 +3707,26 @@
5465 echo "$as_me: failed program was:" >&5
5466 sed 's/^/| /' conftest.$ac_ext >&5
5467
5468- rb_cv_msvcrt=msvcrt
5469+rb_cv_msvcrt=msvcrt
5470 fi
5471-
5472-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5473+rm -f conftest.err conftest.$ac_objext \
5474 conftest$ac_exeext conftest.$ac_ext
5475 test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt
5476 fi
5477-{ echo "$as_me:$LINENO: result: $rb_cv_msvcrt" >&5
5478-echo "${ECHO_T}$rb_cv_msvcrt" >&6; }
5479+echo "$as_me:$LINENO: result: $rb_cv_msvcrt" >&5
5480+echo "${ECHO_T}$rb_cv_msvcrt" >&6
5481
5482-# Check whether --with-winsock2 was given.
5483+# Check whether --with-winsock2 or --without-winsock2 was given.
5484 if test "${with_winsock2+set}" = set; then
5485- withval=$with_winsock2;
5486+ withval="$with_winsock2"
5487+
5488 case $withval in
5489 yes) with_winsock2=yes;;
5490 *) with_winsock2=no;;
5491 esac
5492 else
5493 with_winsock2=no
5494-fi
5495-
5496+fi;
5497 if test "$with_winsock2" = yes; then
5498 cat >>confdefs.h <<\_ACEOF
5499 #define USE_WINSOCK2 1
5500@@ -4540,8 +3740,8 @@
5501 if test -n "$ac_tool_prefix"; then
5502 # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
5503 set dummy ${ac_tool_prefix}nm; ac_word=$2
5504-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5505-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5506+echo "$as_me:$LINENO: checking for $ac_word" >&5
5507+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5508 if test "${ac_cv_prog_NM+set}" = set; then
5509 echo $ECHO_N "(cached) $ECHO_C" >&6
5510 else
5511@@ -4555,34 +3755,32 @@
5512 IFS=$as_save_IFS
5513 test -z "$as_dir" && as_dir=.
5514 for ac_exec_ext in '' $ac_executable_extensions; do
5515- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5516+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5517 ac_cv_prog_NM="${ac_tool_prefix}nm"
5518 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5519 break 2
5520 fi
5521 done
5522 done
5523-IFS=$as_save_IFS
5524
5525 fi
5526 fi
5527 NM=$ac_cv_prog_NM
5528 if test -n "$NM"; then
5529- { echo "$as_me:$LINENO: result: $NM" >&5
5530-echo "${ECHO_T}$NM" >&6; }
5531+ echo "$as_me:$LINENO: result: $NM" >&5
5532+echo "${ECHO_T}$NM" >&6
5533 else
5534- { echo "$as_me:$LINENO: result: no" >&5
5535-echo "${ECHO_T}no" >&6; }
5536+ echo "$as_me:$LINENO: result: no" >&5
5537+echo "${ECHO_T}no" >&6
5538 fi
5539
5540-
5541 fi
5542 if test -z "$ac_cv_prog_NM"; then
5543 ac_ct_NM=$NM
5544 # Extract the first word of "nm", so it can be a program name with args.
5545 set dummy nm; ac_word=$2
5546-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5547-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5548+echo "$as_me:$LINENO: checking for $ac_word" >&5
5549+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5550 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
5551 echo $ECHO_N "(cached) $ECHO_C" >&6
5552 else
5553@@ -4596,41 +3794,27 @@
5554 IFS=$as_save_IFS
5555 test -z "$as_dir" && as_dir=.
5556 for ac_exec_ext in '' $ac_executable_extensions; do
5557- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5558+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5559 ac_cv_prog_ac_ct_NM="nm"
5560 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5561 break 2
5562 fi
5563 done
5564 done
5565-IFS=$as_save_IFS
5566
5567+ test -z "$ac_cv_prog_ac_ct_NM" && ac_cv_prog_ac_ct_NM="/usr/ccs/bin/nm"
5568 fi
5569 fi
5570 ac_ct_NM=$ac_cv_prog_ac_ct_NM
5571 if test -n "$ac_ct_NM"; then
5572- { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
5573-echo "${ECHO_T}$ac_ct_NM" >&6; }
5574+ echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
5575+echo "${ECHO_T}$ac_ct_NM" >&6
5576 else
5577- { echo "$as_me:$LINENO: result: no" >&5
5578-echo "${ECHO_T}no" >&6; }
5579+ echo "$as_me:$LINENO: result: no" >&5
5580+echo "${ECHO_T}no" >&6
5581 fi
5582
5583- if test "x$ac_ct_NM" = x; then
5584- NM="/usr/ccs/bin/nm"
5585- else
5586- case $cross_compiling:$ac_tool_warned in
5587-yes:)
5588-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
5589-whose name does not start with the host triplet. If you think this
5590-configuration is useful to you, please write to autoconf@gnu.org." >&5
5591-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
5592-whose name does not start with the host triplet. If you think this
5593-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
5594-ac_tool_warned=yes ;;
5595-esac
5596- NM=$ac_ct_NM
5597- fi
5598+ NM=$ac_ct_NM
5599 else
5600 NM="$ac_cv_prog_NM"
5601 fi
5602@@ -4645,44 +3829,43 @@
5603 ;;
5604 esac
5605
5606-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
5607-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
5608+echo "$as_me:$LINENO: checking whether ln -s works" >&5
5609+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
5610 LN_S=$as_ln_s
5611 if test "$LN_S" = "ln -s"; then
5612- { echo "$as_me:$LINENO: result: yes" >&5
5613-echo "${ECHO_T}yes" >&6; }
5614+ echo "$as_me:$LINENO: result: yes" >&5
5615+echo "${ECHO_T}yes" >&6
5616 else
5617- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
5618-echo "${ECHO_T}no, using $LN_S" >&6; }
5619+ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
5620+echo "${ECHO_T}no, using $LN_S" >&6
5621 fi
5622
5623-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5624-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
5625-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
5626-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
5627+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5628+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
5629+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
5630+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
5631 echo $ECHO_N "(cached) $ECHO_C" >&6
5632 else
5633 cat >conftest.make <<\_ACEOF
5634-SHELL = /bin/sh
5635 all:
5636- @echo '@@@%%%=$(MAKE)=@@@%%%'
5637+ @echo 'ac_maketemp="$(MAKE)"'
5638 _ACEOF
5639 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
5640-case `${MAKE-make} -f conftest.make 2>/dev/null` in
5641- *@@@%%%=?*=@@@%%%*)
5642- eval ac_cv_prog_make_${ac_make}_set=yes;;
5643- *)
5644- eval ac_cv_prog_make_${ac_make}_set=no;;
5645-esac
5646+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
5647+if test -n "$ac_maketemp"; then
5648+ eval ac_cv_prog_make_${ac_make}_set=yes
5649+else
5650+ eval ac_cv_prog_make_${ac_make}_set=no
5651+fi
5652 rm -f conftest.make
5653 fi
5654-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
5655- { echo "$as_me:$LINENO: result: yes" >&5
5656-echo "${ECHO_T}yes" >&6; }
5657+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
5658+ echo "$as_me:$LINENO: result: yes" >&5
5659+echo "${ECHO_T}yes" >&6
5660 SET_MAKE=
5661 else
5662- { echo "$as_me:$LINENO: result: no" >&5
5663-echo "${ECHO_T}no" >&6; }
5664+ echo "$as_me:$LINENO: result: no" >&5
5665+echo "${ECHO_T}no" >&6
5666 SET_MAKE="MAKE=${MAKE-make}"
5667 fi
5668
5669@@ -4699,8 +3882,8 @@
5670 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
5671 # OS/2's system install, which has a completely different semantic
5672 # ./install, which can be erroneously created by make from ./install.sh.
5673-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5674-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
5675+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5676+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
5677 if test -z "$INSTALL"; then
5678 if test "${ac_cv_path_install+set}" = set; then
5679 echo $ECHO_N "(cached) $ECHO_C" >&6
5680@@ -4722,7 +3905,7 @@
5681 # by default.
5682 for ac_prog in ginstall scoinst install; do
5683 for ac_exec_ext in '' $ac_executable_extensions; do
5684- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
5685+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5686 if test $ac_prog = install &&
5687 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5688 # AIX install. It has an incompatible calling convention.
5689@@ -4741,22 +3924,21 @@
5690 ;;
5691 esac
5692 done
5693-IFS=$as_save_IFS
5694
5695
5696 fi
5697 if test "${ac_cv_path_install+set}" = set; then
5698 INSTALL=$ac_cv_path_install
5699 else
5700- # As a last resort, use the slow shell script. Don't cache a
5701- # value for INSTALL within a source directory, because that will
5702+ # As a last resort, use the slow shell script. We don't cache a
5703+ # path for INSTALL within a source directory, because that will
5704 # break other packages using the cache if that directory is
5705- # removed, or if the value is a relative name.
5706+ # removed, or if the path is relative.
5707 INSTALL=$ac_install_sh
5708 fi
5709 fi
5710-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
5711-echo "${ECHO_T}$INSTALL" >&6; }
5712+echo "$as_me:$LINENO: result: $INSTALL" >&5
5713+echo "${ECHO_T}$INSTALL" >&6
5714
5715 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5716 # It thinks the first close brace ends the variable substitution.
5717@@ -4769,8 +3951,8 @@
5718
5719 # checks for UNIX variants that set C preprocessor variables
5720
5721-{ echo "$as_me:$LINENO: checking for AIX" >&5
5722-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
5723+echo "$as_me:$LINENO: checking for AIX" >&5
5724+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
5725 cat >conftest.$ac_ext <<_ACEOF
5726 /* confdefs.h. */
5727 _ACEOF
5728@@ -4784,21 +3966,21 @@
5729 _ACEOF
5730 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
5731 $EGREP "yes" >/dev/null 2>&1; then
5732- { echo "$as_me:$LINENO: result: yes" >&5
5733-echo "${ECHO_T}yes" >&6; }
5734+ echo "$as_me:$LINENO: result: yes" >&5
5735+echo "${ECHO_T}yes" >&6
5736 cat >>confdefs.h <<\_ACEOF
5737 #define _ALL_SOURCE 1
5738 _ACEOF
5739
5740 else
5741- { echo "$as_me:$LINENO: result: no" >&5
5742-echo "${ECHO_T}no" >&6; }
5743+ echo "$as_me:$LINENO: result: no" >&5
5744+echo "${ECHO_T}no" >&6
5745 fi
5746 rm -f conftest*
5747
5748
5749-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
5750-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
5751+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
5752+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
5753 if test "${ac_cv_header_stdc+set}" = set; then
5754 echo $ECHO_N "(cached) $ECHO_C" >&6
5755 else
5756@@ -4822,31 +4004,34 @@
5757 }
5758 _ACEOF
5759 rm -f conftest.$ac_objext
5760-if { (ac_try="$ac_compile"
5761-case "(($ac_try" in
5762- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5763- *) ac_try_echo=$ac_try;;
5764-esac
5765-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5766- (eval "$ac_compile") 2>conftest.er1
5767+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5768+ (eval $ac_compile) 2>conftest.er1
5769 ac_status=$?
5770 grep -v '^ *+' conftest.er1 >conftest.err
5771 rm -f conftest.er1
5772 cat conftest.err >&5
5773 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5774- (exit $ac_status); } && {
5775- test -z "$ac_c_werror_flag" ||
5776- test ! -s conftest.err
5777- } && test -s conftest.$ac_objext; then
5778+ (exit $ac_status); } &&
5779+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5780+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5781+ (eval $ac_try) 2>&5
5782+ ac_status=$?
5783+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5784+ (exit $ac_status); }; } &&
5785+ { ac_try='test -s conftest.$ac_objext'
5786+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5787+ (eval $ac_try) 2>&5
5788+ ac_status=$?
5789+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5790+ (exit $ac_status); }; }; then
5791 ac_cv_header_stdc=yes
5792 else
5793 echo "$as_me: failed program was:" >&5
5794 sed 's/^/| /' conftest.$ac_ext >&5
5795
5796- ac_cv_header_stdc=no
5797+ac_cv_header_stdc=no
5798 fi
5799-
5800-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5801+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5802
5803 if test $ac_cv_header_stdc = yes; then
5804 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
5805@@ -4902,7 +4087,6 @@
5806 cat >>conftest.$ac_ext <<_ACEOF
5807 /* end confdefs.h. */
5808 #include <ctype.h>
5809-#include <stdlib.h>
5810 #if ((' ' & 0x0FF) == 0x020)
5811 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
5812 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
5813@@ -4922,27 +4106,18 @@
5814 for (i = 0; i < 256; i++)
5815 if (XOR (islower (i), ISLOWER (i))
5816 || toupper (i) != TOUPPER (i))
5817- return 2;
5818- return 0;
5819+ exit(2);
5820+ exit (0);
5821 }
5822 _ACEOF
5823 rm -f conftest$ac_exeext
5824-if { (ac_try="$ac_link"
5825-case "(($ac_try" in
5826- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5827- *) ac_try_echo=$ac_try;;
5828-esac
5829-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5830- (eval "$ac_link") 2>&5
5831+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5832+ (eval $ac_link) 2>&5
5833 ac_status=$?
5834 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5835 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5836- { (case "(($ac_try" in
5837- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5838- *) ac_try_echo=$ac_try;;
5839-esac
5840-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5841- (eval "$ac_try") 2>&5
5842+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5843+ (eval $ac_try) 2>&5
5844 ac_status=$?
5845 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5846 (exit $ac_status); }; }; then
5847@@ -4955,14 +4130,12 @@
5848 ( exit $ac_status )
5849 ac_cv_header_stdc=no
5850 fi
5851-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5852+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5853 fi
5854-
5855-
5856 fi
5857 fi
5858-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
5859-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
5860+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
5861+echo "${ECHO_T}$ac_cv_header_stdc" >&6
5862 if test $ac_cv_header_stdc = yes; then
5863
5864 cat >>confdefs.h <<\_ACEOF
5865@@ -4985,9 +4158,9 @@
5866 inttypes.h stdint.h unistd.h
5867 do
5868 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5869-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
5870-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
5871-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
5872+echo "$as_me:$LINENO: checking for $ac_header" >&5
5873+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5874+if eval "test \"\${$as_ac_Header+set}\" = set"; then
5875 echo $ECHO_N "(cached) $ECHO_C" >&6
5876 else
5877 cat >conftest.$ac_ext <<_ACEOF
5878@@ -5001,35 +4174,37 @@
5879 #include <$ac_header>
5880 _ACEOF
5881 rm -f conftest.$ac_objext
5882-if { (ac_try="$ac_compile"
5883-case "(($ac_try" in
5884- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5885- *) ac_try_echo=$ac_try;;
5886-esac
5887-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5888- (eval "$ac_compile") 2>conftest.er1
5889+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5890+ (eval $ac_compile) 2>conftest.er1
5891 ac_status=$?
5892 grep -v '^ *+' conftest.er1 >conftest.err
5893 rm -f conftest.er1
5894 cat conftest.err >&5
5895 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5896- (exit $ac_status); } && {
5897- test -z "$ac_c_werror_flag" ||
5898- test ! -s conftest.err
5899- } && test -s conftest.$ac_objext; then
5900+ (exit $ac_status); } &&
5901+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5902+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5903+ (eval $ac_try) 2>&5
5904+ ac_status=$?
5905+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5906+ (exit $ac_status); }; } &&
5907+ { ac_try='test -s conftest.$ac_objext'
5908+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5909+ (eval $ac_try) 2>&5
5910+ ac_status=$?
5911+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5912+ (exit $ac_status); }; }; then
5913 eval "$as_ac_Header=yes"
5914 else
5915 echo "$as_me: failed program was:" >&5
5916 sed 's/^/| /' conftest.$ac_ext >&5
5917
5918- eval "$as_ac_Header=no"
5919+eval "$as_ac_Header=no"
5920 fi
5921-
5922-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5923+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5924 fi
5925-ac_res=`eval echo '${'$as_ac_Header'}'`
5926- { echo "$as_me:$LINENO: result: $ac_res" >&5
5927-echo "${ECHO_T}$ac_res" >&6; }
5928+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5929+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5930 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5931 cat >>confdefs.h <<_ACEOF
5932 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
5933@@ -5041,17 +4216,17 @@
5934
5935
5936 if test "${ac_cv_header_minix_config_h+set}" = set; then
5937- { echo "$as_me:$LINENO: checking for minix/config.h" >&5
5938-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
5939+ echo "$as_me:$LINENO: checking for minix/config.h" >&5
5940+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
5941 if test "${ac_cv_header_minix_config_h+set}" = set; then
5942 echo $ECHO_N "(cached) $ECHO_C" >&6
5943 fi
5944-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
5945-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
5946+echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
5947+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
5948 else
5949 # Is the header compilable?
5950-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
5951-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
5952+echo "$as_me:$LINENO: checking minix/config.h usability" >&5
5953+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
5954 cat >conftest.$ac_ext <<_ACEOF
5955 /* confdefs.h. */
5956 _ACEOF
5957@@ -5062,37 +4237,40 @@
5958 #include <minix/config.h>
5959 _ACEOF
5960 rm -f conftest.$ac_objext
5961-if { (ac_try="$ac_compile"
5962-case "(($ac_try" in
5963- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5964- *) ac_try_echo=$ac_try;;
5965-esac
5966-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5967- (eval "$ac_compile") 2>conftest.er1
5968+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5969+ (eval $ac_compile) 2>conftest.er1
5970 ac_status=$?
5971 grep -v '^ *+' conftest.er1 >conftest.err
5972 rm -f conftest.er1
5973 cat conftest.err >&5
5974 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5975- (exit $ac_status); } && {
5976- test -z "$ac_c_werror_flag" ||
5977- test ! -s conftest.err
5978- } && test -s conftest.$ac_objext; then
5979+ (exit $ac_status); } &&
5980+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5981+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5982+ (eval $ac_try) 2>&5
5983+ ac_status=$?
5984+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5985+ (exit $ac_status); }; } &&
5986+ { ac_try='test -s conftest.$ac_objext'
5987+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5988+ (eval $ac_try) 2>&5
5989+ ac_status=$?
5990+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
5991+ (exit $ac_status); }; }; then
5992 ac_header_compiler=yes
5993 else
5994 echo "$as_me: failed program was:" >&5
5995 sed 's/^/| /' conftest.$ac_ext >&5
5996
5997- ac_header_compiler=no
5998+ac_header_compiler=no
5999 fi
6000-
6001-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6002-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6003-echo "${ECHO_T}$ac_header_compiler" >&6; }
6004+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6005+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
6006+echo "${ECHO_T}$ac_header_compiler" >&6
6007
6008 # Is the header present?
6009-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
6010-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
6011+echo "$as_me:$LINENO: checking minix/config.h presence" >&5
6012+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
6013 cat >conftest.$ac_ext <<_ACEOF
6014 /* confdefs.h. */
6015 _ACEOF
6016@@ -5101,22 +4279,24 @@
6017 /* end confdefs.h. */
6018 #include <minix/config.h>
6019 _ACEOF
6020-if { (ac_try="$ac_cpp conftest.$ac_ext"
6021-case "(($ac_try" in
6022- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6023- *) ac_try_echo=$ac_try;;
6024-esac
6025-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6026- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
6027+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
6028+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6029 ac_status=$?
6030 grep -v '^ *+' conftest.er1 >conftest.err
6031 rm -f conftest.er1
6032 cat conftest.err >&5
6033 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6034- (exit $ac_status); } >/dev/null && {
6035- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
6036- test ! -s conftest.err
6037- }; then
6038+ (exit $ac_status); } >/dev/null; then
6039+ if test -s conftest.err; then
6040+ ac_cpp_err=$ac_c_preproc_warn_flag
6041+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
6042+ else
6043+ ac_cpp_err=
6044+ fi
6045+else
6046+ ac_cpp_err=yes
6047+fi
6048+if test -z "$ac_cpp_err"; then
6049 ac_header_preproc=yes
6050 else
6051 echo "$as_me: failed program was:" >&5
6052@@ -5124,10 +4304,9 @@
6053
6054 ac_header_preproc=no
6055 fi
6056-
6057 rm -f conftest.err conftest.$ac_ext
6058-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6059-echo "${ECHO_T}$ac_header_preproc" >&6; }
6060+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
6061+echo "${ECHO_T}$ac_header_preproc" >&6
6062
6063 # So? What about this header?
6064 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
6065@@ -5151,18 +4330,25 @@
6066 echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
6067 { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
6068 echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
6069-
6070+ (
6071+ cat <<\_ASBOX
6072+## ------------------------------------------ ##
6073+## Report this to the AC_PACKAGE_NAME lists. ##
6074+## ------------------------------------------ ##
6075+_ASBOX
6076+ ) |
6077+ sed "s/^/$as_me: WARNING: /" >&2
6078 ;;
6079 esac
6080-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
6081-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
6082+echo "$as_me:$LINENO: checking for minix/config.h" >&5
6083+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
6084 if test "${ac_cv_header_minix_config_h+set}" = set; then
6085 echo $ECHO_N "(cached) $ECHO_C" >&6
6086 else
6087 ac_cv_header_minix_config_h=$ac_header_preproc
6088 fi
6089-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
6090-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
6091+echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
6092+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
6093
6094 fi
6095 if test $ac_cv_header_minix_config_h = yes; then
6096@@ -5203,15 +4389,15 @@
6097
6098 fi
6099
6100-# Check whether --enable-largefile was given.
6101+# Check whether --enable-largefile or --disable-largefile was given.
6102 if test "${enable_largefile+set}" = set; then
6103- enableval=$enable_largefile;
6104-fi
6105+ enableval="$enable_largefile"
6106
6107+fi;
6108 if test "$enable_largefile" != no; then
6109
6110- { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
6111-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
6112+ echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
6113+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
6114 if test "${ac_cv_sys_largefile_CC+set}" = set; then
6115 echo $ECHO_N "(cached) $ECHO_C" >&6
6116 else
6117@@ -5219,8 +4405,8 @@
6118 if test "$GCC" != yes; then
6119 ac_save_CC=$CC
6120 while :; do
6121- # IRIX 6.2 and later do not support large files by default,
6122- # so use the C compiler's -n32 option if that helps.
6123+ # IRIX 6.2 and later do not support large files by default,
6124+ # so use the C compiler's -n32 option if that helps.
6125 cat >conftest.$ac_ext <<_ACEOF
6126 /* confdefs.h. */
6127 _ACEOF
6128@@ -5244,77 +4430,82 @@
6129 return 0;
6130 }
6131 _ACEOF
6132- rm -f conftest.$ac_objext
6133-if { (ac_try="$ac_compile"
6134-case "(($ac_try" in
6135- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6136- *) ac_try_echo=$ac_try;;
6137-esac
6138-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6139- (eval "$ac_compile") 2>conftest.er1
6140+ rm -f conftest.$ac_objext
6141+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6142+ (eval $ac_compile) 2>conftest.er1
6143 ac_status=$?
6144 grep -v '^ *+' conftest.er1 >conftest.err
6145 rm -f conftest.er1
6146 cat conftest.err >&5
6147 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6148- (exit $ac_status); } && {
6149- test -z "$ac_c_werror_flag" ||
6150- test ! -s conftest.err
6151- } && test -s conftest.$ac_objext; then
6152+ (exit $ac_status); } &&
6153+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6154+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6155+ (eval $ac_try) 2>&5
6156+ ac_status=$?
6157+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6158+ (exit $ac_status); }; } &&
6159+ { ac_try='test -s conftest.$ac_objext'
6160+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6161+ (eval $ac_try) 2>&5
6162+ ac_status=$?
6163+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6164+ (exit $ac_status); }; }; then
6165 break
6166 else
6167 echo "$as_me: failed program was:" >&5
6168 sed 's/^/| /' conftest.$ac_ext >&5
6169
6170-
6171 fi
6172-
6173-rm -f core conftest.err conftest.$ac_objext
6174- CC="$CC -n32"
6175- rm -f conftest.$ac_objext
6176-if { (ac_try="$ac_compile"
6177-case "(($ac_try" in
6178- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6179- *) ac_try_echo=$ac_try;;
6180-esac
6181-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6182- (eval "$ac_compile") 2>conftest.er1
6183+rm -f conftest.err conftest.$ac_objext
6184+ CC="$CC -n32"
6185+ rm -f conftest.$ac_objext
6186+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6187+ (eval $ac_compile) 2>conftest.er1
6188 ac_status=$?
6189 grep -v '^ *+' conftest.er1 >conftest.err
6190 rm -f conftest.er1
6191 cat conftest.err >&5
6192 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6193- (exit $ac_status); } && {
6194- test -z "$ac_c_werror_flag" ||
6195- test ! -s conftest.err
6196- } && test -s conftest.$ac_objext; then
6197+ (exit $ac_status); } &&
6198+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6199+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6200+ (eval $ac_try) 2>&5
6201+ ac_status=$?
6202+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6203+ (exit $ac_status); }; } &&
6204+ { ac_try='test -s conftest.$ac_objext'
6205+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6206+ (eval $ac_try) 2>&5
6207+ ac_status=$?
6208+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6209+ (exit $ac_status); }; }; then
6210 ac_cv_sys_largefile_CC=' -n32'; break
6211 else
6212 echo "$as_me: failed program was:" >&5
6213 sed 's/^/| /' conftest.$ac_ext >&5
6214
6215-
6216 fi
6217-
6218-rm -f core conftest.err conftest.$ac_objext
6219+rm -f conftest.err conftest.$ac_objext
6220 break
6221 done
6222 CC=$ac_save_CC
6223 rm -f conftest.$ac_ext
6224 fi
6225 fi
6226-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
6227-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
6228+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
6229+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
6230 if test "$ac_cv_sys_largefile_CC" != no; then
6231 CC=$CC$ac_cv_sys_largefile_CC
6232 fi
6233
6234- { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
6235-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
6236+ echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
6237+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
6238 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
6239 echo $ECHO_N "(cached) $ECHO_C" >&6
6240 else
6241 while :; do
6242+ ac_cv_sys_file_offset_bits=no
6243 cat >conftest.$ac_ext <<_ACEOF
6244 /* confdefs.h. */
6245 _ACEOF
6246@@ -5339,31 +4530,33 @@
6247 }
6248 _ACEOF
6249 rm -f conftest.$ac_objext
6250-if { (ac_try="$ac_compile"
6251-case "(($ac_try" in
6252- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6253- *) ac_try_echo=$ac_try;;
6254-esac
6255-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6256- (eval "$ac_compile") 2>conftest.er1
6257+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6258+ (eval $ac_compile) 2>conftest.er1
6259 ac_status=$?
6260 grep -v '^ *+' conftest.er1 >conftest.err
6261 rm -f conftest.er1
6262 cat conftest.err >&5
6263 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6264- (exit $ac_status); } && {
6265- test -z "$ac_c_werror_flag" ||
6266- test ! -s conftest.err
6267- } && test -s conftest.$ac_objext; then
6268- ac_cv_sys_file_offset_bits=no; break
6269+ (exit $ac_status); } &&
6270+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6271+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6272+ (eval $ac_try) 2>&5
6273+ ac_status=$?
6274+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6275+ (exit $ac_status); }; } &&
6276+ { ac_try='test -s conftest.$ac_objext'
6277+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6278+ (eval $ac_try) 2>&5
6279+ ac_status=$?
6280+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6281+ (exit $ac_status); }; }; then
6282+ break
6283 else
6284 echo "$as_me: failed program was:" >&5
6285 sed 's/^/| /' conftest.$ac_ext >&5
6286
6287-
6288 fi
6289-
6290-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6291+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6292 cat >conftest.$ac_ext <<_ACEOF
6293 /* confdefs.h. */
6294 _ACEOF
6295@@ -5389,53 +4582,53 @@
6296 }
6297 _ACEOF
6298 rm -f conftest.$ac_objext
6299-if { (ac_try="$ac_compile"
6300-case "(($ac_try" in
6301- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6302- *) ac_try_echo=$ac_try;;
6303-esac
6304-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6305- (eval "$ac_compile") 2>conftest.er1
6306+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6307+ (eval $ac_compile) 2>conftest.er1
6308 ac_status=$?
6309 grep -v '^ *+' conftest.er1 >conftest.err
6310 rm -f conftest.er1
6311 cat conftest.err >&5
6312 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6313- (exit $ac_status); } && {
6314- test -z "$ac_c_werror_flag" ||
6315- test ! -s conftest.err
6316- } && test -s conftest.$ac_objext; then
6317+ (exit $ac_status); } &&
6318+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6319+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6320+ (eval $ac_try) 2>&5
6321+ ac_status=$?
6322+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6323+ (exit $ac_status); }; } &&
6324+ { ac_try='test -s conftest.$ac_objext'
6325+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6326+ (eval $ac_try) 2>&5
6327+ ac_status=$?
6328+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6329+ (exit $ac_status); }; }; then
6330 ac_cv_sys_file_offset_bits=64; break
6331 else
6332 echo "$as_me: failed program was:" >&5
6333 sed 's/^/| /' conftest.$ac_ext >&5
6334
6335-
6336 fi
6337-
6338-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6339- ac_cv_sys_file_offset_bits=unknown
6340+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6341 break
6342 done
6343 fi
6344-{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
6345-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
6346-case $ac_cv_sys_file_offset_bits in #(
6347- no | unknown) ;;
6348- *)
6349+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
6350+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
6351+if test "$ac_cv_sys_file_offset_bits" != no; then
6352+
6353 cat >>confdefs.h <<_ACEOF
6354 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
6355 _ACEOF
6356-;;
6357-esac
6358+
6359+fi
6360 rm -f conftest*
6361- if test $ac_cv_sys_file_offset_bits = unknown; then
6362- { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
6363-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
6364+ echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
6365+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
6366 if test "${ac_cv_sys_large_files+set}" = set; then
6367 echo $ECHO_N "(cached) $ECHO_C" >&6
6368 else
6369 while :; do
6370+ ac_cv_sys_large_files=no
6371 cat >conftest.$ac_ext <<_ACEOF
6372 /* confdefs.h. */
6373 _ACEOF
6374@@ -5460,31 +4653,33 @@
6375 }
6376 _ACEOF
6377 rm -f conftest.$ac_objext
6378-if { (ac_try="$ac_compile"
6379-case "(($ac_try" in
6380- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6381- *) ac_try_echo=$ac_try;;
6382-esac
6383-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6384- (eval "$ac_compile") 2>conftest.er1
6385+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6386+ (eval $ac_compile) 2>conftest.er1
6387 ac_status=$?
6388 grep -v '^ *+' conftest.er1 >conftest.err
6389 rm -f conftest.er1
6390 cat conftest.err >&5
6391 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6392- (exit $ac_status); } && {
6393- test -z "$ac_c_werror_flag" ||
6394- test ! -s conftest.err
6395- } && test -s conftest.$ac_objext; then
6396- ac_cv_sys_large_files=no; break
6397+ (exit $ac_status); } &&
6398+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6399+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6400+ (eval $ac_try) 2>&5
6401+ ac_status=$?
6402+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6403+ (exit $ac_status); }; } &&
6404+ { ac_try='test -s conftest.$ac_objext'
6405+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6406+ (eval $ac_try) 2>&5
6407+ ac_status=$?
6408+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6409+ (exit $ac_status); }; }; then
6410+ break
6411 else
6412 echo "$as_me: failed program was:" >&5
6413 sed 's/^/| /' conftest.$ac_ext >&5
6414
6415-
6416 fi
6417-
6418-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6419+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6420 cat >conftest.$ac_ext <<_ACEOF
6421 /* confdefs.h. */
6422 _ACEOF
6423@@ -5510,52 +4705,51 @@
6424 }
6425 _ACEOF
6426 rm -f conftest.$ac_objext
6427-if { (ac_try="$ac_compile"
6428-case "(($ac_try" in
6429- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6430- *) ac_try_echo=$ac_try;;
6431-esac
6432-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6433- (eval "$ac_compile") 2>conftest.er1
6434+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6435+ (eval $ac_compile) 2>conftest.er1
6436 ac_status=$?
6437 grep -v '^ *+' conftest.er1 >conftest.err
6438 rm -f conftest.er1
6439 cat conftest.err >&5
6440 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6441- (exit $ac_status); } && {
6442- test -z "$ac_c_werror_flag" ||
6443- test ! -s conftest.err
6444- } && test -s conftest.$ac_objext; then
6445+ (exit $ac_status); } &&
6446+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6447+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6448+ (eval $ac_try) 2>&5
6449+ ac_status=$?
6450+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6451+ (exit $ac_status); }; } &&
6452+ { ac_try='test -s conftest.$ac_objext'
6453+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6454+ (eval $ac_try) 2>&5
6455+ ac_status=$?
6456+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6457+ (exit $ac_status); }; }; then
6458 ac_cv_sys_large_files=1; break
6459 else
6460 echo "$as_me: failed program was:" >&5
6461 sed 's/^/| /' conftest.$ac_ext >&5
6462
6463-
6464 fi
6465-
6466-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6467- ac_cv_sys_large_files=unknown
6468+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6469 break
6470 done
6471 fi
6472-{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
6473-echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
6474-case $ac_cv_sys_large_files in #(
6475- no | unknown) ;;
6476- *)
6477+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
6478+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
6479+if test "$ac_cv_sys_large_files" != no; then
6480+
6481 cat >>confdefs.h <<_ACEOF
6482 #define _LARGE_FILES $ac_cv_sys_large_files
6483 _ACEOF
6484-;;
6485-esac
6486+
6487+fi
6488 rm -f conftest*
6489- fi
6490 fi
6491
6492
6493-{ echo "$as_me:$LINENO: checking for long long" >&5
6494-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
6495+echo "$as_me:$LINENO: checking for long long" >&5
6496+echo $ECHO_N "checking for long long... $ECHO_C" >&6
6497 if test "${ac_cv_type_long_long+set}" = set; then
6498 echo $ECHO_N "(cached) $ECHO_C" >&6
6499 else
6500@@ -5566,47 +4760,49 @@
6501 cat >>conftest.$ac_ext <<_ACEOF
6502 /* end confdefs.h. */
6503 $ac_includes_default
6504-typedef long long ac__type_new_;
6505 int
6506 main ()
6507 {
6508-if ((ac__type_new_ *) 0)
6509+if ((long long *) 0)
6510 return 0;
6511-if (sizeof (ac__type_new_))
6512+if (sizeof (long long))
6513 return 0;
6514 ;
6515 return 0;
6516 }
6517 _ACEOF
6518 rm -f conftest.$ac_objext
6519-if { (ac_try="$ac_compile"
6520-case "(($ac_try" in
6521- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6522- *) ac_try_echo=$ac_try;;
6523-esac
6524-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6525- (eval "$ac_compile") 2>conftest.er1
6526+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6527+ (eval $ac_compile) 2>conftest.er1
6528 ac_status=$?
6529 grep -v '^ *+' conftest.er1 >conftest.err
6530 rm -f conftest.er1
6531 cat conftest.err >&5
6532 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6533- (exit $ac_status); } && {
6534- test -z "$ac_c_werror_flag" ||
6535- test ! -s conftest.err
6536- } && test -s conftest.$ac_objext; then
6537+ (exit $ac_status); } &&
6538+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6539+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6540+ (eval $ac_try) 2>&5
6541+ ac_status=$?
6542+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6543+ (exit $ac_status); }; } &&
6544+ { ac_try='test -s conftest.$ac_objext'
6545+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6546+ (eval $ac_try) 2>&5
6547+ ac_status=$?
6548+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6549+ (exit $ac_status); }; }; then
6550 ac_cv_type_long_long=yes
6551 else
6552 echo "$as_me: failed program was:" >&5
6553 sed 's/^/| /' conftest.$ac_ext >&5
6554
6555- ac_cv_type_long_long=no
6556+ac_cv_type_long_long=no
6557 fi
6558-
6559-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6560+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6561 fi
6562-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
6563-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
6564+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
6565+echo "${ECHO_T}$ac_cv_type_long_long" >&6
6566 if test $ac_cv_type_long_long = yes; then
6567
6568 cat >>confdefs.h <<_ACEOF
6569@@ -5615,8 +4811,8 @@
6570
6571
6572 fi
6573-{ echo "$as_me:$LINENO: checking for off_t" >&5
6574-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
6575+echo "$as_me:$LINENO: checking for off_t" >&5
6576+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
6577 if test "${ac_cv_type_off_t+set}" = set; then
6578 echo $ECHO_N "(cached) $ECHO_C" >&6
6579 else
6580@@ -5627,47 +4823,49 @@
6581 cat >>conftest.$ac_ext <<_ACEOF
6582 /* end confdefs.h. */
6583 $ac_includes_default
6584-typedef off_t ac__type_new_;
6585 int
6586 main ()
6587 {
6588-if ((ac__type_new_ *) 0)
6589+if ((off_t *) 0)
6590 return 0;
6591-if (sizeof (ac__type_new_))
6592+if (sizeof (off_t))
6593 return 0;
6594 ;
6595 return 0;
6596 }
6597 _ACEOF
6598 rm -f conftest.$ac_objext
6599-if { (ac_try="$ac_compile"
6600-case "(($ac_try" in
6601- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6602- *) ac_try_echo=$ac_try;;
6603-esac
6604-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6605- (eval "$ac_compile") 2>conftest.er1
6606+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6607+ (eval $ac_compile) 2>conftest.er1
6608 ac_status=$?
6609 grep -v '^ *+' conftest.er1 >conftest.err
6610 rm -f conftest.er1
6611 cat conftest.err >&5
6612 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6613- (exit $ac_status); } && {
6614- test -z "$ac_c_werror_flag" ||
6615- test ! -s conftest.err
6616- } && test -s conftest.$ac_objext; then
6617+ (exit $ac_status); } &&
6618+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6619+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6620+ (eval $ac_try) 2>&5
6621+ ac_status=$?
6622+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6623+ (exit $ac_status); }; } &&
6624+ { ac_try='test -s conftest.$ac_objext'
6625+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6626+ (eval $ac_try) 2>&5
6627+ ac_status=$?
6628+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6629+ (exit $ac_status); }; }; then
6630 ac_cv_type_off_t=yes
6631 else
6632 echo "$as_me: failed program was:" >&5
6633 sed 's/^/| /' conftest.$ac_ext >&5
6634
6635- ac_cv_type_off_t=no
6636+ac_cv_type_off_t=no
6637 fi
6638-
6639-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6640+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6641 fi
6642-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
6643-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
6644+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
6645+echo "${ECHO_T}$ac_cv_type_off_t" >&6
6646 if test $ac_cv_type_off_t = yes; then
6647
6648 cat >>confdefs.h <<_ACEOF
6649@@ -5678,8 +4876,8 @@
6650 fi
6651
6652
6653-{ echo "$as_me:$LINENO: checking for int" >&5
6654-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
6655+echo "$as_me:$LINENO: checking for int" >&5
6656+echo $ECHO_N "checking for int... $ECHO_C" >&6
6657 if test "${ac_cv_type_int+set}" = set; then
6658 echo $ECHO_N "(cached) $ECHO_C" >&6
6659 else
6660@@ -5690,57 +4888,60 @@
6661 cat >>conftest.$ac_ext <<_ACEOF
6662 /* end confdefs.h. */
6663 $ac_includes_default
6664-typedef int ac__type_new_;
6665 int
6666 main ()
6667 {
6668-if ((ac__type_new_ *) 0)
6669+if ((int *) 0)
6670 return 0;
6671-if (sizeof (ac__type_new_))
6672+if (sizeof (int))
6673 return 0;
6674 ;
6675 return 0;
6676 }
6677 _ACEOF
6678 rm -f conftest.$ac_objext
6679-if { (ac_try="$ac_compile"
6680-case "(($ac_try" in
6681- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6682- *) ac_try_echo=$ac_try;;
6683-esac
6684-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6685- (eval "$ac_compile") 2>conftest.er1
6686+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6687+ (eval $ac_compile) 2>conftest.er1
6688 ac_status=$?
6689 grep -v '^ *+' conftest.er1 >conftest.err
6690 rm -f conftest.er1
6691 cat conftest.err >&5
6692 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6693- (exit $ac_status); } && {
6694- test -z "$ac_c_werror_flag" ||
6695- test ! -s conftest.err
6696- } && test -s conftest.$ac_objext; then
6697+ (exit $ac_status); } &&
6698+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6699+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6700+ (eval $ac_try) 2>&5
6701+ ac_status=$?
6702+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6703+ (exit $ac_status); }; } &&
6704+ { ac_try='test -s conftest.$ac_objext'
6705+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6706+ (eval $ac_try) 2>&5
6707+ ac_status=$?
6708+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6709+ (exit $ac_status); }; }; then
6710 ac_cv_type_int=yes
6711 else
6712 echo "$as_me: failed program was:" >&5
6713 sed 's/^/| /' conftest.$ac_ext >&5
6714
6715- ac_cv_type_int=no
6716+ac_cv_type_int=no
6717 fi
6718-
6719-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6720+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6721 fi
6722-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
6723-echo "${ECHO_T}$ac_cv_type_int" >&6; }
6724+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
6725+echo "${ECHO_T}$ac_cv_type_int" >&6
6726
6727-# The cast to long int works around a bug in the HP C Compiler
6728-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
6729-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
6730-# This bug is HP SR number 8606223364.
6731-{ echo "$as_me:$LINENO: checking size of int" >&5
6732-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
6733+echo "$as_me:$LINENO: checking size of int" >&5
6734+echo $ECHO_N "checking size of int... $ECHO_C" >&6
6735 if test "${ac_cv_sizeof_int+set}" = set; then
6736 echo $ECHO_N "(cached) $ECHO_C" >&6
6737 else
6738+ if test "$ac_cv_type_int" = yes; then
6739+ # The cast to unsigned long works around a bug in the HP C Compiler
6740+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
6741+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
6742+ # This bug is HP SR number 8606223364.
6743 if test "$cross_compiling" = yes; then
6744 # Depending upon the size, compute the lo and hi bounds.
6745 cat >conftest.$ac_ext <<_ACEOF
6746@@ -5750,11 +4951,10 @@
6747 cat >>conftest.$ac_ext <<_ACEOF
6748 /* end confdefs.h. */
6749 $ac_includes_default
6750- typedef int ac__type_sizeof_;
6751 int
6752 main ()
6753 {
6754-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
6755+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
6756 test_array [0] = 0
6757
6758 ;
6759@@ -5762,22 +4962,26 @@
6760 }
6761 _ACEOF
6762 rm -f conftest.$ac_objext
6763-if { (ac_try="$ac_compile"
6764-case "(($ac_try" in
6765- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6766- *) ac_try_echo=$ac_try;;
6767-esac
6768-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6769- (eval "$ac_compile") 2>conftest.er1
6770+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6771+ (eval $ac_compile) 2>conftest.er1
6772 ac_status=$?
6773 grep -v '^ *+' conftest.er1 >conftest.err
6774 rm -f conftest.er1
6775 cat conftest.err >&5
6776 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6777- (exit $ac_status); } && {
6778- test -z "$ac_c_werror_flag" ||
6779- test ! -s conftest.err
6780- } && test -s conftest.$ac_objext; then
6781+ (exit $ac_status); } &&
6782+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6783+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6784+ (eval $ac_try) 2>&5
6785+ ac_status=$?
6786+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6787+ (exit $ac_status); }; } &&
6788+ { ac_try='test -s conftest.$ac_objext'
6789+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6790+ (eval $ac_try) 2>&5
6791+ ac_status=$?
6792+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6793+ (exit $ac_status); }; }; then
6794 ac_lo=0 ac_mid=0
6795 while :; do
6796 cat >conftest.$ac_ext <<_ACEOF
6797@@ -5787,11 +4991,10 @@
6798 cat >>conftest.$ac_ext <<_ACEOF
6799 /* end confdefs.h. */
6800 $ac_includes_default
6801- typedef int ac__type_sizeof_;
6802 int
6803 main ()
6804 {
6805-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
6806+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
6807 test_array [0] = 0
6808
6809 ;
6810@@ -5799,53 +5002,55 @@
6811 }
6812 _ACEOF
6813 rm -f conftest.$ac_objext
6814-if { (ac_try="$ac_compile"
6815-case "(($ac_try" in
6816- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6817- *) ac_try_echo=$ac_try;;
6818-esac
6819-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6820- (eval "$ac_compile") 2>conftest.er1
6821+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6822+ (eval $ac_compile) 2>conftest.er1
6823 ac_status=$?
6824 grep -v '^ *+' conftest.er1 >conftest.err
6825 rm -f conftest.er1
6826 cat conftest.err >&5
6827 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6828- (exit $ac_status); } && {
6829- test -z "$ac_c_werror_flag" ||
6830- test ! -s conftest.err
6831- } && test -s conftest.$ac_objext; then
6832+ (exit $ac_status); } &&
6833+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6834+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6835+ (eval $ac_try) 2>&5
6836+ ac_status=$?
6837+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6838+ (exit $ac_status); }; } &&
6839+ { ac_try='test -s conftest.$ac_objext'
6840+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6841+ (eval $ac_try) 2>&5
6842+ ac_status=$?
6843+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6844+ (exit $ac_status); }; }; then
6845 ac_hi=$ac_mid; break
6846 else
6847 echo "$as_me: failed program was:" >&5
6848 sed 's/^/| /' conftest.$ac_ext >&5
6849
6850- ac_lo=`expr $ac_mid + 1`
6851- if test $ac_lo -le $ac_mid; then
6852- ac_lo= ac_hi=
6853- break
6854- fi
6855- ac_mid=`expr 2 '*' $ac_mid + 1`
6856+ac_lo=`expr $ac_mid + 1`
6857+ if test $ac_lo -le $ac_mid; then
6858+ ac_lo= ac_hi=
6859+ break
6860+ fi
6861+ ac_mid=`expr 2 '*' $ac_mid + 1`
6862 fi
6863-
6864-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6865+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6866 done
6867 else
6868 echo "$as_me: failed program was:" >&5
6869 sed 's/^/| /' conftest.$ac_ext >&5
6870
6871- cat >conftest.$ac_ext <<_ACEOF
6872+cat >conftest.$ac_ext <<_ACEOF
6873 /* confdefs.h. */
6874 _ACEOF
6875 cat confdefs.h >>conftest.$ac_ext
6876 cat >>conftest.$ac_ext <<_ACEOF
6877 /* end confdefs.h. */
6878 $ac_includes_default
6879- typedef int ac__type_sizeof_;
6880 int
6881 main ()
6882 {
6883-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
6884+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
6885 test_array [0] = 0
6886
6887 ;
6888@@ -5853,22 +5058,26 @@
6889 }
6890 _ACEOF
6891 rm -f conftest.$ac_objext
6892-if { (ac_try="$ac_compile"
6893-case "(($ac_try" in
6894- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6895- *) ac_try_echo=$ac_try;;
6896-esac
6897-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6898- (eval "$ac_compile") 2>conftest.er1
6899+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6900+ (eval $ac_compile) 2>conftest.er1
6901 ac_status=$?
6902 grep -v '^ *+' conftest.er1 >conftest.err
6903 rm -f conftest.er1
6904 cat conftest.err >&5
6905 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6906- (exit $ac_status); } && {
6907- test -z "$ac_c_werror_flag" ||
6908- test ! -s conftest.err
6909- } && test -s conftest.$ac_objext; then
6910+ (exit $ac_status); } &&
6911+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6912+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6913+ (eval $ac_try) 2>&5
6914+ ac_status=$?
6915+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6916+ (exit $ac_status); }; } &&
6917+ { ac_try='test -s conftest.$ac_objext'
6918+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6919+ (eval $ac_try) 2>&5
6920+ ac_status=$?
6921+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6922+ (exit $ac_status); }; }; then
6923 ac_hi=-1 ac_mid=-1
6924 while :; do
6925 cat >conftest.$ac_ext <<_ACEOF
6926@@ -5878,11 +5087,10 @@
6927 cat >>conftest.$ac_ext <<_ACEOF
6928 /* end confdefs.h. */
6929 $ac_includes_default
6930- typedef int ac__type_sizeof_;
6931 int
6932 main ()
6933 {
6934-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
6935+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
6936 test_array [0] = 0
6937
6938 ;
6939@@ -5890,48 +5098,49 @@
6940 }
6941 _ACEOF
6942 rm -f conftest.$ac_objext
6943-if { (ac_try="$ac_compile"
6944-case "(($ac_try" in
6945- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6946- *) ac_try_echo=$ac_try;;
6947-esac
6948-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6949- (eval "$ac_compile") 2>conftest.er1
6950+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6951+ (eval $ac_compile) 2>conftest.er1
6952 ac_status=$?
6953 grep -v '^ *+' conftest.er1 >conftest.err
6954 rm -f conftest.er1
6955 cat conftest.err >&5
6956 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6957- (exit $ac_status); } && {
6958- test -z "$ac_c_werror_flag" ||
6959- test ! -s conftest.err
6960- } && test -s conftest.$ac_objext; then
6961+ (exit $ac_status); } &&
6962+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6963+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6964+ (eval $ac_try) 2>&5
6965+ ac_status=$?
6966+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6967+ (exit $ac_status); }; } &&
6968+ { ac_try='test -s conftest.$ac_objext'
6969+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6970+ (eval $ac_try) 2>&5
6971+ ac_status=$?
6972+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
6973+ (exit $ac_status); }; }; then
6974 ac_lo=$ac_mid; break
6975 else
6976 echo "$as_me: failed program was:" >&5
6977 sed 's/^/| /' conftest.$ac_ext >&5
6978
6979- ac_hi=`expr '(' $ac_mid ')' - 1`
6980- if test $ac_mid -le $ac_hi; then
6981- ac_lo= ac_hi=
6982- break
6983- fi
6984- ac_mid=`expr 2 '*' $ac_mid`
6985+ac_hi=`expr '(' $ac_mid ')' - 1`
6986+ if test $ac_mid -le $ac_hi; then
6987+ ac_lo= ac_hi=
6988+ break
6989+ fi
6990+ ac_mid=`expr 2 '*' $ac_mid`
6991 fi
6992-
6993-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6994+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
6995 done
6996 else
6997 echo "$as_me: failed program was:" >&5
6998 sed 's/^/| /' conftest.$ac_ext >&5
6999
7000- ac_lo= ac_hi=
7001+ac_lo= ac_hi=
7002 fi
7003-
7004-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7005+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7006 fi
7007-
7008-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7009+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7010 # Binary search between lo and hi bounds.
7011 while test "x$ac_lo" != "x$ac_hi"; do
7012 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
7013@@ -5942,11 +5151,10 @@
7014 cat >>conftest.$ac_ext <<_ACEOF
7015 /* end confdefs.h. */
7016 $ac_includes_default
7017- typedef int ac__type_sizeof_;
7018 int
7019 main ()
7020 {
7021-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
7022+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
7023 test_array [0] = 0
7024
7025 ;
7026@@ -5954,45 +5162,49 @@
7027 }
7028 _ACEOF
7029 rm -f conftest.$ac_objext
7030-if { (ac_try="$ac_compile"
7031-case "(($ac_try" in
7032- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7033- *) ac_try_echo=$ac_try;;
7034-esac
7035-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7036- (eval "$ac_compile") 2>conftest.er1
7037+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7038+ (eval $ac_compile) 2>conftest.er1
7039 ac_status=$?
7040 grep -v '^ *+' conftest.er1 >conftest.err
7041 rm -f conftest.er1
7042 cat conftest.err >&5
7043 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7044- (exit $ac_status); } && {
7045- test -z "$ac_c_werror_flag" ||
7046- test ! -s conftest.err
7047- } && test -s conftest.$ac_objext; then
7048+ (exit $ac_status); } &&
7049+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7050+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7051+ (eval $ac_try) 2>&5
7052+ ac_status=$?
7053+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7054+ (exit $ac_status); }; } &&
7055+ { ac_try='test -s conftest.$ac_objext'
7056+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7057+ (eval $ac_try) 2>&5
7058+ ac_status=$?
7059+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7060+ (exit $ac_status); }; }; then
7061 ac_hi=$ac_mid
7062 else
7063 echo "$as_me: failed program was:" >&5
7064 sed 's/^/| /' conftest.$ac_ext >&5
7065
7066- ac_lo=`expr '(' $ac_mid ')' + 1`
7067+ac_lo=`expr '(' $ac_mid ')' + 1`
7068 fi
7069-
7070-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7071+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7072 done
7073 case $ac_lo in
7074 ?*) ac_cv_sizeof_int=$ac_lo;;
7075-'') if test "$ac_cv_type_int" = yes; then
7076- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
7077+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
7078 See \`config.log' for more details." >&5
7079-echo "$as_me: error: cannot compute sizeof (int)
7080+echo "$as_me: error: cannot compute sizeof (int), 77
7081 See \`config.log' for more details." >&2;}
7082- { (exit 77); exit 77; }; }
7083- else
7084- ac_cv_sizeof_int=0
7085- fi ;;
7086+ { (exit 1); exit 1; }; } ;;
7087 esac
7088 else
7089+ if test "$cross_compiling" = yes; then
7090+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
7091+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
7092+ { (exit 1); exit 1; }; }
7093+else
7094 cat >conftest.$ac_ext <<_ACEOF
7095 /* confdefs.h. */
7096 _ACEOF
7097@@ -6000,9 +5212,8 @@
7098 cat >>conftest.$ac_ext <<_ACEOF
7099 /* end confdefs.h. */
7100 $ac_includes_default
7101- typedef int ac__type_sizeof_;
7102-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
7103-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
7104+long longval () { return (long) (sizeof (int)); }
7105+unsigned long ulongval () { return (long) (sizeof (int)); }
7106 #include <stdio.h>
7107 #include <stdlib.h>
7108 int
7109@@ -6011,44 +5222,35 @@
7110
7111 FILE *f = fopen ("conftest.val", "w");
7112 if (! f)
7113- return 1;
7114- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
7115+ exit (1);
7116+ if (((long) (sizeof (int))) < 0)
7117 {
7118- long int i = longval ();
7119- if (i != ((long int) (sizeof (ac__type_sizeof_))))
7120- return 1;
7121+ long i = longval ();
7122+ if (i != ((long) (sizeof (int))))
7123+ exit (1);
7124 fprintf (f, "%ld\n", i);
7125 }
7126 else
7127 {
7128- unsigned long int i = ulongval ();
7129- if (i != ((long int) (sizeof (ac__type_sizeof_))))
7130- return 1;
7131+ unsigned long i = ulongval ();
7132+ if (i != ((long) (sizeof (int))))
7133+ exit (1);
7134 fprintf (f, "%lu\n", i);
7135 }
7136- return ferror (f) || fclose (f) != 0;
7137+ exit (ferror (f) || fclose (f) != 0);
7138
7139 ;
7140 return 0;
7141 }
7142 _ACEOF
7143 rm -f conftest$ac_exeext
7144-if { (ac_try="$ac_link"
7145-case "(($ac_try" in
7146- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7147- *) ac_try_echo=$ac_try;;
7148-esac
7149-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7150- (eval "$ac_link") 2>&5
7151+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7152+ (eval $ac_link) 2>&5
7153 ac_status=$?
7154 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7155 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7156- { (case "(($ac_try" in
7157- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7158- *) ac_try_echo=$ac_try;;
7159-esac
7160-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7161- (eval "$ac_try") 2>&5
7162+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7163+ (eval $ac_try) 2>&5
7164 ac_status=$?
7165 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7166 (exit $ac_status); }; }; then
7167@@ -6059,32 +5261,29 @@
7168 sed 's/^/| /' conftest.$ac_ext >&5
7169
7170 ( exit $ac_status )
7171-if test "$ac_cv_type_int" = yes; then
7172- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
7173+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
7174 See \`config.log' for more details." >&5
7175-echo "$as_me: error: cannot compute sizeof (int)
7176+echo "$as_me: error: cannot compute sizeof (int), 77
7177 See \`config.log' for more details." >&2;}
7178- { (exit 77); exit 77; }; }
7179- else
7180- ac_cv_sizeof_int=0
7181- fi
7182+ { (exit 1); exit 1; }; }
7183+fi
7184+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
7185 fi
7186-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
7187 fi
7188 rm -f conftest.val
7189+else
7190+ ac_cv_sizeof_int=0
7191 fi
7192-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
7193-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
7194-
7195-
7196-
7197+fi
7198+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
7199+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
7200 cat >>confdefs.h <<_ACEOF
7201 #define SIZEOF_INT $ac_cv_sizeof_int
7202 _ACEOF
7203
7204
7205-{ echo "$as_me:$LINENO: checking for short" >&5
7206-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
7207+echo "$as_me:$LINENO: checking for short" >&5
7208+echo $ECHO_N "checking for short... $ECHO_C" >&6
7209 if test "${ac_cv_type_short+set}" = set; then
7210 echo $ECHO_N "(cached) $ECHO_C" >&6
7211 else
7212@@ -6095,57 +5294,60 @@
7213 cat >>conftest.$ac_ext <<_ACEOF
7214 /* end confdefs.h. */
7215 $ac_includes_default
7216-typedef short ac__type_new_;
7217 int
7218 main ()
7219 {
7220-if ((ac__type_new_ *) 0)
7221+if ((short *) 0)
7222 return 0;
7223-if (sizeof (ac__type_new_))
7224+if (sizeof (short))
7225 return 0;
7226 ;
7227 return 0;
7228 }
7229 _ACEOF
7230 rm -f conftest.$ac_objext
7231-if { (ac_try="$ac_compile"
7232-case "(($ac_try" in
7233- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7234- *) ac_try_echo=$ac_try;;
7235-esac
7236-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7237- (eval "$ac_compile") 2>conftest.er1
7238+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7239+ (eval $ac_compile) 2>conftest.er1
7240 ac_status=$?
7241 grep -v '^ *+' conftest.er1 >conftest.err
7242 rm -f conftest.er1
7243 cat conftest.err >&5
7244 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7245- (exit $ac_status); } && {
7246- test -z "$ac_c_werror_flag" ||
7247- test ! -s conftest.err
7248- } && test -s conftest.$ac_objext; then
7249+ (exit $ac_status); } &&
7250+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7251+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7252+ (eval $ac_try) 2>&5
7253+ ac_status=$?
7254+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7255+ (exit $ac_status); }; } &&
7256+ { ac_try='test -s conftest.$ac_objext'
7257+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7258+ (eval $ac_try) 2>&5
7259+ ac_status=$?
7260+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7261+ (exit $ac_status); }; }; then
7262 ac_cv_type_short=yes
7263 else
7264 echo "$as_me: failed program was:" >&5
7265 sed 's/^/| /' conftest.$ac_ext >&5
7266
7267- ac_cv_type_short=no
7268+ac_cv_type_short=no
7269 fi
7270-
7271-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7272+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7273 fi
7274-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
7275-echo "${ECHO_T}$ac_cv_type_short" >&6; }
7276+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
7277+echo "${ECHO_T}$ac_cv_type_short" >&6
7278
7279-# The cast to long int works around a bug in the HP C Compiler
7280-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
7281-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
7282-# This bug is HP SR number 8606223364.
7283-{ echo "$as_me:$LINENO: checking size of short" >&5
7284-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
7285+echo "$as_me:$LINENO: checking size of short" >&5
7286+echo $ECHO_N "checking size of short... $ECHO_C" >&6
7287 if test "${ac_cv_sizeof_short+set}" = set; then
7288 echo $ECHO_N "(cached) $ECHO_C" >&6
7289 else
7290+ if test "$ac_cv_type_short" = yes; then
7291+ # The cast to unsigned long works around a bug in the HP C Compiler
7292+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
7293+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
7294+ # This bug is HP SR number 8606223364.
7295 if test "$cross_compiling" = yes; then
7296 # Depending upon the size, compute the lo and hi bounds.
7297 cat >conftest.$ac_ext <<_ACEOF
7298@@ -6155,11 +5357,10 @@
7299 cat >>conftest.$ac_ext <<_ACEOF
7300 /* end confdefs.h. */
7301 $ac_includes_default
7302- typedef short ac__type_sizeof_;
7303 int
7304 main ()
7305 {
7306-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
7307+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
7308 test_array [0] = 0
7309
7310 ;
7311@@ -6167,22 +5368,26 @@
7312 }
7313 _ACEOF
7314 rm -f conftest.$ac_objext
7315-if { (ac_try="$ac_compile"
7316-case "(($ac_try" in
7317- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7318- *) ac_try_echo=$ac_try;;
7319-esac
7320-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7321- (eval "$ac_compile") 2>conftest.er1
7322+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7323+ (eval $ac_compile) 2>conftest.er1
7324 ac_status=$?
7325 grep -v '^ *+' conftest.er1 >conftest.err
7326 rm -f conftest.er1
7327 cat conftest.err >&5
7328 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7329- (exit $ac_status); } && {
7330- test -z "$ac_c_werror_flag" ||
7331- test ! -s conftest.err
7332- } && test -s conftest.$ac_objext; then
7333+ (exit $ac_status); } &&
7334+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7335+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7336+ (eval $ac_try) 2>&5
7337+ ac_status=$?
7338+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7339+ (exit $ac_status); }; } &&
7340+ { ac_try='test -s conftest.$ac_objext'
7341+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7342+ (eval $ac_try) 2>&5
7343+ ac_status=$?
7344+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7345+ (exit $ac_status); }; }; then
7346 ac_lo=0 ac_mid=0
7347 while :; do
7348 cat >conftest.$ac_ext <<_ACEOF
7349@@ -6192,11 +5397,10 @@
7350 cat >>conftest.$ac_ext <<_ACEOF
7351 /* end confdefs.h. */
7352 $ac_includes_default
7353- typedef short ac__type_sizeof_;
7354 int
7355 main ()
7356 {
7357-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
7358+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
7359 test_array [0] = 0
7360
7361 ;
7362@@ -6204,53 +5408,55 @@
7363 }
7364 _ACEOF
7365 rm -f conftest.$ac_objext
7366-if { (ac_try="$ac_compile"
7367-case "(($ac_try" in
7368- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7369- *) ac_try_echo=$ac_try;;
7370-esac
7371-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7372- (eval "$ac_compile") 2>conftest.er1
7373+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7374+ (eval $ac_compile) 2>conftest.er1
7375 ac_status=$?
7376 grep -v '^ *+' conftest.er1 >conftest.err
7377 rm -f conftest.er1
7378 cat conftest.err >&5
7379 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7380- (exit $ac_status); } && {
7381- test -z "$ac_c_werror_flag" ||
7382- test ! -s conftest.err
7383- } && test -s conftest.$ac_objext; then
7384+ (exit $ac_status); } &&
7385+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7386+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7387+ (eval $ac_try) 2>&5
7388+ ac_status=$?
7389+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7390+ (exit $ac_status); }; } &&
7391+ { ac_try='test -s conftest.$ac_objext'
7392+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7393+ (eval $ac_try) 2>&5
7394+ ac_status=$?
7395+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7396+ (exit $ac_status); }; }; then
7397 ac_hi=$ac_mid; break
7398 else
7399 echo "$as_me: failed program was:" >&5
7400 sed 's/^/| /' conftest.$ac_ext >&5
7401
7402- ac_lo=`expr $ac_mid + 1`
7403- if test $ac_lo -le $ac_mid; then
7404- ac_lo= ac_hi=
7405- break
7406- fi
7407- ac_mid=`expr 2 '*' $ac_mid + 1`
7408+ac_lo=`expr $ac_mid + 1`
7409+ if test $ac_lo -le $ac_mid; then
7410+ ac_lo= ac_hi=
7411+ break
7412+ fi
7413+ ac_mid=`expr 2 '*' $ac_mid + 1`
7414 fi
7415-
7416-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7417+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7418 done
7419 else
7420 echo "$as_me: failed program was:" >&5
7421 sed 's/^/| /' conftest.$ac_ext >&5
7422
7423- cat >conftest.$ac_ext <<_ACEOF
7424+cat >conftest.$ac_ext <<_ACEOF
7425 /* confdefs.h. */
7426 _ACEOF
7427 cat confdefs.h >>conftest.$ac_ext
7428 cat >>conftest.$ac_ext <<_ACEOF
7429 /* end confdefs.h. */
7430 $ac_includes_default
7431- typedef short ac__type_sizeof_;
7432 int
7433 main ()
7434 {
7435-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
7436+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
7437 test_array [0] = 0
7438
7439 ;
7440@@ -6258,22 +5464,26 @@
7441 }
7442 _ACEOF
7443 rm -f conftest.$ac_objext
7444-if { (ac_try="$ac_compile"
7445-case "(($ac_try" in
7446- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7447- *) ac_try_echo=$ac_try;;
7448-esac
7449-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7450- (eval "$ac_compile") 2>conftest.er1
7451+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7452+ (eval $ac_compile) 2>conftest.er1
7453 ac_status=$?
7454 grep -v '^ *+' conftest.er1 >conftest.err
7455 rm -f conftest.er1
7456 cat conftest.err >&5
7457 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7458- (exit $ac_status); } && {
7459- test -z "$ac_c_werror_flag" ||
7460- test ! -s conftest.err
7461- } && test -s conftest.$ac_objext; then
7462+ (exit $ac_status); } &&
7463+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7464+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7465+ (eval $ac_try) 2>&5
7466+ ac_status=$?
7467+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7468+ (exit $ac_status); }; } &&
7469+ { ac_try='test -s conftest.$ac_objext'
7470+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7471+ (eval $ac_try) 2>&5
7472+ ac_status=$?
7473+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7474+ (exit $ac_status); }; }; then
7475 ac_hi=-1 ac_mid=-1
7476 while :; do
7477 cat >conftest.$ac_ext <<_ACEOF
7478@@ -6283,11 +5493,10 @@
7479 cat >>conftest.$ac_ext <<_ACEOF
7480 /* end confdefs.h. */
7481 $ac_includes_default
7482- typedef short ac__type_sizeof_;
7483 int
7484 main ()
7485 {
7486-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
7487+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
7488 test_array [0] = 0
7489
7490 ;
7491@@ -6295,48 +5504,49 @@
7492 }
7493 _ACEOF
7494 rm -f conftest.$ac_objext
7495-if { (ac_try="$ac_compile"
7496-case "(($ac_try" in
7497- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7498- *) ac_try_echo=$ac_try;;
7499-esac
7500-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7501- (eval "$ac_compile") 2>conftest.er1
7502+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7503+ (eval $ac_compile) 2>conftest.er1
7504 ac_status=$?
7505 grep -v '^ *+' conftest.er1 >conftest.err
7506 rm -f conftest.er1
7507 cat conftest.err >&5
7508 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7509- (exit $ac_status); } && {
7510- test -z "$ac_c_werror_flag" ||
7511- test ! -s conftest.err
7512- } && test -s conftest.$ac_objext; then
7513+ (exit $ac_status); } &&
7514+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7515+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7516+ (eval $ac_try) 2>&5
7517+ ac_status=$?
7518+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7519+ (exit $ac_status); }; } &&
7520+ { ac_try='test -s conftest.$ac_objext'
7521+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7522+ (eval $ac_try) 2>&5
7523+ ac_status=$?
7524+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7525+ (exit $ac_status); }; }; then
7526 ac_lo=$ac_mid; break
7527 else
7528 echo "$as_me: failed program was:" >&5
7529 sed 's/^/| /' conftest.$ac_ext >&5
7530
7531- ac_hi=`expr '(' $ac_mid ')' - 1`
7532- if test $ac_mid -le $ac_hi; then
7533- ac_lo= ac_hi=
7534- break
7535- fi
7536- ac_mid=`expr 2 '*' $ac_mid`
7537+ac_hi=`expr '(' $ac_mid ')' - 1`
7538+ if test $ac_mid -le $ac_hi; then
7539+ ac_lo= ac_hi=
7540+ break
7541+ fi
7542+ ac_mid=`expr 2 '*' $ac_mid`
7543 fi
7544-
7545-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7546+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7547 done
7548 else
7549 echo "$as_me: failed program was:" >&5
7550 sed 's/^/| /' conftest.$ac_ext >&5
7551
7552- ac_lo= ac_hi=
7553+ac_lo= ac_hi=
7554 fi
7555-
7556-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7557+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7558 fi
7559-
7560-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7561+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7562 # Binary search between lo and hi bounds.
7563 while test "x$ac_lo" != "x$ac_hi"; do
7564 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
7565@@ -6347,11 +5557,10 @@
7566 cat >>conftest.$ac_ext <<_ACEOF
7567 /* end confdefs.h. */
7568 $ac_includes_default
7569- typedef short ac__type_sizeof_;
7570 int
7571 main ()
7572 {
7573-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
7574+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
7575 test_array [0] = 0
7576
7577 ;
7578@@ -6359,45 +5568,49 @@
7579 }
7580 _ACEOF
7581 rm -f conftest.$ac_objext
7582-if { (ac_try="$ac_compile"
7583-case "(($ac_try" in
7584- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7585- *) ac_try_echo=$ac_try;;
7586-esac
7587-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7588- (eval "$ac_compile") 2>conftest.er1
7589+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7590+ (eval $ac_compile) 2>conftest.er1
7591 ac_status=$?
7592 grep -v '^ *+' conftest.er1 >conftest.err
7593 rm -f conftest.er1
7594 cat conftest.err >&5
7595 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7596- (exit $ac_status); } && {
7597- test -z "$ac_c_werror_flag" ||
7598- test ! -s conftest.err
7599- } && test -s conftest.$ac_objext; then
7600+ (exit $ac_status); } &&
7601+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7602+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7603+ (eval $ac_try) 2>&5
7604+ ac_status=$?
7605+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7606+ (exit $ac_status); }; } &&
7607+ { ac_try='test -s conftest.$ac_objext'
7608+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7609+ (eval $ac_try) 2>&5
7610+ ac_status=$?
7611+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7612+ (exit $ac_status); }; }; then
7613 ac_hi=$ac_mid
7614 else
7615 echo "$as_me: failed program was:" >&5
7616 sed 's/^/| /' conftest.$ac_ext >&5
7617
7618- ac_lo=`expr '(' $ac_mid ')' + 1`
7619+ac_lo=`expr '(' $ac_mid ')' + 1`
7620 fi
7621-
7622-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7623+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7624 done
7625 case $ac_lo in
7626 ?*) ac_cv_sizeof_short=$ac_lo;;
7627-'') if test "$ac_cv_type_short" = yes; then
7628- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
7629+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
7630 See \`config.log' for more details." >&5
7631-echo "$as_me: error: cannot compute sizeof (short)
7632+echo "$as_me: error: cannot compute sizeof (short), 77
7633 See \`config.log' for more details." >&2;}
7634- { (exit 77); exit 77; }; }
7635- else
7636- ac_cv_sizeof_short=0
7637- fi ;;
7638+ { (exit 1); exit 1; }; } ;;
7639 esac
7640 else
7641+ if test "$cross_compiling" = yes; then
7642+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
7643+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
7644+ { (exit 1); exit 1; }; }
7645+else
7646 cat >conftest.$ac_ext <<_ACEOF
7647 /* confdefs.h. */
7648 _ACEOF
7649@@ -6405,9 +5618,8 @@
7650 cat >>conftest.$ac_ext <<_ACEOF
7651 /* end confdefs.h. */
7652 $ac_includes_default
7653- typedef short ac__type_sizeof_;
7654-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
7655-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
7656+long longval () { return (long) (sizeof (short)); }
7657+unsigned long ulongval () { return (long) (sizeof (short)); }
7658 #include <stdio.h>
7659 #include <stdlib.h>
7660 int
7661@@ -6416,44 +5628,35 @@
7662
7663 FILE *f = fopen ("conftest.val", "w");
7664 if (! f)
7665- return 1;
7666- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
7667+ exit (1);
7668+ if (((long) (sizeof (short))) < 0)
7669 {
7670- long int i = longval ();
7671- if (i != ((long int) (sizeof (ac__type_sizeof_))))
7672- return 1;
7673+ long i = longval ();
7674+ if (i != ((long) (sizeof (short))))
7675+ exit (1);
7676 fprintf (f, "%ld\n", i);
7677 }
7678 else
7679 {
7680- unsigned long int i = ulongval ();
7681- if (i != ((long int) (sizeof (ac__type_sizeof_))))
7682- return 1;
7683+ unsigned long i = ulongval ();
7684+ if (i != ((long) (sizeof (short))))
7685+ exit (1);
7686 fprintf (f, "%lu\n", i);
7687 }
7688- return ferror (f) || fclose (f) != 0;
7689+ exit (ferror (f) || fclose (f) != 0);
7690
7691 ;
7692 return 0;
7693 }
7694 _ACEOF
7695 rm -f conftest$ac_exeext
7696-if { (ac_try="$ac_link"
7697-case "(($ac_try" in
7698- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7699- *) ac_try_echo=$ac_try;;
7700-esac
7701-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7702- (eval "$ac_link") 2>&5
7703+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7704+ (eval $ac_link) 2>&5
7705 ac_status=$?
7706 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7707 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7708- { (case "(($ac_try" in
7709- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7710- *) ac_try_echo=$ac_try;;
7711-esac
7712-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7713- (eval "$ac_try") 2>&5
7714+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7715+ (eval $ac_try) 2>&5
7716 ac_status=$?
7717 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7718 (exit $ac_status); }; }; then
7719@@ -6464,32 +5667,29 @@
7720 sed 's/^/| /' conftest.$ac_ext >&5
7721
7722 ( exit $ac_status )
7723-if test "$ac_cv_type_short" = yes; then
7724- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
7725+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
7726 See \`config.log' for more details." >&5
7727-echo "$as_me: error: cannot compute sizeof (short)
7728+echo "$as_me: error: cannot compute sizeof (short), 77
7729 See \`config.log' for more details." >&2;}
7730- { (exit 77); exit 77; }; }
7731- else
7732- ac_cv_sizeof_short=0
7733- fi
7734+ { (exit 1); exit 1; }; }
7735+fi
7736+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
7737 fi
7738-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
7739 fi
7740 rm -f conftest.val
7741+else
7742+ ac_cv_sizeof_short=0
7743 fi
7744-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
7745-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
7746-
7747-
7748-
7749+fi
7750+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
7751+echo "${ECHO_T}$ac_cv_sizeof_short" >&6
7752 cat >>confdefs.h <<_ACEOF
7753 #define SIZEOF_SHORT $ac_cv_sizeof_short
7754 _ACEOF
7755
7756
7757-{ echo "$as_me:$LINENO: checking for long" >&5
7758-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
7759+echo "$as_me:$LINENO: checking for long" >&5
7760+echo $ECHO_N "checking for long... $ECHO_C" >&6
7761 if test "${ac_cv_type_long+set}" = set; then
7762 echo $ECHO_N "(cached) $ECHO_C" >&6
7763 else
7764@@ -6500,57 +5700,60 @@
7765 cat >>conftest.$ac_ext <<_ACEOF
7766 /* end confdefs.h. */
7767 $ac_includes_default
7768-typedef long ac__type_new_;
7769 int
7770 main ()
7771 {
7772-if ((ac__type_new_ *) 0)
7773+if ((long *) 0)
7774 return 0;
7775-if (sizeof (ac__type_new_))
7776+if (sizeof (long))
7777 return 0;
7778 ;
7779 return 0;
7780 }
7781 _ACEOF
7782 rm -f conftest.$ac_objext
7783-if { (ac_try="$ac_compile"
7784-case "(($ac_try" in
7785- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7786- *) ac_try_echo=$ac_try;;
7787-esac
7788-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7789- (eval "$ac_compile") 2>conftest.er1
7790+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7791+ (eval $ac_compile) 2>conftest.er1
7792 ac_status=$?
7793 grep -v '^ *+' conftest.er1 >conftest.err
7794 rm -f conftest.er1
7795 cat conftest.err >&5
7796 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7797- (exit $ac_status); } && {
7798- test -z "$ac_c_werror_flag" ||
7799- test ! -s conftest.err
7800- } && test -s conftest.$ac_objext; then
7801+ (exit $ac_status); } &&
7802+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7803+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7804+ (eval $ac_try) 2>&5
7805+ ac_status=$?
7806+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7807+ (exit $ac_status); }; } &&
7808+ { ac_try='test -s conftest.$ac_objext'
7809+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7810+ (eval $ac_try) 2>&5
7811+ ac_status=$?
7812+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7813+ (exit $ac_status); }; }; then
7814 ac_cv_type_long=yes
7815 else
7816 echo "$as_me: failed program was:" >&5
7817 sed 's/^/| /' conftest.$ac_ext >&5
7818
7819- ac_cv_type_long=no
7820+ac_cv_type_long=no
7821 fi
7822-
7823-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7824+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7825 fi
7826-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
7827-echo "${ECHO_T}$ac_cv_type_long" >&6; }
7828+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
7829+echo "${ECHO_T}$ac_cv_type_long" >&6
7830
7831-# The cast to long int works around a bug in the HP C Compiler
7832-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
7833-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
7834-# This bug is HP SR number 8606223364.
7835-{ echo "$as_me:$LINENO: checking size of long" >&5
7836-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
7837+echo "$as_me:$LINENO: checking size of long" >&5
7838+echo $ECHO_N "checking size of long... $ECHO_C" >&6
7839 if test "${ac_cv_sizeof_long+set}" = set; then
7840 echo $ECHO_N "(cached) $ECHO_C" >&6
7841 else
7842+ if test "$ac_cv_type_long" = yes; then
7843+ # The cast to unsigned long works around a bug in the HP C Compiler
7844+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
7845+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
7846+ # This bug is HP SR number 8606223364.
7847 if test "$cross_compiling" = yes; then
7848 # Depending upon the size, compute the lo and hi bounds.
7849 cat >conftest.$ac_ext <<_ACEOF
7850@@ -6560,11 +5763,10 @@
7851 cat >>conftest.$ac_ext <<_ACEOF
7852 /* end confdefs.h. */
7853 $ac_includes_default
7854- typedef long ac__type_sizeof_;
7855 int
7856 main ()
7857 {
7858-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
7859+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
7860 test_array [0] = 0
7861
7862 ;
7863@@ -6572,22 +5774,26 @@
7864 }
7865 _ACEOF
7866 rm -f conftest.$ac_objext
7867-if { (ac_try="$ac_compile"
7868-case "(($ac_try" in
7869- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7870- *) ac_try_echo=$ac_try;;
7871-esac
7872-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7873- (eval "$ac_compile") 2>conftest.er1
7874+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7875+ (eval $ac_compile) 2>conftest.er1
7876 ac_status=$?
7877 grep -v '^ *+' conftest.er1 >conftest.err
7878 rm -f conftest.er1
7879 cat conftest.err >&5
7880 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7881- (exit $ac_status); } && {
7882- test -z "$ac_c_werror_flag" ||
7883- test ! -s conftest.err
7884- } && test -s conftest.$ac_objext; then
7885+ (exit $ac_status); } &&
7886+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7887+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7888+ (eval $ac_try) 2>&5
7889+ ac_status=$?
7890+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7891+ (exit $ac_status); }; } &&
7892+ { ac_try='test -s conftest.$ac_objext'
7893+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7894+ (eval $ac_try) 2>&5
7895+ ac_status=$?
7896+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7897+ (exit $ac_status); }; }; then
7898 ac_lo=0 ac_mid=0
7899 while :; do
7900 cat >conftest.$ac_ext <<_ACEOF
7901@@ -6597,11 +5803,10 @@
7902 cat >>conftest.$ac_ext <<_ACEOF
7903 /* end confdefs.h. */
7904 $ac_includes_default
7905- typedef long ac__type_sizeof_;
7906 int
7907 main ()
7908 {
7909-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
7910+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
7911 test_array [0] = 0
7912
7913 ;
7914@@ -6609,53 +5814,55 @@
7915 }
7916 _ACEOF
7917 rm -f conftest.$ac_objext
7918-if { (ac_try="$ac_compile"
7919-case "(($ac_try" in
7920- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7921- *) ac_try_echo=$ac_try;;
7922-esac
7923-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7924- (eval "$ac_compile") 2>conftest.er1
7925+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7926+ (eval $ac_compile) 2>conftest.er1
7927 ac_status=$?
7928 grep -v '^ *+' conftest.er1 >conftest.err
7929 rm -f conftest.er1
7930 cat conftest.err >&5
7931 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7932- (exit $ac_status); } && {
7933- test -z "$ac_c_werror_flag" ||
7934- test ! -s conftest.err
7935- } && test -s conftest.$ac_objext; then
7936+ (exit $ac_status); } &&
7937+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7938+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7939+ (eval $ac_try) 2>&5
7940+ ac_status=$?
7941+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7942+ (exit $ac_status); }; } &&
7943+ { ac_try='test -s conftest.$ac_objext'
7944+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7945+ (eval $ac_try) 2>&5
7946+ ac_status=$?
7947+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
7948+ (exit $ac_status); }; }; then
7949 ac_hi=$ac_mid; break
7950 else
7951 echo "$as_me: failed program was:" >&5
7952 sed 's/^/| /' conftest.$ac_ext >&5
7953
7954- ac_lo=`expr $ac_mid + 1`
7955- if test $ac_lo -le $ac_mid; then
7956- ac_lo= ac_hi=
7957- break
7958- fi
7959- ac_mid=`expr 2 '*' $ac_mid + 1`
7960+ac_lo=`expr $ac_mid + 1`
7961+ if test $ac_lo -le $ac_mid; then
7962+ ac_lo= ac_hi=
7963+ break
7964+ fi
7965+ ac_mid=`expr 2 '*' $ac_mid + 1`
7966 fi
7967-
7968-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7969+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7970 done
7971 else
7972 echo "$as_me: failed program was:" >&5
7973 sed 's/^/| /' conftest.$ac_ext >&5
7974
7975- cat >conftest.$ac_ext <<_ACEOF
7976+cat >conftest.$ac_ext <<_ACEOF
7977 /* confdefs.h. */
7978 _ACEOF
7979 cat confdefs.h >>conftest.$ac_ext
7980 cat >>conftest.$ac_ext <<_ACEOF
7981 /* end confdefs.h. */
7982 $ac_includes_default
7983- typedef long ac__type_sizeof_;
7984 int
7985 main ()
7986 {
7987-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
7988+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
7989 test_array [0] = 0
7990
7991 ;
7992@@ -6663,22 +5870,26 @@
7993 }
7994 _ACEOF
7995 rm -f conftest.$ac_objext
7996-if { (ac_try="$ac_compile"
7997-case "(($ac_try" in
7998- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7999- *) ac_try_echo=$ac_try;;
8000-esac
8001-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8002- (eval "$ac_compile") 2>conftest.er1
8003+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8004+ (eval $ac_compile) 2>conftest.er1
8005 ac_status=$?
8006 grep -v '^ *+' conftest.er1 >conftest.err
8007 rm -f conftest.er1
8008 cat conftest.err >&5
8009 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8010- (exit $ac_status); } && {
8011- test -z "$ac_c_werror_flag" ||
8012- test ! -s conftest.err
8013- } && test -s conftest.$ac_objext; then
8014+ (exit $ac_status); } &&
8015+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8016+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8017+ (eval $ac_try) 2>&5
8018+ ac_status=$?
8019+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8020+ (exit $ac_status); }; } &&
8021+ { ac_try='test -s conftest.$ac_objext'
8022+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8023+ (eval $ac_try) 2>&5
8024+ ac_status=$?
8025+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8026+ (exit $ac_status); }; }; then
8027 ac_hi=-1 ac_mid=-1
8028 while :; do
8029 cat >conftest.$ac_ext <<_ACEOF
8030@@ -6688,11 +5899,10 @@
8031 cat >>conftest.$ac_ext <<_ACEOF
8032 /* end confdefs.h. */
8033 $ac_includes_default
8034- typedef long ac__type_sizeof_;
8035 int
8036 main ()
8037 {
8038-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
8039+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
8040 test_array [0] = 0
8041
8042 ;
8043@@ -6700,48 +5910,49 @@
8044 }
8045 _ACEOF
8046 rm -f conftest.$ac_objext
8047-if { (ac_try="$ac_compile"
8048-case "(($ac_try" in
8049- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8050- *) ac_try_echo=$ac_try;;
8051-esac
8052-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8053- (eval "$ac_compile") 2>conftest.er1
8054+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8055+ (eval $ac_compile) 2>conftest.er1
8056 ac_status=$?
8057 grep -v '^ *+' conftest.er1 >conftest.err
8058 rm -f conftest.er1
8059 cat conftest.err >&5
8060 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8061- (exit $ac_status); } && {
8062- test -z "$ac_c_werror_flag" ||
8063- test ! -s conftest.err
8064- } && test -s conftest.$ac_objext; then
8065+ (exit $ac_status); } &&
8066+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8067+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8068+ (eval $ac_try) 2>&5
8069+ ac_status=$?
8070+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8071+ (exit $ac_status); }; } &&
8072+ { ac_try='test -s conftest.$ac_objext'
8073+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8074+ (eval $ac_try) 2>&5
8075+ ac_status=$?
8076+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8077+ (exit $ac_status); }; }; then
8078 ac_lo=$ac_mid; break
8079 else
8080 echo "$as_me: failed program was:" >&5
8081 sed 's/^/| /' conftest.$ac_ext >&5
8082
8083- ac_hi=`expr '(' $ac_mid ')' - 1`
8084- if test $ac_mid -le $ac_hi; then
8085- ac_lo= ac_hi=
8086- break
8087- fi
8088- ac_mid=`expr 2 '*' $ac_mid`
8089+ac_hi=`expr '(' $ac_mid ')' - 1`
8090+ if test $ac_mid -le $ac_hi; then
8091+ ac_lo= ac_hi=
8092+ break
8093+ fi
8094+ ac_mid=`expr 2 '*' $ac_mid`
8095 fi
8096-
8097-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8098+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8099 done
8100 else
8101 echo "$as_me: failed program was:" >&5
8102 sed 's/^/| /' conftest.$ac_ext >&5
8103
8104- ac_lo= ac_hi=
8105+ac_lo= ac_hi=
8106 fi
8107-
8108-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8109+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8110 fi
8111-
8112-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8113+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8114 # Binary search between lo and hi bounds.
8115 while test "x$ac_lo" != "x$ac_hi"; do
8116 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
8117@@ -6752,11 +5963,10 @@
8118 cat >>conftest.$ac_ext <<_ACEOF
8119 /* end confdefs.h. */
8120 $ac_includes_default
8121- typedef long ac__type_sizeof_;
8122 int
8123 main ()
8124 {
8125-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
8126+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
8127 test_array [0] = 0
8128
8129 ;
8130@@ -6764,45 +5974,49 @@
8131 }
8132 _ACEOF
8133 rm -f conftest.$ac_objext
8134-if { (ac_try="$ac_compile"
8135-case "(($ac_try" in
8136- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8137- *) ac_try_echo=$ac_try;;
8138-esac
8139-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8140- (eval "$ac_compile") 2>conftest.er1
8141+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8142+ (eval $ac_compile) 2>conftest.er1
8143 ac_status=$?
8144 grep -v '^ *+' conftest.er1 >conftest.err
8145 rm -f conftest.er1
8146 cat conftest.err >&5
8147 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8148- (exit $ac_status); } && {
8149- test -z "$ac_c_werror_flag" ||
8150- test ! -s conftest.err
8151- } && test -s conftest.$ac_objext; then
8152+ (exit $ac_status); } &&
8153+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8154+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8155+ (eval $ac_try) 2>&5
8156+ ac_status=$?
8157+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8158+ (exit $ac_status); }; } &&
8159+ { ac_try='test -s conftest.$ac_objext'
8160+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8161+ (eval $ac_try) 2>&5
8162+ ac_status=$?
8163+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8164+ (exit $ac_status); }; }; then
8165 ac_hi=$ac_mid
8166 else
8167 echo "$as_me: failed program was:" >&5
8168 sed 's/^/| /' conftest.$ac_ext >&5
8169
8170- ac_lo=`expr '(' $ac_mid ')' + 1`
8171+ac_lo=`expr '(' $ac_mid ')' + 1`
8172 fi
8173-
8174-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8175+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8176 done
8177 case $ac_lo in
8178 ?*) ac_cv_sizeof_long=$ac_lo;;
8179-'') if test "$ac_cv_type_long" = yes; then
8180- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
8181+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
8182 See \`config.log' for more details." >&5
8183-echo "$as_me: error: cannot compute sizeof (long)
8184+echo "$as_me: error: cannot compute sizeof (long), 77
8185 See \`config.log' for more details." >&2;}
8186- { (exit 77); exit 77; }; }
8187- else
8188- ac_cv_sizeof_long=0
8189- fi ;;
8190+ { (exit 1); exit 1; }; } ;;
8191 esac
8192 else
8193+ if test "$cross_compiling" = yes; then
8194+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
8195+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
8196+ { (exit 1); exit 1; }; }
8197+else
8198 cat >conftest.$ac_ext <<_ACEOF
8199 /* confdefs.h. */
8200 _ACEOF
8201@@ -6810,9 +6024,8 @@
8202 cat >>conftest.$ac_ext <<_ACEOF
8203 /* end confdefs.h. */
8204 $ac_includes_default
8205- typedef long ac__type_sizeof_;
8206-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
8207-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
8208+long longval () { return (long) (sizeof (long)); }
8209+unsigned long ulongval () { return (long) (sizeof (long)); }
8210 #include <stdio.h>
8211 #include <stdlib.h>
8212 int
8213@@ -6821,44 +6034,35 @@
8214
8215 FILE *f = fopen ("conftest.val", "w");
8216 if (! f)
8217- return 1;
8218- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
8219+ exit (1);
8220+ if (((long) (sizeof (long))) < 0)
8221 {
8222- long int i = longval ();
8223- if (i != ((long int) (sizeof (ac__type_sizeof_))))
8224- return 1;
8225+ long i = longval ();
8226+ if (i != ((long) (sizeof (long))))
8227+ exit (1);
8228 fprintf (f, "%ld\n", i);
8229 }
8230 else
8231 {
8232- unsigned long int i = ulongval ();
8233- if (i != ((long int) (sizeof (ac__type_sizeof_))))
8234- return 1;
8235+ unsigned long i = ulongval ();
8236+ if (i != ((long) (sizeof (long))))
8237+ exit (1);
8238 fprintf (f, "%lu\n", i);
8239 }
8240- return ferror (f) || fclose (f) != 0;
8241+ exit (ferror (f) || fclose (f) != 0);
8242
8243 ;
8244 return 0;
8245 }
8246 _ACEOF
8247 rm -f conftest$ac_exeext
8248-if { (ac_try="$ac_link"
8249-case "(($ac_try" in
8250- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8251- *) ac_try_echo=$ac_try;;
8252-esac
8253-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8254- (eval "$ac_link") 2>&5
8255+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8256+ (eval $ac_link) 2>&5
8257 ac_status=$?
8258 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8259 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8260- { (case "(($ac_try" in
8261- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8262- *) ac_try_echo=$ac_try;;
8263-esac
8264-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8265- (eval "$ac_try") 2>&5
8266+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8267+ (eval $ac_try) 2>&5
8268 ac_status=$?
8269 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8270 (exit $ac_status); }; }; then
8271@@ -6869,32 +6073,29 @@
8272 sed 's/^/| /' conftest.$ac_ext >&5
8273
8274 ( exit $ac_status )
8275-if test "$ac_cv_type_long" = yes; then
8276- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
8277+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
8278 See \`config.log' for more details." >&5
8279-echo "$as_me: error: cannot compute sizeof (long)
8280+echo "$as_me: error: cannot compute sizeof (long), 77
8281 See \`config.log' for more details." >&2;}
8282- { (exit 77); exit 77; }; }
8283- else
8284- ac_cv_sizeof_long=0
8285- fi
8286+ { (exit 1); exit 1; }; }
8287+fi
8288+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8289 fi
8290-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8291 fi
8292 rm -f conftest.val
8293+else
8294+ ac_cv_sizeof_long=0
8295 fi
8296-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
8297-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
8298-
8299-
8300-
8301+fi
8302+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
8303+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
8304 cat >>confdefs.h <<_ACEOF
8305 #define SIZEOF_LONG $ac_cv_sizeof_long
8306 _ACEOF
8307
8308
8309-{ echo "$as_me:$LINENO: checking for long long" >&5
8310-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
8311+echo "$as_me:$LINENO: checking for long long" >&5
8312+echo $ECHO_N "checking for long long... $ECHO_C" >&6
8313 if test "${ac_cv_type_long_long+set}" = set; then
8314 echo $ECHO_N "(cached) $ECHO_C" >&6
8315 else
8316@@ -6905,57 +6106,60 @@
8317 cat >>conftest.$ac_ext <<_ACEOF
8318 /* end confdefs.h. */
8319 $ac_includes_default
8320-typedef long long ac__type_new_;
8321 int
8322 main ()
8323 {
8324-if ((ac__type_new_ *) 0)
8325+if ((long long *) 0)
8326 return 0;
8327-if (sizeof (ac__type_new_))
8328+if (sizeof (long long))
8329 return 0;
8330 ;
8331 return 0;
8332 }
8333 _ACEOF
8334 rm -f conftest.$ac_objext
8335-if { (ac_try="$ac_compile"
8336-case "(($ac_try" in
8337- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8338- *) ac_try_echo=$ac_try;;
8339-esac
8340-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8341- (eval "$ac_compile") 2>conftest.er1
8342+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8343+ (eval $ac_compile) 2>conftest.er1
8344 ac_status=$?
8345 grep -v '^ *+' conftest.er1 >conftest.err
8346 rm -f conftest.er1
8347 cat conftest.err >&5
8348 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8349- (exit $ac_status); } && {
8350- test -z "$ac_c_werror_flag" ||
8351- test ! -s conftest.err
8352- } && test -s conftest.$ac_objext; then
8353+ (exit $ac_status); } &&
8354+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8355+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8356+ (eval $ac_try) 2>&5
8357+ ac_status=$?
8358+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8359+ (exit $ac_status); }; } &&
8360+ { ac_try='test -s conftest.$ac_objext'
8361+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8362+ (eval $ac_try) 2>&5
8363+ ac_status=$?
8364+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8365+ (exit $ac_status); }; }; then
8366 ac_cv_type_long_long=yes
8367 else
8368 echo "$as_me: failed program was:" >&5
8369 sed 's/^/| /' conftest.$ac_ext >&5
8370
8371- ac_cv_type_long_long=no
8372+ac_cv_type_long_long=no
8373 fi
8374-
8375-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8376+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8377 fi
8378-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
8379-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
8380+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
8381+echo "${ECHO_T}$ac_cv_type_long_long" >&6
8382
8383-# The cast to long int works around a bug in the HP C Compiler
8384-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
8385-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
8386-# This bug is HP SR number 8606223364.
8387-{ echo "$as_me:$LINENO: checking size of long long" >&5
8388-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
8389+echo "$as_me:$LINENO: checking size of long long" >&5
8390+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
8391 if test "${ac_cv_sizeof_long_long+set}" = set; then
8392 echo $ECHO_N "(cached) $ECHO_C" >&6
8393 else
8394+ if test "$ac_cv_type_long_long" = yes; then
8395+ # The cast to unsigned long works around a bug in the HP C Compiler
8396+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
8397+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
8398+ # This bug is HP SR number 8606223364.
8399 if test "$cross_compiling" = yes; then
8400 # Depending upon the size, compute the lo and hi bounds.
8401 cat >conftest.$ac_ext <<_ACEOF
8402@@ -6965,11 +6169,10 @@
8403 cat >>conftest.$ac_ext <<_ACEOF
8404 /* end confdefs.h. */
8405 $ac_includes_default
8406- typedef long long ac__type_sizeof_;
8407 int
8408 main ()
8409 {
8410-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
8411+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
8412 test_array [0] = 0
8413
8414 ;
8415@@ -6977,22 +6180,26 @@
8416 }
8417 _ACEOF
8418 rm -f conftest.$ac_objext
8419-if { (ac_try="$ac_compile"
8420-case "(($ac_try" in
8421- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8422- *) ac_try_echo=$ac_try;;
8423-esac
8424-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8425- (eval "$ac_compile") 2>conftest.er1
8426+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8427+ (eval $ac_compile) 2>conftest.er1
8428 ac_status=$?
8429 grep -v '^ *+' conftest.er1 >conftest.err
8430 rm -f conftest.er1
8431 cat conftest.err >&5
8432 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8433- (exit $ac_status); } && {
8434- test -z "$ac_c_werror_flag" ||
8435- test ! -s conftest.err
8436- } && test -s conftest.$ac_objext; then
8437+ (exit $ac_status); } &&
8438+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8439+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8440+ (eval $ac_try) 2>&5
8441+ ac_status=$?
8442+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8443+ (exit $ac_status); }; } &&
8444+ { ac_try='test -s conftest.$ac_objext'
8445+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8446+ (eval $ac_try) 2>&5
8447+ ac_status=$?
8448+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8449+ (exit $ac_status); }; }; then
8450 ac_lo=0 ac_mid=0
8451 while :; do
8452 cat >conftest.$ac_ext <<_ACEOF
8453@@ -7002,11 +6209,10 @@
8454 cat >>conftest.$ac_ext <<_ACEOF
8455 /* end confdefs.h. */
8456 $ac_includes_default
8457- typedef long long ac__type_sizeof_;
8458 int
8459 main ()
8460 {
8461-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
8462+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
8463 test_array [0] = 0
8464
8465 ;
8466@@ -7014,53 +6220,55 @@
8467 }
8468 _ACEOF
8469 rm -f conftest.$ac_objext
8470-if { (ac_try="$ac_compile"
8471-case "(($ac_try" in
8472- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8473- *) ac_try_echo=$ac_try;;
8474-esac
8475-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8476- (eval "$ac_compile") 2>conftest.er1
8477+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8478+ (eval $ac_compile) 2>conftest.er1
8479 ac_status=$?
8480 grep -v '^ *+' conftest.er1 >conftest.err
8481 rm -f conftest.er1
8482 cat conftest.err >&5
8483 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8484- (exit $ac_status); } && {
8485- test -z "$ac_c_werror_flag" ||
8486- test ! -s conftest.err
8487- } && test -s conftest.$ac_objext; then
8488+ (exit $ac_status); } &&
8489+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8490+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8491+ (eval $ac_try) 2>&5
8492+ ac_status=$?
8493+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8494+ (exit $ac_status); }; } &&
8495+ { ac_try='test -s conftest.$ac_objext'
8496+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8497+ (eval $ac_try) 2>&5
8498+ ac_status=$?
8499+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8500+ (exit $ac_status); }; }; then
8501 ac_hi=$ac_mid; break
8502 else
8503 echo "$as_me: failed program was:" >&5
8504 sed 's/^/| /' conftest.$ac_ext >&5
8505
8506- ac_lo=`expr $ac_mid + 1`
8507- if test $ac_lo -le $ac_mid; then
8508- ac_lo= ac_hi=
8509- break
8510- fi
8511- ac_mid=`expr 2 '*' $ac_mid + 1`
8512+ac_lo=`expr $ac_mid + 1`
8513+ if test $ac_lo -le $ac_mid; then
8514+ ac_lo= ac_hi=
8515+ break
8516+ fi
8517+ ac_mid=`expr 2 '*' $ac_mid + 1`
8518 fi
8519-
8520-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8521+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8522 done
8523 else
8524 echo "$as_me: failed program was:" >&5
8525 sed 's/^/| /' conftest.$ac_ext >&5
8526
8527- cat >conftest.$ac_ext <<_ACEOF
8528+cat >conftest.$ac_ext <<_ACEOF
8529 /* confdefs.h. */
8530 _ACEOF
8531 cat confdefs.h >>conftest.$ac_ext
8532 cat >>conftest.$ac_ext <<_ACEOF
8533 /* end confdefs.h. */
8534 $ac_includes_default
8535- typedef long long ac__type_sizeof_;
8536 int
8537 main ()
8538 {
8539-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
8540+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
8541 test_array [0] = 0
8542
8543 ;
8544@@ -7068,22 +6276,26 @@
8545 }
8546 _ACEOF
8547 rm -f conftest.$ac_objext
8548-if { (ac_try="$ac_compile"
8549-case "(($ac_try" in
8550- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8551- *) ac_try_echo=$ac_try;;
8552-esac
8553-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8554- (eval "$ac_compile") 2>conftest.er1
8555+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8556+ (eval $ac_compile) 2>conftest.er1
8557 ac_status=$?
8558 grep -v '^ *+' conftest.er1 >conftest.err
8559 rm -f conftest.er1
8560 cat conftest.err >&5
8561 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8562- (exit $ac_status); } && {
8563- test -z "$ac_c_werror_flag" ||
8564- test ! -s conftest.err
8565- } && test -s conftest.$ac_objext; then
8566+ (exit $ac_status); } &&
8567+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8568+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8569+ (eval $ac_try) 2>&5
8570+ ac_status=$?
8571+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8572+ (exit $ac_status); }; } &&
8573+ { ac_try='test -s conftest.$ac_objext'
8574+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8575+ (eval $ac_try) 2>&5
8576+ ac_status=$?
8577+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8578+ (exit $ac_status); }; }; then
8579 ac_hi=-1 ac_mid=-1
8580 while :; do
8581 cat >conftest.$ac_ext <<_ACEOF
8582@@ -7093,11 +6305,10 @@
8583 cat >>conftest.$ac_ext <<_ACEOF
8584 /* end confdefs.h. */
8585 $ac_includes_default
8586- typedef long long ac__type_sizeof_;
8587 int
8588 main ()
8589 {
8590-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
8591+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
8592 test_array [0] = 0
8593
8594 ;
8595@@ -7105,48 +6316,49 @@
8596 }
8597 _ACEOF
8598 rm -f conftest.$ac_objext
8599-if { (ac_try="$ac_compile"
8600-case "(($ac_try" in
8601- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8602- *) ac_try_echo=$ac_try;;
8603-esac
8604-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8605- (eval "$ac_compile") 2>conftest.er1
8606+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8607+ (eval $ac_compile) 2>conftest.er1
8608 ac_status=$?
8609 grep -v '^ *+' conftest.er1 >conftest.err
8610 rm -f conftest.er1
8611 cat conftest.err >&5
8612 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8613- (exit $ac_status); } && {
8614- test -z "$ac_c_werror_flag" ||
8615- test ! -s conftest.err
8616- } && test -s conftest.$ac_objext; then
8617+ (exit $ac_status); } &&
8618+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8619+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8620+ (eval $ac_try) 2>&5
8621+ ac_status=$?
8622+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8623+ (exit $ac_status); }; } &&
8624+ { ac_try='test -s conftest.$ac_objext'
8625+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8626+ (eval $ac_try) 2>&5
8627+ ac_status=$?
8628+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8629+ (exit $ac_status); }; }; then
8630 ac_lo=$ac_mid; break
8631 else
8632 echo "$as_me: failed program was:" >&5
8633 sed 's/^/| /' conftest.$ac_ext >&5
8634
8635- ac_hi=`expr '(' $ac_mid ')' - 1`
8636- if test $ac_mid -le $ac_hi; then
8637- ac_lo= ac_hi=
8638- break
8639- fi
8640- ac_mid=`expr 2 '*' $ac_mid`
8641+ac_hi=`expr '(' $ac_mid ')' - 1`
8642+ if test $ac_mid -le $ac_hi; then
8643+ ac_lo= ac_hi=
8644+ break
8645+ fi
8646+ ac_mid=`expr 2 '*' $ac_mid`
8647 fi
8648-
8649-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8650+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8651 done
8652 else
8653 echo "$as_me: failed program was:" >&5
8654 sed 's/^/| /' conftest.$ac_ext >&5
8655
8656- ac_lo= ac_hi=
8657+ac_lo= ac_hi=
8658 fi
8659-
8660-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8661+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8662 fi
8663-
8664-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8665+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8666 # Binary search between lo and hi bounds.
8667 while test "x$ac_lo" != "x$ac_hi"; do
8668 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
8669@@ -7157,11 +6369,10 @@
8670 cat >>conftest.$ac_ext <<_ACEOF
8671 /* end confdefs.h. */
8672 $ac_includes_default
8673- typedef long long ac__type_sizeof_;
8674 int
8675 main ()
8676 {
8677-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
8678+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
8679 test_array [0] = 0
8680
8681 ;
8682@@ -7169,45 +6380,49 @@
8683 }
8684 _ACEOF
8685 rm -f conftest.$ac_objext
8686-if { (ac_try="$ac_compile"
8687-case "(($ac_try" in
8688- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8689- *) ac_try_echo=$ac_try;;
8690-esac
8691-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8692- (eval "$ac_compile") 2>conftest.er1
8693+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8694+ (eval $ac_compile) 2>conftest.er1
8695 ac_status=$?
8696 grep -v '^ *+' conftest.er1 >conftest.err
8697 rm -f conftest.er1
8698 cat conftest.err >&5
8699 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8700- (exit $ac_status); } && {
8701- test -z "$ac_c_werror_flag" ||
8702- test ! -s conftest.err
8703- } && test -s conftest.$ac_objext; then
8704+ (exit $ac_status); } &&
8705+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8706+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8707+ (eval $ac_try) 2>&5
8708+ ac_status=$?
8709+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8710+ (exit $ac_status); }; } &&
8711+ { ac_try='test -s conftest.$ac_objext'
8712+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8713+ (eval $ac_try) 2>&5
8714+ ac_status=$?
8715+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8716+ (exit $ac_status); }; }; then
8717 ac_hi=$ac_mid
8718 else
8719 echo "$as_me: failed program was:" >&5
8720 sed 's/^/| /' conftest.$ac_ext >&5
8721
8722- ac_lo=`expr '(' $ac_mid ')' + 1`
8723+ac_lo=`expr '(' $ac_mid ')' + 1`
8724 fi
8725-
8726-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8727+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8728 done
8729 case $ac_lo in
8730 ?*) ac_cv_sizeof_long_long=$ac_lo;;
8731-'') if test "$ac_cv_type_long_long" = yes; then
8732- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
8733+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
8734 See \`config.log' for more details." >&5
8735-echo "$as_me: error: cannot compute sizeof (long long)
8736+echo "$as_me: error: cannot compute sizeof (long long), 77
8737 See \`config.log' for more details." >&2;}
8738- { (exit 77); exit 77; }; }
8739- else
8740- ac_cv_sizeof_long_long=0
8741- fi ;;
8742+ { (exit 1); exit 1; }; } ;;
8743 esac
8744 else
8745+ if test "$cross_compiling" = yes; then
8746+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
8747+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
8748+ { (exit 1); exit 1; }; }
8749+else
8750 cat >conftest.$ac_ext <<_ACEOF
8751 /* confdefs.h. */
8752 _ACEOF
8753@@ -7215,9 +6430,8 @@
8754 cat >>conftest.$ac_ext <<_ACEOF
8755 /* end confdefs.h. */
8756 $ac_includes_default
8757- typedef long long ac__type_sizeof_;
8758-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
8759-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
8760+long longval () { return (long) (sizeof (long long)); }
8761+unsigned long ulongval () { return (long) (sizeof (long long)); }
8762 #include <stdio.h>
8763 #include <stdlib.h>
8764 int
8765@@ -7226,44 +6440,35 @@
8766
8767 FILE *f = fopen ("conftest.val", "w");
8768 if (! f)
8769- return 1;
8770- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
8771+ exit (1);
8772+ if (((long) (sizeof (long long))) < 0)
8773 {
8774- long int i = longval ();
8775- if (i != ((long int) (sizeof (ac__type_sizeof_))))
8776- return 1;
8777+ long i = longval ();
8778+ if (i != ((long) (sizeof (long long))))
8779+ exit (1);
8780 fprintf (f, "%ld\n", i);
8781 }
8782 else
8783 {
8784- unsigned long int i = ulongval ();
8785- if (i != ((long int) (sizeof (ac__type_sizeof_))))
8786- return 1;
8787+ unsigned long i = ulongval ();
8788+ if (i != ((long) (sizeof (long long))))
8789+ exit (1);
8790 fprintf (f, "%lu\n", i);
8791 }
8792- return ferror (f) || fclose (f) != 0;
8793+ exit (ferror (f) || fclose (f) != 0);
8794
8795 ;
8796 return 0;
8797 }
8798 _ACEOF
8799 rm -f conftest$ac_exeext
8800-if { (ac_try="$ac_link"
8801-case "(($ac_try" in
8802- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8803- *) ac_try_echo=$ac_try;;
8804-esac
8805-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8806- (eval "$ac_link") 2>&5
8807+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8808+ (eval $ac_link) 2>&5
8809 ac_status=$?
8810 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8811 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8812- { (case "(($ac_try" in
8813- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8814- *) ac_try_echo=$ac_try;;
8815-esac
8816-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8817- (eval "$ac_try") 2>&5
8818+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8819+ (eval $ac_try) 2>&5
8820 ac_status=$?
8821 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8822 (exit $ac_status); }; }; then
8823@@ -7274,32 +6479,29 @@
8824 sed 's/^/| /' conftest.$ac_ext >&5
8825
8826 ( exit $ac_status )
8827-if test "$ac_cv_type_long_long" = yes; then
8828- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
8829+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
8830 See \`config.log' for more details." >&5
8831-echo "$as_me: error: cannot compute sizeof (long long)
8832+echo "$as_me: error: cannot compute sizeof (long long), 77
8833 See \`config.log' for more details." >&2;}
8834- { (exit 77); exit 77; }; }
8835- else
8836- ac_cv_sizeof_long_long=0
8837- fi
8838+ { (exit 1); exit 1; }; }
8839+fi
8840+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8841 fi
8842-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8843 fi
8844 rm -f conftest.val
8845+else
8846+ ac_cv_sizeof_long_long=0
8847 fi
8848-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
8849-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
8850-
8851-
8852-
8853+fi
8854+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
8855+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
8856 cat >>confdefs.h <<_ACEOF
8857 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
8858 _ACEOF
8859
8860
8861-{ echo "$as_me:$LINENO: checking for __int64" >&5
8862-echo $ECHO_N "checking for __int64... $ECHO_C" >&6; }
8863+echo "$as_me:$LINENO: checking for __int64" >&5
8864+echo $ECHO_N "checking for __int64... $ECHO_C" >&6
8865 if test "${ac_cv_type___int64+set}" = set; then
8866 echo $ECHO_N "(cached) $ECHO_C" >&6
8867 else
8868@@ -7310,57 +6512,60 @@
8869 cat >>conftest.$ac_ext <<_ACEOF
8870 /* end confdefs.h. */
8871 $ac_includes_default
8872-typedef __int64 ac__type_new_;
8873 int
8874 main ()
8875 {
8876-if ((ac__type_new_ *) 0)
8877+if ((__int64 *) 0)
8878 return 0;
8879-if (sizeof (ac__type_new_))
8880+if (sizeof (__int64))
8881 return 0;
8882 ;
8883 return 0;
8884 }
8885 _ACEOF
8886 rm -f conftest.$ac_objext
8887-if { (ac_try="$ac_compile"
8888-case "(($ac_try" in
8889- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8890- *) ac_try_echo=$ac_try;;
8891-esac
8892-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8893- (eval "$ac_compile") 2>conftest.er1
8894+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8895+ (eval $ac_compile) 2>conftest.er1
8896 ac_status=$?
8897 grep -v '^ *+' conftest.er1 >conftest.err
8898 rm -f conftest.er1
8899 cat conftest.err >&5
8900 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8901- (exit $ac_status); } && {
8902- test -z "$ac_c_werror_flag" ||
8903- test ! -s conftest.err
8904- } && test -s conftest.$ac_objext; then
8905+ (exit $ac_status); } &&
8906+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8907+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8908+ (eval $ac_try) 2>&5
8909+ ac_status=$?
8910+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8911+ (exit $ac_status); }; } &&
8912+ { ac_try='test -s conftest.$ac_objext'
8913+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8914+ (eval $ac_try) 2>&5
8915+ ac_status=$?
8916+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8917+ (exit $ac_status); }; }; then
8918 ac_cv_type___int64=yes
8919 else
8920 echo "$as_me: failed program was:" >&5
8921 sed 's/^/| /' conftest.$ac_ext >&5
8922
8923- ac_cv_type___int64=no
8924+ac_cv_type___int64=no
8925 fi
8926-
8927-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8928+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
8929 fi
8930-{ echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
8931-echo "${ECHO_T}$ac_cv_type___int64" >&6; }
8932+echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
8933+echo "${ECHO_T}$ac_cv_type___int64" >&6
8934
8935-# The cast to long int works around a bug in the HP C Compiler
8936-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
8937-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
8938-# This bug is HP SR number 8606223364.
8939-{ echo "$as_me:$LINENO: checking size of __int64" >&5
8940-echo $ECHO_N "checking size of __int64... $ECHO_C" >&6; }
8941+echo "$as_me:$LINENO: checking size of __int64" >&5
8942+echo $ECHO_N "checking size of __int64... $ECHO_C" >&6
8943 if test "${ac_cv_sizeof___int64+set}" = set; then
8944 echo $ECHO_N "(cached) $ECHO_C" >&6
8945 else
8946+ if test "$ac_cv_type___int64" = yes; then
8947+ # The cast to unsigned long works around a bug in the HP C Compiler
8948+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
8949+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
8950+ # This bug is HP SR number 8606223364.
8951 if test "$cross_compiling" = yes; then
8952 # Depending upon the size, compute the lo and hi bounds.
8953 cat >conftest.$ac_ext <<_ACEOF
8954@@ -7370,11 +6575,10 @@
8955 cat >>conftest.$ac_ext <<_ACEOF
8956 /* end confdefs.h. */
8957 $ac_includes_default
8958- typedef __int64 ac__type_sizeof_;
8959 int
8960 main ()
8961 {
8962-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
8963+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) >= 0)];
8964 test_array [0] = 0
8965
8966 ;
8967@@ -7382,22 +6586,26 @@
8968 }
8969 _ACEOF
8970 rm -f conftest.$ac_objext
8971-if { (ac_try="$ac_compile"
8972-case "(($ac_try" in
8973- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8974- *) ac_try_echo=$ac_try;;
8975-esac
8976-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8977- (eval "$ac_compile") 2>conftest.er1
8978+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8979+ (eval $ac_compile) 2>conftest.er1
8980 ac_status=$?
8981 grep -v '^ *+' conftest.er1 >conftest.err
8982 rm -f conftest.er1
8983 cat conftest.err >&5
8984 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8985- (exit $ac_status); } && {
8986- test -z "$ac_c_werror_flag" ||
8987- test ! -s conftest.err
8988- } && test -s conftest.$ac_objext; then
8989+ (exit $ac_status); } &&
8990+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8991+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8992+ (eval $ac_try) 2>&5
8993+ ac_status=$?
8994+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
8995+ (exit $ac_status); }; } &&
8996+ { ac_try='test -s conftest.$ac_objext'
8997+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8998+ (eval $ac_try) 2>&5
8999+ ac_status=$?
9000+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9001+ (exit $ac_status); }; }; then
9002 ac_lo=0 ac_mid=0
9003 while :; do
9004 cat >conftest.$ac_ext <<_ACEOF
9005@@ -7407,11 +6615,10 @@
9006 cat >>conftest.$ac_ext <<_ACEOF
9007 /* end confdefs.h. */
9008 $ac_includes_default
9009- typedef __int64 ac__type_sizeof_;
9010 int
9011 main ()
9012 {
9013-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
9014+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) <= $ac_mid)];
9015 test_array [0] = 0
9016
9017 ;
9018@@ -7419,53 +6626,55 @@
9019 }
9020 _ACEOF
9021 rm -f conftest.$ac_objext
9022-if { (ac_try="$ac_compile"
9023-case "(($ac_try" in
9024- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9025- *) ac_try_echo=$ac_try;;
9026-esac
9027-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9028- (eval "$ac_compile") 2>conftest.er1
9029+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9030+ (eval $ac_compile) 2>conftest.er1
9031 ac_status=$?
9032 grep -v '^ *+' conftest.er1 >conftest.err
9033 rm -f conftest.er1
9034 cat conftest.err >&5
9035 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9036- (exit $ac_status); } && {
9037- test -z "$ac_c_werror_flag" ||
9038- test ! -s conftest.err
9039- } && test -s conftest.$ac_objext; then
9040+ (exit $ac_status); } &&
9041+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9042+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9043+ (eval $ac_try) 2>&5
9044+ ac_status=$?
9045+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9046+ (exit $ac_status); }; } &&
9047+ { ac_try='test -s conftest.$ac_objext'
9048+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9049+ (eval $ac_try) 2>&5
9050+ ac_status=$?
9051+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9052+ (exit $ac_status); }; }; then
9053 ac_hi=$ac_mid; break
9054 else
9055 echo "$as_me: failed program was:" >&5
9056 sed 's/^/| /' conftest.$ac_ext >&5
9057
9058- ac_lo=`expr $ac_mid + 1`
9059- if test $ac_lo -le $ac_mid; then
9060- ac_lo= ac_hi=
9061- break
9062- fi
9063- ac_mid=`expr 2 '*' $ac_mid + 1`
9064+ac_lo=`expr $ac_mid + 1`
9065+ if test $ac_lo -le $ac_mid; then
9066+ ac_lo= ac_hi=
9067+ break
9068+ fi
9069+ ac_mid=`expr 2 '*' $ac_mid + 1`
9070 fi
9071-
9072-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9073+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9074 done
9075 else
9076 echo "$as_me: failed program was:" >&5
9077 sed 's/^/| /' conftest.$ac_ext >&5
9078
9079- cat >conftest.$ac_ext <<_ACEOF
9080+cat >conftest.$ac_ext <<_ACEOF
9081 /* confdefs.h. */
9082 _ACEOF
9083 cat confdefs.h >>conftest.$ac_ext
9084 cat >>conftest.$ac_ext <<_ACEOF
9085 /* end confdefs.h. */
9086 $ac_includes_default
9087- typedef __int64 ac__type_sizeof_;
9088 int
9089 main ()
9090 {
9091-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
9092+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) < 0)];
9093 test_array [0] = 0
9094
9095 ;
9096@@ -7473,22 +6682,26 @@
9097 }
9098 _ACEOF
9099 rm -f conftest.$ac_objext
9100-if { (ac_try="$ac_compile"
9101-case "(($ac_try" in
9102- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9103- *) ac_try_echo=$ac_try;;
9104-esac
9105-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9106- (eval "$ac_compile") 2>conftest.er1
9107+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9108+ (eval $ac_compile) 2>conftest.er1
9109 ac_status=$?
9110 grep -v '^ *+' conftest.er1 >conftest.err
9111 rm -f conftest.er1
9112 cat conftest.err >&5
9113 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9114- (exit $ac_status); } && {
9115- test -z "$ac_c_werror_flag" ||
9116- test ! -s conftest.err
9117- } && test -s conftest.$ac_objext; then
9118+ (exit $ac_status); } &&
9119+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9120+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9121+ (eval $ac_try) 2>&5
9122+ ac_status=$?
9123+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9124+ (exit $ac_status); }; } &&
9125+ { ac_try='test -s conftest.$ac_objext'
9126+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9127+ (eval $ac_try) 2>&5
9128+ ac_status=$?
9129+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9130+ (exit $ac_status); }; }; then
9131 ac_hi=-1 ac_mid=-1
9132 while :; do
9133 cat >conftest.$ac_ext <<_ACEOF
9134@@ -7498,11 +6711,10 @@
9135 cat >>conftest.$ac_ext <<_ACEOF
9136 /* end confdefs.h. */
9137 $ac_includes_default
9138- typedef __int64 ac__type_sizeof_;
9139 int
9140 main ()
9141 {
9142-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
9143+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) >= $ac_mid)];
9144 test_array [0] = 0
9145
9146 ;
9147@@ -7510,48 +6722,49 @@
9148 }
9149 _ACEOF
9150 rm -f conftest.$ac_objext
9151-if { (ac_try="$ac_compile"
9152-case "(($ac_try" in
9153- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9154- *) ac_try_echo=$ac_try;;
9155-esac
9156-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9157- (eval "$ac_compile") 2>conftest.er1
9158+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9159+ (eval $ac_compile) 2>conftest.er1
9160 ac_status=$?
9161 grep -v '^ *+' conftest.er1 >conftest.err
9162 rm -f conftest.er1
9163 cat conftest.err >&5
9164 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9165- (exit $ac_status); } && {
9166- test -z "$ac_c_werror_flag" ||
9167- test ! -s conftest.err
9168- } && test -s conftest.$ac_objext; then
9169+ (exit $ac_status); } &&
9170+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9171+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9172+ (eval $ac_try) 2>&5
9173+ ac_status=$?
9174+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9175+ (exit $ac_status); }; } &&
9176+ { ac_try='test -s conftest.$ac_objext'
9177+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9178+ (eval $ac_try) 2>&5
9179+ ac_status=$?
9180+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9181+ (exit $ac_status); }; }; then
9182 ac_lo=$ac_mid; break
9183 else
9184 echo "$as_me: failed program was:" >&5
9185 sed 's/^/| /' conftest.$ac_ext >&5
9186
9187- ac_hi=`expr '(' $ac_mid ')' - 1`
9188- if test $ac_mid -le $ac_hi; then
9189- ac_lo= ac_hi=
9190- break
9191- fi
9192- ac_mid=`expr 2 '*' $ac_mid`
9193+ac_hi=`expr '(' $ac_mid ')' - 1`
9194+ if test $ac_mid -le $ac_hi; then
9195+ ac_lo= ac_hi=
9196+ break
9197+ fi
9198+ ac_mid=`expr 2 '*' $ac_mid`
9199 fi
9200-
9201-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9202+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9203 done
9204 else
9205 echo "$as_me: failed program was:" >&5
9206 sed 's/^/| /' conftest.$ac_ext >&5
9207
9208- ac_lo= ac_hi=
9209+ac_lo= ac_hi=
9210 fi
9211-
9212-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9213+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9214 fi
9215-
9216-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9217+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9218 # Binary search between lo and hi bounds.
9219 while test "x$ac_lo" != "x$ac_hi"; do
9220 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
9221@@ -7562,11 +6775,10 @@
9222 cat >>conftest.$ac_ext <<_ACEOF
9223 /* end confdefs.h. */
9224 $ac_includes_default
9225- typedef __int64 ac__type_sizeof_;
9226 int
9227 main ()
9228 {
9229-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
9230+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) <= $ac_mid)];
9231 test_array [0] = 0
9232
9233 ;
9234@@ -7574,45 +6786,49 @@
9235 }
9236 _ACEOF
9237 rm -f conftest.$ac_objext
9238-if { (ac_try="$ac_compile"
9239-case "(($ac_try" in
9240- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9241- *) ac_try_echo=$ac_try;;
9242-esac
9243-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9244- (eval "$ac_compile") 2>conftest.er1
9245+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9246+ (eval $ac_compile) 2>conftest.er1
9247 ac_status=$?
9248 grep -v '^ *+' conftest.er1 >conftest.err
9249 rm -f conftest.er1
9250 cat conftest.err >&5
9251 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9252- (exit $ac_status); } && {
9253- test -z "$ac_c_werror_flag" ||
9254- test ! -s conftest.err
9255- } && test -s conftest.$ac_objext; then
9256+ (exit $ac_status); } &&
9257+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9258+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9259+ (eval $ac_try) 2>&5
9260+ ac_status=$?
9261+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9262+ (exit $ac_status); }; } &&
9263+ { ac_try='test -s conftest.$ac_objext'
9264+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9265+ (eval $ac_try) 2>&5
9266+ ac_status=$?
9267+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9268+ (exit $ac_status); }; }; then
9269 ac_hi=$ac_mid
9270 else
9271 echo "$as_me: failed program was:" >&5
9272 sed 's/^/| /' conftest.$ac_ext >&5
9273
9274- ac_lo=`expr '(' $ac_mid ')' + 1`
9275+ac_lo=`expr '(' $ac_mid ')' + 1`
9276 fi
9277-
9278-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9279+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9280 done
9281 case $ac_lo in
9282 ?*) ac_cv_sizeof___int64=$ac_lo;;
9283-'') if test "$ac_cv_type___int64" = yes; then
9284- { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
9285+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64), 77
9286 See \`config.log' for more details." >&5
9287-echo "$as_me: error: cannot compute sizeof (__int64)
9288+echo "$as_me: error: cannot compute sizeof (__int64), 77
9289 See \`config.log' for more details." >&2;}
9290- { (exit 77); exit 77; }; }
9291- else
9292- ac_cv_sizeof___int64=0
9293- fi ;;
9294+ { (exit 1); exit 1; }; } ;;
9295 esac
9296 else
9297+ if test "$cross_compiling" = yes; then
9298+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
9299+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
9300+ { (exit 1); exit 1; }; }
9301+else
9302 cat >conftest.$ac_ext <<_ACEOF
9303 /* confdefs.h. */
9304 _ACEOF
9305@@ -7620,9 +6836,8 @@
9306 cat >>conftest.$ac_ext <<_ACEOF
9307 /* end confdefs.h. */
9308 $ac_includes_default
9309- typedef __int64 ac__type_sizeof_;
9310-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
9311-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
9312+long longval () { return (long) (sizeof (__int64)); }
9313+unsigned long ulongval () { return (long) (sizeof (__int64)); }
9314 #include <stdio.h>
9315 #include <stdlib.h>
9316 int
9317@@ -7631,44 +6846,35 @@
9318
9319 FILE *f = fopen ("conftest.val", "w");
9320 if (! f)
9321- return 1;
9322- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
9323+ exit (1);
9324+ if (((long) (sizeof (__int64))) < 0)
9325 {
9326- long int i = longval ();
9327- if (i != ((long int) (sizeof (ac__type_sizeof_))))
9328- return 1;
9329+ long i = longval ();
9330+ if (i != ((long) (sizeof (__int64))))
9331+ exit (1);
9332 fprintf (f, "%ld\n", i);
9333 }
9334 else
9335 {
9336- unsigned long int i = ulongval ();
9337- if (i != ((long int) (sizeof (ac__type_sizeof_))))
9338- return 1;
9339+ unsigned long i = ulongval ();
9340+ if (i != ((long) (sizeof (__int64))))
9341+ exit (1);
9342 fprintf (f, "%lu\n", i);
9343 }
9344- return ferror (f) || fclose (f) != 0;
9345+ exit (ferror (f) || fclose (f) != 0);
9346
9347 ;
9348 return 0;
9349 }
9350 _ACEOF
9351 rm -f conftest$ac_exeext
9352-if { (ac_try="$ac_link"
9353-case "(($ac_try" in
9354- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9355- *) ac_try_echo=$ac_try;;
9356-esac
9357-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9358- (eval "$ac_link") 2>&5
9359+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9360+ (eval $ac_link) 2>&5
9361 ac_status=$?
9362 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9363 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9364- { (case "(($ac_try" in
9365- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9366- *) ac_try_echo=$ac_try;;
9367-esac
9368-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9369- (eval "$ac_try") 2>&5
9370+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9371+ (eval $ac_try) 2>&5
9372 ac_status=$?
9373 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9374 (exit $ac_status); }; }; then
9375@@ -7679,32 +6885,29 @@
9376 sed 's/^/| /' conftest.$ac_ext >&5
9377
9378 ( exit $ac_status )
9379-if test "$ac_cv_type___int64" = yes; then
9380- { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
9381+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64), 77
9382 See \`config.log' for more details." >&5
9383-echo "$as_me: error: cannot compute sizeof (__int64)
9384+echo "$as_me: error: cannot compute sizeof (__int64), 77
9385 See \`config.log' for more details." >&2;}
9386- { (exit 77); exit 77; }; }
9387- else
9388- ac_cv_sizeof___int64=0
9389- fi
9390+ { (exit 1); exit 1; }; }
9391+fi
9392+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9393 fi
9394-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9395 fi
9396 rm -f conftest.val
9397+else
9398+ ac_cv_sizeof___int64=0
9399 fi
9400-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
9401-echo "${ECHO_T}$ac_cv_sizeof___int64" >&6; }
9402-
9403-
9404-
9405+fi
9406+echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
9407+echo "${ECHO_T}$ac_cv_sizeof___int64" >&6
9408 cat >>confdefs.h <<_ACEOF
9409 #define SIZEOF___INT64 $ac_cv_sizeof___int64
9410 _ACEOF
9411
9412
9413-{ echo "$as_me:$LINENO: checking for off_t" >&5
9414-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
9415+echo "$as_me:$LINENO: checking for off_t" >&5
9416+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
9417 if test "${ac_cv_type_off_t+set}" = set; then
9418 echo $ECHO_N "(cached) $ECHO_C" >&6
9419 else
9420@@ -7715,57 +6918,60 @@
9421 cat >>conftest.$ac_ext <<_ACEOF
9422 /* end confdefs.h. */
9423 $ac_includes_default
9424-typedef off_t ac__type_new_;
9425 int
9426 main ()
9427 {
9428-if ((ac__type_new_ *) 0)
9429+if ((off_t *) 0)
9430 return 0;
9431-if (sizeof (ac__type_new_))
9432+if (sizeof (off_t))
9433 return 0;
9434 ;
9435 return 0;
9436 }
9437 _ACEOF
9438 rm -f conftest.$ac_objext
9439-if { (ac_try="$ac_compile"
9440-case "(($ac_try" in
9441- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9442- *) ac_try_echo=$ac_try;;
9443-esac
9444-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9445- (eval "$ac_compile") 2>conftest.er1
9446+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9447+ (eval $ac_compile) 2>conftest.er1
9448 ac_status=$?
9449 grep -v '^ *+' conftest.er1 >conftest.err
9450 rm -f conftest.er1
9451 cat conftest.err >&5
9452 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9453- (exit $ac_status); } && {
9454- test -z "$ac_c_werror_flag" ||
9455- test ! -s conftest.err
9456- } && test -s conftest.$ac_objext; then
9457+ (exit $ac_status); } &&
9458+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9459+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9460+ (eval $ac_try) 2>&5
9461+ ac_status=$?
9462+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9463+ (exit $ac_status); }; } &&
9464+ { ac_try='test -s conftest.$ac_objext'
9465+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9466+ (eval $ac_try) 2>&5
9467+ ac_status=$?
9468+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9469+ (exit $ac_status); }; }; then
9470 ac_cv_type_off_t=yes
9471 else
9472 echo "$as_me: failed program was:" >&5
9473 sed 's/^/| /' conftest.$ac_ext >&5
9474
9475- ac_cv_type_off_t=no
9476+ac_cv_type_off_t=no
9477 fi
9478-
9479-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9480+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9481 fi
9482-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
9483-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
9484+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
9485+echo "${ECHO_T}$ac_cv_type_off_t" >&6
9486
9487-# The cast to long int works around a bug in the HP C Compiler
9488-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
9489-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
9490-# This bug is HP SR number 8606223364.
9491-{ echo "$as_me:$LINENO: checking size of off_t" >&5
9492-echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
9493+echo "$as_me:$LINENO: checking size of off_t" >&5
9494+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
9495 if test "${ac_cv_sizeof_off_t+set}" = set; then
9496 echo $ECHO_N "(cached) $ECHO_C" >&6
9497 else
9498+ if test "$ac_cv_type_off_t" = yes; then
9499+ # The cast to unsigned long works around a bug in the HP C Compiler
9500+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
9501+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
9502+ # This bug is HP SR number 8606223364.
9503 if test "$cross_compiling" = yes; then
9504 # Depending upon the size, compute the lo and hi bounds.
9505 cat >conftest.$ac_ext <<_ACEOF
9506@@ -7775,11 +6981,10 @@
9507 cat >>conftest.$ac_ext <<_ACEOF
9508 /* end confdefs.h. */
9509 $ac_includes_default
9510- typedef off_t ac__type_sizeof_;
9511 int
9512 main ()
9513 {
9514-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
9515+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)];
9516 test_array [0] = 0
9517
9518 ;
9519@@ -7787,22 +6992,26 @@
9520 }
9521 _ACEOF
9522 rm -f conftest.$ac_objext
9523-if { (ac_try="$ac_compile"
9524-case "(($ac_try" in
9525- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9526- *) ac_try_echo=$ac_try;;
9527-esac
9528-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9529- (eval "$ac_compile") 2>conftest.er1
9530+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9531+ (eval $ac_compile) 2>conftest.er1
9532 ac_status=$?
9533 grep -v '^ *+' conftest.er1 >conftest.err
9534 rm -f conftest.er1
9535 cat conftest.err >&5
9536 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9537- (exit $ac_status); } && {
9538- test -z "$ac_c_werror_flag" ||
9539- test ! -s conftest.err
9540- } && test -s conftest.$ac_objext; then
9541+ (exit $ac_status); } &&
9542+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9543+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9544+ (eval $ac_try) 2>&5
9545+ ac_status=$?
9546+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9547+ (exit $ac_status); }; } &&
9548+ { ac_try='test -s conftest.$ac_objext'
9549+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9550+ (eval $ac_try) 2>&5
9551+ ac_status=$?
9552+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9553+ (exit $ac_status); }; }; then
9554 ac_lo=0 ac_mid=0
9555 while :; do
9556 cat >conftest.$ac_ext <<_ACEOF
9557@@ -7812,11 +7021,10 @@
9558 cat >>conftest.$ac_ext <<_ACEOF
9559 /* end confdefs.h. */
9560 $ac_includes_default
9561- typedef off_t ac__type_sizeof_;
9562 int
9563 main ()
9564 {
9565-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
9566+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
9567 test_array [0] = 0
9568
9569 ;
9570@@ -7824,53 +7032,55 @@
9571 }
9572 _ACEOF
9573 rm -f conftest.$ac_objext
9574-if { (ac_try="$ac_compile"
9575-case "(($ac_try" in
9576- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9577- *) ac_try_echo=$ac_try;;
9578-esac
9579-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9580- (eval "$ac_compile") 2>conftest.er1
9581+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9582+ (eval $ac_compile) 2>conftest.er1
9583 ac_status=$?
9584 grep -v '^ *+' conftest.er1 >conftest.err
9585 rm -f conftest.er1
9586 cat conftest.err >&5
9587 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9588- (exit $ac_status); } && {
9589- test -z "$ac_c_werror_flag" ||
9590- test ! -s conftest.err
9591- } && test -s conftest.$ac_objext; then
9592+ (exit $ac_status); } &&
9593+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9594+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9595+ (eval $ac_try) 2>&5
9596+ ac_status=$?
9597+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9598+ (exit $ac_status); }; } &&
9599+ { ac_try='test -s conftest.$ac_objext'
9600+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9601+ (eval $ac_try) 2>&5
9602+ ac_status=$?
9603+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9604+ (exit $ac_status); }; }; then
9605 ac_hi=$ac_mid; break
9606 else
9607 echo "$as_me: failed program was:" >&5
9608 sed 's/^/| /' conftest.$ac_ext >&5
9609
9610- ac_lo=`expr $ac_mid + 1`
9611- if test $ac_lo -le $ac_mid; then
9612- ac_lo= ac_hi=
9613- break
9614- fi
9615- ac_mid=`expr 2 '*' $ac_mid + 1`
9616+ac_lo=`expr $ac_mid + 1`
9617+ if test $ac_lo -le $ac_mid; then
9618+ ac_lo= ac_hi=
9619+ break
9620+ fi
9621+ ac_mid=`expr 2 '*' $ac_mid + 1`
9622 fi
9623-
9624-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9625+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9626 done
9627 else
9628 echo "$as_me: failed program was:" >&5
9629 sed 's/^/| /' conftest.$ac_ext >&5
9630
9631- cat >conftest.$ac_ext <<_ACEOF
9632+cat >conftest.$ac_ext <<_ACEOF
9633 /* confdefs.h. */
9634 _ACEOF
9635 cat confdefs.h >>conftest.$ac_ext
9636 cat >>conftest.$ac_ext <<_ACEOF
9637 /* end confdefs.h. */
9638 $ac_includes_default
9639- typedef off_t ac__type_sizeof_;
9640 int
9641 main ()
9642 {
9643-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
9644+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)];
9645 test_array [0] = 0
9646
9647 ;
9648@@ -7878,22 +7088,26 @@
9649 }
9650 _ACEOF
9651 rm -f conftest.$ac_objext
9652-if { (ac_try="$ac_compile"
9653-case "(($ac_try" in
9654- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9655- *) ac_try_echo=$ac_try;;
9656-esac
9657-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9658- (eval "$ac_compile") 2>conftest.er1
9659+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9660+ (eval $ac_compile) 2>conftest.er1
9661 ac_status=$?
9662 grep -v '^ *+' conftest.er1 >conftest.err
9663 rm -f conftest.er1
9664 cat conftest.err >&5
9665 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9666- (exit $ac_status); } && {
9667- test -z "$ac_c_werror_flag" ||
9668- test ! -s conftest.err
9669- } && test -s conftest.$ac_objext; then
9670+ (exit $ac_status); } &&
9671+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9672+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9673+ (eval $ac_try) 2>&5
9674+ ac_status=$?
9675+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9676+ (exit $ac_status); }; } &&
9677+ { ac_try='test -s conftest.$ac_objext'
9678+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9679+ (eval $ac_try) 2>&5
9680+ ac_status=$?
9681+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9682+ (exit $ac_status); }; }; then
9683 ac_hi=-1 ac_mid=-1
9684 while :; do
9685 cat >conftest.$ac_ext <<_ACEOF
9686@@ -7903,11 +7117,10 @@
9687 cat >>conftest.$ac_ext <<_ACEOF
9688 /* end confdefs.h. */
9689 $ac_includes_default
9690- typedef off_t ac__type_sizeof_;
9691 int
9692 main ()
9693 {
9694-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
9695+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)];
9696 test_array [0] = 0
9697
9698 ;
9699@@ -7915,48 +7128,49 @@
9700 }
9701 _ACEOF
9702 rm -f conftest.$ac_objext
9703-if { (ac_try="$ac_compile"
9704-case "(($ac_try" in
9705- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9706- *) ac_try_echo=$ac_try;;
9707-esac
9708-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9709- (eval "$ac_compile") 2>conftest.er1
9710+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9711+ (eval $ac_compile) 2>conftest.er1
9712 ac_status=$?
9713 grep -v '^ *+' conftest.er1 >conftest.err
9714 rm -f conftest.er1
9715 cat conftest.err >&5
9716 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9717- (exit $ac_status); } && {
9718- test -z "$ac_c_werror_flag" ||
9719- test ! -s conftest.err
9720- } && test -s conftest.$ac_objext; then
9721+ (exit $ac_status); } &&
9722+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9723+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9724+ (eval $ac_try) 2>&5
9725+ ac_status=$?
9726+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9727+ (exit $ac_status); }; } &&
9728+ { ac_try='test -s conftest.$ac_objext'
9729+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9730+ (eval $ac_try) 2>&5
9731+ ac_status=$?
9732+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9733+ (exit $ac_status); }; }; then
9734 ac_lo=$ac_mid; break
9735 else
9736 echo "$as_me: failed program was:" >&5
9737 sed 's/^/| /' conftest.$ac_ext >&5
9738
9739- ac_hi=`expr '(' $ac_mid ')' - 1`
9740- if test $ac_mid -le $ac_hi; then
9741- ac_lo= ac_hi=
9742- break
9743- fi
9744- ac_mid=`expr 2 '*' $ac_mid`
9745+ac_hi=`expr '(' $ac_mid ')' - 1`
9746+ if test $ac_mid -le $ac_hi; then
9747+ ac_lo= ac_hi=
9748+ break
9749+ fi
9750+ ac_mid=`expr 2 '*' $ac_mid`
9751 fi
9752-
9753-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9754+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9755 done
9756 else
9757 echo "$as_me: failed program was:" >&5
9758 sed 's/^/| /' conftest.$ac_ext >&5
9759
9760- ac_lo= ac_hi=
9761+ac_lo= ac_hi=
9762 fi
9763-
9764-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9765+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9766 fi
9767-
9768-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9769+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9770 # Binary search between lo and hi bounds.
9771 while test "x$ac_lo" != "x$ac_hi"; do
9772 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
9773@@ -7967,11 +7181,10 @@
9774 cat >>conftest.$ac_ext <<_ACEOF
9775 /* end confdefs.h. */
9776 $ac_includes_default
9777- typedef off_t ac__type_sizeof_;
9778 int
9779 main ()
9780 {
9781-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
9782+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
9783 test_array [0] = 0
9784
9785 ;
9786@@ -7979,45 +7192,49 @@
9787 }
9788 _ACEOF
9789 rm -f conftest.$ac_objext
9790-if { (ac_try="$ac_compile"
9791-case "(($ac_try" in
9792- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9793- *) ac_try_echo=$ac_try;;
9794-esac
9795-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9796- (eval "$ac_compile") 2>conftest.er1
9797+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9798+ (eval $ac_compile) 2>conftest.er1
9799 ac_status=$?
9800 grep -v '^ *+' conftest.er1 >conftest.err
9801 rm -f conftest.er1
9802 cat conftest.err >&5
9803 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9804- (exit $ac_status); } && {
9805- test -z "$ac_c_werror_flag" ||
9806- test ! -s conftest.err
9807- } && test -s conftest.$ac_objext; then
9808+ (exit $ac_status); } &&
9809+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9810+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9811+ (eval $ac_try) 2>&5
9812+ ac_status=$?
9813+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9814+ (exit $ac_status); }; } &&
9815+ { ac_try='test -s conftest.$ac_objext'
9816+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9817+ (eval $ac_try) 2>&5
9818+ ac_status=$?
9819+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
9820+ (exit $ac_status); }; }; then
9821 ac_hi=$ac_mid
9822 else
9823 echo "$as_me: failed program was:" >&5
9824 sed 's/^/| /' conftest.$ac_ext >&5
9825
9826- ac_lo=`expr '(' $ac_mid ')' + 1`
9827+ac_lo=`expr '(' $ac_mid ')' + 1`
9828 fi
9829-
9830-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9831+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
9832 done
9833 case $ac_lo in
9834 ?*) ac_cv_sizeof_off_t=$ac_lo;;
9835-'') if test "$ac_cv_type_off_t" = yes; then
9836- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
9837+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
9838 See \`config.log' for more details." >&5
9839-echo "$as_me: error: cannot compute sizeof (off_t)
9840+echo "$as_me: error: cannot compute sizeof (off_t), 77
9841 See \`config.log' for more details." >&2;}
9842- { (exit 77); exit 77; }; }
9843- else
9844- ac_cv_sizeof_off_t=0
9845- fi ;;
9846+ { (exit 1); exit 1; }; } ;;
9847 esac
9848 else
9849+ if test "$cross_compiling" = yes; then
9850+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
9851+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
9852+ { (exit 1); exit 1; }; }
9853+else
9854 cat >conftest.$ac_ext <<_ACEOF
9855 /* confdefs.h. */
9856 _ACEOF
9857@@ -8025,9 +7242,8 @@
9858 cat >>conftest.$ac_ext <<_ACEOF
9859 /* end confdefs.h. */
9860 $ac_includes_default
9861- typedef off_t ac__type_sizeof_;
9862-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
9863-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
9864+long longval () { return (long) (sizeof (off_t)); }
9865+unsigned long ulongval () { return (long) (sizeof (off_t)); }
9866 #include <stdio.h>
9867 #include <stdlib.h>
9868 int
9869@@ -8036,44 +7252,35 @@
9870
9871 FILE *f = fopen ("conftest.val", "w");
9872 if (! f)
9873- return 1;
9874- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
9875+ exit (1);
9876+ if (((long) (sizeof (off_t))) < 0)
9877 {
9878- long int i = longval ();
9879- if (i != ((long int) (sizeof (ac__type_sizeof_))))
9880- return 1;
9881+ long i = longval ();
9882+ if (i != ((long) (sizeof (off_t))))
9883+ exit (1);
9884 fprintf (f, "%ld\n", i);
9885 }
9886 else
9887 {
9888- unsigned long int i = ulongval ();
9889- if (i != ((long int) (sizeof (ac__type_sizeof_))))
9890- return 1;
9891+ unsigned long i = ulongval ();
9892+ if (i != ((long) (sizeof (off_t))))
9893+ exit (1);
9894 fprintf (f, "%lu\n", i);
9895 }
9896- return ferror (f) || fclose (f) != 0;
9897+ exit (ferror (f) || fclose (f) != 0);
9898
9899 ;
9900 return 0;
9901 }
9902 _ACEOF
9903 rm -f conftest$ac_exeext
9904-if { (ac_try="$ac_link"
9905-case "(($ac_try" in
9906- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9907- *) ac_try_echo=$ac_try;;
9908-esac
9909-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9910- (eval "$ac_link") 2>&5
9911+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9912+ (eval $ac_link) 2>&5
9913 ac_status=$?
9914 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9915 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9916- { (case "(($ac_try" in
9917- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9918- *) ac_try_echo=$ac_try;;
9919-esac
9920-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9921- (eval "$ac_try") 2>&5
9922+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9923+ (eval $ac_try) 2>&5
9924 ac_status=$?
9925 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9926 (exit $ac_status); }; }; then
9927@@ -8084,32 +7291,29 @@
9928 sed 's/^/| /' conftest.$ac_ext >&5
9929
9930 ( exit $ac_status )
9931-if test "$ac_cv_type_off_t" = yes; then
9932- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
9933+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
9934 See \`config.log' for more details." >&5
9935-echo "$as_me: error: cannot compute sizeof (off_t)
9936+echo "$as_me: error: cannot compute sizeof (off_t), 77
9937 See \`config.log' for more details." >&2;}
9938- { (exit 77); exit 77; }; }
9939- else
9940- ac_cv_sizeof_off_t=0
9941- fi
9942+ { (exit 1); exit 1; }; }
9943+fi
9944+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9945 fi
9946-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9947 fi
9948 rm -f conftest.val
9949+else
9950+ ac_cv_sizeof_off_t=0
9951 fi
9952-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
9953-echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
9954-
9955-
9956-
9957+fi
9958+echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
9959+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
9960 cat >>confdefs.h <<_ACEOF
9961 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
9962 _ACEOF
9963
9964
9965-{ echo "$as_me:$LINENO: checking for void*" >&5
9966-echo $ECHO_N "checking for void*... $ECHO_C" >&6; }
9967+echo "$as_me:$LINENO: checking for void*" >&5
9968+echo $ECHO_N "checking for void*... $ECHO_C" >&6
9969 if test "${ac_cv_type_voidp+set}" = set; then
9970 echo $ECHO_N "(cached) $ECHO_C" >&6
9971 else
9972@@ -8120,57 +7324,60 @@
9973 cat >>conftest.$ac_ext <<_ACEOF
9974 /* end confdefs.h. */
9975 $ac_includes_default
9976-typedef void* ac__type_new_;
9977 int
9978 main ()
9979 {
9980-if ((ac__type_new_ *) 0)
9981+if ((void* *) 0)
9982 return 0;
9983-if (sizeof (ac__type_new_))
9984+if (sizeof (void*))
9985 return 0;
9986 ;
9987 return 0;
9988 }
9989 _ACEOF
9990 rm -f conftest.$ac_objext
9991-if { (ac_try="$ac_compile"
9992-case "(($ac_try" in
9993- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9994- *) ac_try_echo=$ac_try;;
9995-esac
9996-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9997- (eval "$ac_compile") 2>conftest.er1
9998+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9999+ (eval $ac_compile) 2>conftest.er1
10000 ac_status=$?
10001 grep -v '^ *+' conftest.er1 >conftest.err
10002 rm -f conftest.er1
10003 cat conftest.err >&5
10004 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10005- (exit $ac_status); } && {
10006- test -z "$ac_c_werror_flag" ||
10007- test ! -s conftest.err
10008- } && test -s conftest.$ac_objext; then
10009+ (exit $ac_status); } &&
10010+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10011+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10012+ (eval $ac_try) 2>&5
10013+ ac_status=$?
10014+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10015+ (exit $ac_status); }; } &&
10016+ { ac_try='test -s conftest.$ac_objext'
10017+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10018+ (eval $ac_try) 2>&5
10019+ ac_status=$?
10020+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10021+ (exit $ac_status); }; }; then
10022 ac_cv_type_voidp=yes
10023 else
10024 echo "$as_me: failed program was:" >&5
10025 sed 's/^/| /' conftest.$ac_ext >&5
10026
10027- ac_cv_type_voidp=no
10028+ac_cv_type_voidp=no
10029 fi
10030-
10031-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10032+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10033 fi
10034-{ echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
10035-echo "${ECHO_T}$ac_cv_type_voidp" >&6; }
10036+echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
10037+echo "${ECHO_T}$ac_cv_type_voidp" >&6
10038
10039-# The cast to long int works around a bug in the HP C Compiler
10040-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
10041-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
10042-# This bug is HP SR number 8606223364.
10043-{ echo "$as_me:$LINENO: checking size of void*" >&5
10044-echo $ECHO_N "checking size of void*... $ECHO_C" >&6; }
10045+echo "$as_me:$LINENO: checking size of void*" >&5
10046+echo $ECHO_N "checking size of void*... $ECHO_C" >&6
10047 if test "${ac_cv_sizeof_voidp+set}" = set; then
10048 echo $ECHO_N "(cached) $ECHO_C" >&6
10049 else
10050+ if test "$ac_cv_type_voidp" = yes; then
10051+ # The cast to unsigned long works around a bug in the HP C Compiler
10052+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
10053+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
10054+ # This bug is HP SR number 8606223364.
10055 if test "$cross_compiling" = yes; then
10056 # Depending upon the size, compute the lo and hi bounds.
10057 cat >conftest.$ac_ext <<_ACEOF
10058@@ -8180,11 +7387,10 @@
10059 cat >>conftest.$ac_ext <<_ACEOF
10060 /* end confdefs.h. */
10061 $ac_includes_default
10062- typedef void* ac__type_sizeof_;
10063 int
10064 main ()
10065 {
10066-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
10067+static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= 0)];
10068 test_array [0] = 0
10069
10070 ;
10071@@ -8192,22 +7398,26 @@
10072 }
10073 _ACEOF
10074 rm -f conftest.$ac_objext
10075-if { (ac_try="$ac_compile"
10076-case "(($ac_try" in
10077- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10078- *) ac_try_echo=$ac_try;;
10079-esac
10080-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10081- (eval "$ac_compile") 2>conftest.er1
10082+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10083+ (eval $ac_compile) 2>conftest.er1
10084 ac_status=$?
10085 grep -v '^ *+' conftest.er1 >conftest.err
10086 rm -f conftest.er1
10087 cat conftest.err >&5
10088 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10089- (exit $ac_status); } && {
10090- test -z "$ac_c_werror_flag" ||
10091- test ! -s conftest.err
10092- } && test -s conftest.$ac_objext; then
10093+ (exit $ac_status); } &&
10094+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10095+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10096+ (eval $ac_try) 2>&5
10097+ ac_status=$?
10098+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10099+ (exit $ac_status); }; } &&
10100+ { ac_try='test -s conftest.$ac_objext'
10101+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10102+ (eval $ac_try) 2>&5
10103+ ac_status=$?
10104+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10105+ (exit $ac_status); }; }; then
10106 ac_lo=0 ac_mid=0
10107 while :; do
10108 cat >conftest.$ac_ext <<_ACEOF
10109@@ -8217,11 +7427,10 @@
10110 cat >>conftest.$ac_ext <<_ACEOF
10111 /* end confdefs.h. */
10112 $ac_includes_default
10113- typedef void* ac__type_sizeof_;
10114 int
10115 main ()
10116 {
10117-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
10118+static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
10119 test_array [0] = 0
10120
10121 ;
10122@@ -8229,53 +7438,55 @@
10123 }
10124 _ACEOF
10125 rm -f conftest.$ac_objext
10126-if { (ac_try="$ac_compile"
10127-case "(($ac_try" in
10128- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10129- *) ac_try_echo=$ac_try;;
10130-esac
10131-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10132- (eval "$ac_compile") 2>conftest.er1
10133+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10134+ (eval $ac_compile) 2>conftest.er1
10135 ac_status=$?
10136 grep -v '^ *+' conftest.er1 >conftest.err
10137 rm -f conftest.er1
10138 cat conftest.err >&5
10139 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10140- (exit $ac_status); } && {
10141- test -z "$ac_c_werror_flag" ||
10142- test ! -s conftest.err
10143- } && test -s conftest.$ac_objext; then
10144+ (exit $ac_status); } &&
10145+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10146+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10147+ (eval $ac_try) 2>&5
10148+ ac_status=$?
10149+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10150+ (exit $ac_status); }; } &&
10151+ { ac_try='test -s conftest.$ac_objext'
10152+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10153+ (eval $ac_try) 2>&5
10154+ ac_status=$?
10155+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10156+ (exit $ac_status); }; }; then
10157 ac_hi=$ac_mid; break
10158 else
10159 echo "$as_me: failed program was:" >&5
10160 sed 's/^/| /' conftest.$ac_ext >&5
10161
10162- ac_lo=`expr $ac_mid + 1`
10163- if test $ac_lo -le $ac_mid; then
10164- ac_lo= ac_hi=
10165- break
10166- fi
10167- ac_mid=`expr 2 '*' $ac_mid + 1`
10168+ac_lo=`expr $ac_mid + 1`
10169+ if test $ac_lo -le $ac_mid; then
10170+ ac_lo= ac_hi=
10171+ break
10172+ fi
10173+ ac_mid=`expr 2 '*' $ac_mid + 1`
10174 fi
10175-
10176-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10177+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10178 done
10179 else
10180 echo "$as_me: failed program was:" >&5
10181 sed 's/^/| /' conftest.$ac_ext >&5
10182
10183- cat >conftest.$ac_ext <<_ACEOF
10184+cat >conftest.$ac_ext <<_ACEOF
10185 /* confdefs.h. */
10186 _ACEOF
10187 cat confdefs.h >>conftest.$ac_ext
10188 cat >>conftest.$ac_ext <<_ACEOF
10189 /* end confdefs.h. */
10190 $ac_includes_default
10191- typedef void* ac__type_sizeof_;
10192 int
10193 main ()
10194 {
10195-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
10196+static int test_array [1 - 2 * !(((long) (sizeof (void*))) < 0)];
10197 test_array [0] = 0
10198
10199 ;
10200@@ -8283,22 +7494,26 @@
10201 }
10202 _ACEOF
10203 rm -f conftest.$ac_objext
10204-if { (ac_try="$ac_compile"
10205-case "(($ac_try" in
10206- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10207- *) ac_try_echo=$ac_try;;
10208-esac
10209-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10210- (eval "$ac_compile") 2>conftest.er1
10211+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10212+ (eval $ac_compile) 2>conftest.er1
10213 ac_status=$?
10214 grep -v '^ *+' conftest.er1 >conftest.err
10215 rm -f conftest.er1
10216 cat conftest.err >&5
10217 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10218- (exit $ac_status); } && {
10219- test -z "$ac_c_werror_flag" ||
10220- test ! -s conftest.err
10221- } && test -s conftest.$ac_objext; then
10222+ (exit $ac_status); } &&
10223+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10224+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10225+ (eval $ac_try) 2>&5
10226+ ac_status=$?
10227+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10228+ (exit $ac_status); }; } &&
10229+ { ac_try='test -s conftest.$ac_objext'
10230+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10231+ (eval $ac_try) 2>&5
10232+ ac_status=$?
10233+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10234+ (exit $ac_status); }; }; then
10235 ac_hi=-1 ac_mid=-1
10236 while :; do
10237 cat >conftest.$ac_ext <<_ACEOF
10238@@ -8308,11 +7523,10 @@
10239 cat >>conftest.$ac_ext <<_ACEOF
10240 /* end confdefs.h. */
10241 $ac_includes_default
10242- typedef void* ac__type_sizeof_;
10243 int
10244 main ()
10245 {
10246-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
10247+static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= $ac_mid)];
10248 test_array [0] = 0
10249
10250 ;
10251@@ -8320,48 +7534,49 @@
10252 }
10253 _ACEOF
10254 rm -f conftest.$ac_objext
10255-if { (ac_try="$ac_compile"
10256-case "(($ac_try" in
10257- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10258- *) ac_try_echo=$ac_try;;
10259-esac
10260-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10261- (eval "$ac_compile") 2>conftest.er1
10262+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10263+ (eval $ac_compile) 2>conftest.er1
10264 ac_status=$?
10265 grep -v '^ *+' conftest.er1 >conftest.err
10266 rm -f conftest.er1
10267 cat conftest.err >&5
10268 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10269- (exit $ac_status); } && {
10270- test -z "$ac_c_werror_flag" ||
10271- test ! -s conftest.err
10272- } && test -s conftest.$ac_objext; then
10273+ (exit $ac_status); } &&
10274+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10275+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10276+ (eval $ac_try) 2>&5
10277+ ac_status=$?
10278+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10279+ (exit $ac_status); }; } &&
10280+ { ac_try='test -s conftest.$ac_objext'
10281+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10282+ (eval $ac_try) 2>&5
10283+ ac_status=$?
10284+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10285+ (exit $ac_status); }; }; then
10286 ac_lo=$ac_mid; break
10287 else
10288 echo "$as_me: failed program was:" >&5
10289 sed 's/^/| /' conftest.$ac_ext >&5
10290
10291- ac_hi=`expr '(' $ac_mid ')' - 1`
10292- if test $ac_mid -le $ac_hi; then
10293- ac_lo= ac_hi=
10294- break
10295- fi
10296- ac_mid=`expr 2 '*' $ac_mid`
10297+ac_hi=`expr '(' $ac_mid ')' - 1`
10298+ if test $ac_mid -le $ac_hi; then
10299+ ac_lo= ac_hi=
10300+ break
10301+ fi
10302+ ac_mid=`expr 2 '*' $ac_mid`
10303 fi
10304-
10305-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10306+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10307 done
10308 else
10309 echo "$as_me: failed program was:" >&5
10310 sed 's/^/| /' conftest.$ac_ext >&5
10311
10312- ac_lo= ac_hi=
10313+ac_lo= ac_hi=
10314 fi
10315-
10316-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10317+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10318 fi
10319-
10320-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10321+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10322 # Binary search between lo and hi bounds.
10323 while test "x$ac_lo" != "x$ac_hi"; do
10324 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
10325@@ -8372,11 +7587,10 @@
10326 cat >>conftest.$ac_ext <<_ACEOF
10327 /* end confdefs.h. */
10328 $ac_includes_default
10329- typedef void* ac__type_sizeof_;
10330 int
10331 main ()
10332 {
10333-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
10334+static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
10335 test_array [0] = 0
10336
10337 ;
10338@@ -8384,45 +7598,49 @@
10339 }
10340 _ACEOF
10341 rm -f conftest.$ac_objext
10342-if { (ac_try="$ac_compile"
10343-case "(($ac_try" in
10344- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10345- *) ac_try_echo=$ac_try;;
10346-esac
10347-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10348- (eval "$ac_compile") 2>conftest.er1
10349+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10350+ (eval $ac_compile) 2>conftest.er1
10351 ac_status=$?
10352 grep -v '^ *+' conftest.er1 >conftest.err
10353 rm -f conftest.er1
10354 cat conftest.err >&5
10355 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10356- (exit $ac_status); } && {
10357- test -z "$ac_c_werror_flag" ||
10358- test ! -s conftest.err
10359- } && test -s conftest.$ac_objext; then
10360+ (exit $ac_status); } &&
10361+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10362+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10363+ (eval $ac_try) 2>&5
10364+ ac_status=$?
10365+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10366+ (exit $ac_status); }; } &&
10367+ { ac_try='test -s conftest.$ac_objext'
10368+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10369+ (eval $ac_try) 2>&5
10370+ ac_status=$?
10371+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10372+ (exit $ac_status); }; }; then
10373 ac_hi=$ac_mid
10374 else
10375 echo "$as_me: failed program was:" >&5
10376 sed 's/^/| /' conftest.$ac_ext >&5
10377
10378- ac_lo=`expr '(' $ac_mid ')' + 1`
10379+ac_lo=`expr '(' $ac_mid ')' + 1`
10380 fi
10381-
10382-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10383+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10384 done
10385 case $ac_lo in
10386 ?*) ac_cv_sizeof_voidp=$ac_lo;;
10387-'') if test "$ac_cv_type_voidp" = yes; then
10388- { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
10389+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
10390 See \`config.log' for more details." >&5
10391-echo "$as_me: error: cannot compute sizeof (void*)
10392+echo "$as_me: error: cannot compute sizeof (void*), 77
10393 See \`config.log' for more details." >&2;}
10394- { (exit 77); exit 77; }; }
10395- else
10396- ac_cv_sizeof_voidp=0
10397- fi ;;
10398+ { (exit 1); exit 1; }; } ;;
10399 esac
10400 else
10401+ if test "$cross_compiling" = yes; then
10402+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
10403+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
10404+ { (exit 1); exit 1; }; }
10405+else
10406 cat >conftest.$ac_ext <<_ACEOF
10407 /* confdefs.h. */
10408 _ACEOF
10409@@ -8430,9 +7648,8 @@
10410 cat >>conftest.$ac_ext <<_ACEOF
10411 /* end confdefs.h. */
10412 $ac_includes_default
10413- typedef void* ac__type_sizeof_;
10414-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
10415-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
10416+long longval () { return (long) (sizeof (void*)); }
10417+unsigned long ulongval () { return (long) (sizeof (void*)); }
10418 #include <stdio.h>
10419 #include <stdlib.h>
10420 int
10421@@ -8441,44 +7658,35 @@
10422
10423 FILE *f = fopen ("conftest.val", "w");
10424 if (! f)
10425- return 1;
10426- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
10427+ exit (1);
10428+ if (((long) (sizeof (void*))) < 0)
10429 {
10430- long int i = longval ();
10431- if (i != ((long int) (sizeof (ac__type_sizeof_))))
10432- return 1;
10433+ long i = longval ();
10434+ if (i != ((long) (sizeof (void*))))
10435+ exit (1);
10436 fprintf (f, "%ld\n", i);
10437 }
10438 else
10439 {
10440- unsigned long int i = ulongval ();
10441- if (i != ((long int) (sizeof (ac__type_sizeof_))))
10442- return 1;
10443+ unsigned long i = ulongval ();
10444+ if (i != ((long) (sizeof (void*))))
10445+ exit (1);
10446 fprintf (f, "%lu\n", i);
10447 }
10448- return ferror (f) || fclose (f) != 0;
10449+ exit (ferror (f) || fclose (f) != 0);
10450
10451 ;
10452 return 0;
10453 }
10454 _ACEOF
10455 rm -f conftest$ac_exeext
10456-if { (ac_try="$ac_link"
10457-case "(($ac_try" in
10458- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10459- *) ac_try_echo=$ac_try;;
10460-esac
10461-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10462- (eval "$ac_link") 2>&5
10463+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10464+ (eval $ac_link) 2>&5
10465 ac_status=$?
10466 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10467 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10468- { (case "(($ac_try" in
10469- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10470- *) ac_try_echo=$ac_try;;
10471-esac
10472-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10473- (eval "$ac_try") 2>&5
10474+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10475+ (eval $ac_try) 2>&5
10476 ac_status=$?
10477 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10478 (exit $ac_status); }; }; then
10479@@ -8489,32 +7697,29 @@
10480 sed 's/^/| /' conftest.$ac_ext >&5
10481
10482 ( exit $ac_status )
10483-if test "$ac_cv_type_voidp" = yes; then
10484- { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
10485+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
10486 See \`config.log' for more details." >&5
10487-echo "$as_me: error: cannot compute sizeof (void*)
10488+echo "$as_me: error: cannot compute sizeof (void*), 77
10489 See \`config.log' for more details." >&2;}
10490- { (exit 77); exit 77; }; }
10491- else
10492- ac_cv_sizeof_voidp=0
10493- fi
10494+ { (exit 1); exit 1; }; }
10495+fi
10496+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10497 fi
10498-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10499 fi
10500 rm -f conftest.val
10501+else
10502+ ac_cv_sizeof_voidp=0
10503 fi
10504-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
10505-echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6; }
10506-
10507-
10508-
10509+fi
10510+echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
10511+echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6
10512 cat >>confdefs.h <<_ACEOF
10513 #define SIZEOF_VOIDP $ac_cv_sizeof_voidp
10514 _ACEOF
10515
10516
10517-{ echo "$as_me:$LINENO: checking for float" >&5
10518-echo $ECHO_N "checking for float... $ECHO_C" >&6; }
10519+echo "$as_me:$LINENO: checking for float" >&5
10520+echo $ECHO_N "checking for float... $ECHO_C" >&6
10521 if test "${ac_cv_type_float+set}" = set; then
10522 echo $ECHO_N "(cached) $ECHO_C" >&6
10523 else
10524@@ -8525,57 +7730,60 @@
10525 cat >>conftest.$ac_ext <<_ACEOF
10526 /* end confdefs.h. */
10527 $ac_includes_default
10528-typedef float ac__type_new_;
10529 int
10530 main ()
10531 {
10532-if ((ac__type_new_ *) 0)
10533+if ((float *) 0)
10534 return 0;
10535-if (sizeof (ac__type_new_))
10536+if (sizeof (float))
10537 return 0;
10538 ;
10539 return 0;
10540 }
10541 _ACEOF
10542 rm -f conftest.$ac_objext
10543-if { (ac_try="$ac_compile"
10544-case "(($ac_try" in
10545- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10546- *) ac_try_echo=$ac_try;;
10547-esac
10548-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10549- (eval "$ac_compile") 2>conftest.er1
10550+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10551+ (eval $ac_compile) 2>conftest.er1
10552 ac_status=$?
10553 grep -v '^ *+' conftest.er1 >conftest.err
10554 rm -f conftest.er1
10555 cat conftest.err >&5
10556 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10557- (exit $ac_status); } && {
10558- test -z "$ac_c_werror_flag" ||
10559- test ! -s conftest.err
10560- } && test -s conftest.$ac_objext; then
10561+ (exit $ac_status); } &&
10562+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10563+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10564+ (eval $ac_try) 2>&5
10565+ ac_status=$?
10566+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10567+ (exit $ac_status); }; } &&
10568+ { ac_try='test -s conftest.$ac_objext'
10569+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10570+ (eval $ac_try) 2>&5
10571+ ac_status=$?
10572+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10573+ (exit $ac_status); }; }; then
10574 ac_cv_type_float=yes
10575 else
10576 echo "$as_me: failed program was:" >&5
10577 sed 's/^/| /' conftest.$ac_ext >&5
10578
10579- ac_cv_type_float=no
10580+ac_cv_type_float=no
10581 fi
10582-
10583-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10584+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10585 fi
10586-{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
10587-echo "${ECHO_T}$ac_cv_type_float" >&6; }
10588+echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
10589+echo "${ECHO_T}$ac_cv_type_float" >&6
10590
10591-# The cast to long int works around a bug in the HP C Compiler
10592-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
10593-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
10594-# This bug is HP SR number 8606223364.
10595-{ echo "$as_me:$LINENO: checking size of float" >&5
10596-echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
10597+echo "$as_me:$LINENO: checking size of float" >&5
10598+echo $ECHO_N "checking size of float... $ECHO_C" >&6
10599 if test "${ac_cv_sizeof_float+set}" = set; then
10600 echo $ECHO_N "(cached) $ECHO_C" >&6
10601 else
10602+ if test "$ac_cv_type_float" = yes; then
10603+ # The cast to unsigned long works around a bug in the HP C Compiler
10604+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
10605+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
10606+ # This bug is HP SR number 8606223364.
10607 if test "$cross_compiling" = yes; then
10608 # Depending upon the size, compute the lo and hi bounds.
10609 cat >conftest.$ac_ext <<_ACEOF
10610@@ -8585,11 +7793,10 @@
10611 cat >>conftest.$ac_ext <<_ACEOF
10612 /* end confdefs.h. */
10613 $ac_includes_default
10614- typedef float ac__type_sizeof_;
10615 int
10616 main ()
10617 {
10618-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
10619+static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)];
10620 test_array [0] = 0
10621
10622 ;
10623@@ -8597,22 +7804,26 @@
10624 }
10625 _ACEOF
10626 rm -f conftest.$ac_objext
10627-if { (ac_try="$ac_compile"
10628-case "(($ac_try" in
10629- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10630- *) ac_try_echo=$ac_try;;
10631-esac
10632-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10633- (eval "$ac_compile") 2>conftest.er1
10634+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10635+ (eval $ac_compile) 2>conftest.er1
10636 ac_status=$?
10637 grep -v '^ *+' conftest.er1 >conftest.err
10638 rm -f conftest.er1
10639 cat conftest.err >&5
10640 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10641- (exit $ac_status); } && {
10642- test -z "$ac_c_werror_flag" ||
10643- test ! -s conftest.err
10644- } && test -s conftest.$ac_objext; then
10645+ (exit $ac_status); } &&
10646+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10647+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10648+ (eval $ac_try) 2>&5
10649+ ac_status=$?
10650+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10651+ (exit $ac_status); }; } &&
10652+ { ac_try='test -s conftest.$ac_objext'
10653+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10654+ (eval $ac_try) 2>&5
10655+ ac_status=$?
10656+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10657+ (exit $ac_status); }; }; then
10658 ac_lo=0 ac_mid=0
10659 while :; do
10660 cat >conftest.$ac_ext <<_ACEOF
10661@@ -8622,11 +7833,10 @@
10662 cat >>conftest.$ac_ext <<_ACEOF
10663 /* end confdefs.h. */
10664 $ac_includes_default
10665- typedef float ac__type_sizeof_;
10666 int
10667 main ()
10668 {
10669-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
10670+static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
10671 test_array [0] = 0
10672
10673 ;
10674@@ -8634,53 +7844,55 @@
10675 }
10676 _ACEOF
10677 rm -f conftest.$ac_objext
10678-if { (ac_try="$ac_compile"
10679-case "(($ac_try" in
10680- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10681- *) ac_try_echo=$ac_try;;
10682-esac
10683-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10684- (eval "$ac_compile") 2>conftest.er1
10685+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10686+ (eval $ac_compile) 2>conftest.er1
10687 ac_status=$?
10688 grep -v '^ *+' conftest.er1 >conftest.err
10689 rm -f conftest.er1
10690 cat conftest.err >&5
10691 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10692- (exit $ac_status); } && {
10693- test -z "$ac_c_werror_flag" ||
10694- test ! -s conftest.err
10695- } && test -s conftest.$ac_objext; then
10696+ (exit $ac_status); } &&
10697+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10698+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10699+ (eval $ac_try) 2>&5
10700+ ac_status=$?
10701+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10702+ (exit $ac_status); }; } &&
10703+ { ac_try='test -s conftest.$ac_objext'
10704+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10705+ (eval $ac_try) 2>&5
10706+ ac_status=$?
10707+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10708+ (exit $ac_status); }; }; then
10709 ac_hi=$ac_mid; break
10710 else
10711 echo "$as_me: failed program was:" >&5
10712 sed 's/^/| /' conftest.$ac_ext >&5
10713
10714- ac_lo=`expr $ac_mid + 1`
10715- if test $ac_lo -le $ac_mid; then
10716- ac_lo= ac_hi=
10717- break
10718- fi
10719- ac_mid=`expr 2 '*' $ac_mid + 1`
10720+ac_lo=`expr $ac_mid + 1`
10721+ if test $ac_lo -le $ac_mid; then
10722+ ac_lo= ac_hi=
10723+ break
10724+ fi
10725+ ac_mid=`expr 2 '*' $ac_mid + 1`
10726 fi
10727-
10728-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10729+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10730 done
10731 else
10732 echo "$as_me: failed program was:" >&5
10733 sed 's/^/| /' conftest.$ac_ext >&5
10734
10735- cat >conftest.$ac_ext <<_ACEOF
10736+cat >conftest.$ac_ext <<_ACEOF
10737 /* confdefs.h. */
10738 _ACEOF
10739 cat confdefs.h >>conftest.$ac_ext
10740 cat >>conftest.$ac_ext <<_ACEOF
10741 /* end confdefs.h. */
10742 $ac_includes_default
10743- typedef float ac__type_sizeof_;
10744 int
10745 main ()
10746 {
10747-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
10748+static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)];
10749 test_array [0] = 0
10750
10751 ;
10752@@ -8688,22 +7900,26 @@
10753 }
10754 _ACEOF
10755 rm -f conftest.$ac_objext
10756-if { (ac_try="$ac_compile"
10757-case "(($ac_try" in
10758- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10759- *) ac_try_echo=$ac_try;;
10760-esac
10761-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10762- (eval "$ac_compile") 2>conftest.er1
10763+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10764+ (eval $ac_compile) 2>conftest.er1
10765 ac_status=$?
10766 grep -v '^ *+' conftest.er1 >conftest.err
10767 rm -f conftest.er1
10768 cat conftest.err >&5
10769 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10770- (exit $ac_status); } && {
10771- test -z "$ac_c_werror_flag" ||
10772- test ! -s conftest.err
10773- } && test -s conftest.$ac_objext; then
10774+ (exit $ac_status); } &&
10775+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10776+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10777+ (eval $ac_try) 2>&5
10778+ ac_status=$?
10779+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10780+ (exit $ac_status); }; } &&
10781+ { ac_try='test -s conftest.$ac_objext'
10782+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10783+ (eval $ac_try) 2>&5
10784+ ac_status=$?
10785+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10786+ (exit $ac_status); }; }; then
10787 ac_hi=-1 ac_mid=-1
10788 while :; do
10789 cat >conftest.$ac_ext <<_ACEOF
10790@@ -8713,11 +7929,10 @@
10791 cat >>conftest.$ac_ext <<_ACEOF
10792 /* end confdefs.h. */
10793 $ac_includes_default
10794- typedef float ac__type_sizeof_;
10795 int
10796 main ()
10797 {
10798-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
10799+static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)];
10800 test_array [0] = 0
10801
10802 ;
10803@@ -8725,48 +7940,49 @@
10804 }
10805 _ACEOF
10806 rm -f conftest.$ac_objext
10807-if { (ac_try="$ac_compile"
10808-case "(($ac_try" in
10809- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10810- *) ac_try_echo=$ac_try;;
10811-esac
10812-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10813- (eval "$ac_compile") 2>conftest.er1
10814+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10815+ (eval $ac_compile) 2>conftest.er1
10816 ac_status=$?
10817 grep -v '^ *+' conftest.er1 >conftest.err
10818 rm -f conftest.er1
10819 cat conftest.err >&5
10820 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10821- (exit $ac_status); } && {
10822- test -z "$ac_c_werror_flag" ||
10823- test ! -s conftest.err
10824- } && test -s conftest.$ac_objext; then
10825+ (exit $ac_status); } &&
10826+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10827+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10828+ (eval $ac_try) 2>&5
10829+ ac_status=$?
10830+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10831+ (exit $ac_status); }; } &&
10832+ { ac_try='test -s conftest.$ac_objext'
10833+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10834+ (eval $ac_try) 2>&5
10835+ ac_status=$?
10836+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10837+ (exit $ac_status); }; }; then
10838 ac_lo=$ac_mid; break
10839 else
10840 echo "$as_me: failed program was:" >&5
10841 sed 's/^/| /' conftest.$ac_ext >&5
10842
10843- ac_hi=`expr '(' $ac_mid ')' - 1`
10844- if test $ac_mid -le $ac_hi; then
10845- ac_lo= ac_hi=
10846- break
10847- fi
10848- ac_mid=`expr 2 '*' $ac_mid`
10849+ac_hi=`expr '(' $ac_mid ')' - 1`
10850+ if test $ac_mid -le $ac_hi; then
10851+ ac_lo= ac_hi=
10852+ break
10853+ fi
10854+ ac_mid=`expr 2 '*' $ac_mid`
10855 fi
10856-
10857-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10858+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10859 done
10860 else
10861 echo "$as_me: failed program was:" >&5
10862 sed 's/^/| /' conftest.$ac_ext >&5
10863
10864- ac_lo= ac_hi=
10865+ac_lo= ac_hi=
10866 fi
10867-
10868-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10869+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10870 fi
10871-
10872-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10873+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10874 # Binary search between lo and hi bounds.
10875 while test "x$ac_lo" != "x$ac_hi"; do
10876 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
10877@@ -8777,11 +7993,10 @@
10878 cat >>conftest.$ac_ext <<_ACEOF
10879 /* end confdefs.h. */
10880 $ac_includes_default
10881- typedef float ac__type_sizeof_;
10882 int
10883 main ()
10884 {
10885-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
10886+static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
10887 test_array [0] = 0
10888
10889 ;
10890@@ -8789,45 +8004,49 @@
10891 }
10892 _ACEOF
10893 rm -f conftest.$ac_objext
10894-if { (ac_try="$ac_compile"
10895-case "(($ac_try" in
10896- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10897- *) ac_try_echo=$ac_try;;
10898-esac
10899-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10900- (eval "$ac_compile") 2>conftest.er1
10901+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10902+ (eval $ac_compile) 2>conftest.er1
10903 ac_status=$?
10904 grep -v '^ *+' conftest.er1 >conftest.err
10905 rm -f conftest.er1
10906 cat conftest.err >&5
10907 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10908- (exit $ac_status); } && {
10909- test -z "$ac_c_werror_flag" ||
10910- test ! -s conftest.err
10911- } && test -s conftest.$ac_objext; then
10912+ (exit $ac_status); } &&
10913+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10914+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10915+ (eval $ac_try) 2>&5
10916+ ac_status=$?
10917+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10918+ (exit $ac_status); }; } &&
10919+ { ac_try='test -s conftest.$ac_objext'
10920+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10921+ (eval $ac_try) 2>&5
10922+ ac_status=$?
10923+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
10924+ (exit $ac_status); }; }; then
10925 ac_hi=$ac_mid
10926 else
10927 echo "$as_me: failed program was:" >&5
10928 sed 's/^/| /' conftest.$ac_ext >&5
10929
10930- ac_lo=`expr '(' $ac_mid ')' + 1`
10931+ac_lo=`expr '(' $ac_mid ')' + 1`
10932 fi
10933-
10934-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10935+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
10936 done
10937 case $ac_lo in
10938 ?*) ac_cv_sizeof_float=$ac_lo;;
10939-'') if test "$ac_cv_type_float" = yes; then
10940- { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
10941+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
10942 See \`config.log' for more details." >&5
10943-echo "$as_me: error: cannot compute sizeof (float)
10944+echo "$as_me: error: cannot compute sizeof (float), 77
10945 See \`config.log' for more details." >&2;}
10946- { (exit 77); exit 77; }; }
10947- else
10948- ac_cv_sizeof_float=0
10949- fi ;;
10950+ { (exit 1); exit 1; }; } ;;
10951 esac
10952 else
10953+ if test "$cross_compiling" = yes; then
10954+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
10955+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
10956+ { (exit 1); exit 1; }; }
10957+else
10958 cat >conftest.$ac_ext <<_ACEOF
10959 /* confdefs.h. */
10960 _ACEOF
10961@@ -8835,9 +8054,8 @@
10962 cat >>conftest.$ac_ext <<_ACEOF
10963 /* end confdefs.h. */
10964 $ac_includes_default
10965- typedef float ac__type_sizeof_;
10966-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
10967-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
10968+long longval () { return (long) (sizeof (float)); }
10969+unsigned long ulongval () { return (long) (sizeof (float)); }
10970 #include <stdio.h>
10971 #include <stdlib.h>
10972 int
10973@@ -8846,44 +8064,35 @@
10974
10975 FILE *f = fopen ("conftest.val", "w");
10976 if (! f)
10977- return 1;
10978- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
10979+ exit (1);
10980+ if (((long) (sizeof (float))) < 0)
10981 {
10982- long int i = longval ();
10983- if (i != ((long int) (sizeof (ac__type_sizeof_))))
10984- return 1;
10985+ long i = longval ();
10986+ if (i != ((long) (sizeof (float))))
10987+ exit (1);
10988 fprintf (f, "%ld\n", i);
10989 }
10990 else
10991 {
10992- unsigned long int i = ulongval ();
10993- if (i != ((long int) (sizeof (ac__type_sizeof_))))
10994- return 1;
10995+ unsigned long i = ulongval ();
10996+ if (i != ((long) (sizeof (float))))
10997+ exit (1);
10998 fprintf (f, "%lu\n", i);
10999 }
11000- return ferror (f) || fclose (f) != 0;
11001+ exit (ferror (f) || fclose (f) != 0);
11002
11003 ;
11004 return 0;
11005 }
11006 _ACEOF
11007 rm -f conftest$ac_exeext
11008-if { (ac_try="$ac_link"
11009-case "(($ac_try" in
11010- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11011- *) ac_try_echo=$ac_try;;
11012-esac
11013-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11014- (eval "$ac_link") 2>&5
11015+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11016+ (eval $ac_link) 2>&5
11017 ac_status=$?
11018 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11019 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11020- { (case "(($ac_try" in
11021- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11022- *) ac_try_echo=$ac_try;;
11023-esac
11024-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11025- (eval "$ac_try") 2>&5
11026+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11027+ (eval $ac_try) 2>&5
11028 ac_status=$?
11029 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11030 (exit $ac_status); }; }; then
11031@@ -8894,32 +8103,29 @@
11032 sed 's/^/| /' conftest.$ac_ext >&5
11033
11034 ( exit $ac_status )
11035-if test "$ac_cv_type_float" = yes; then
11036- { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
11037+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
11038 See \`config.log' for more details." >&5
11039-echo "$as_me: error: cannot compute sizeof (float)
11040+echo "$as_me: error: cannot compute sizeof (float), 77
11041 See \`config.log' for more details." >&2;}
11042- { (exit 77); exit 77; }; }
11043- else
11044- ac_cv_sizeof_float=0
11045- fi
11046+ { (exit 1); exit 1; }; }
11047+fi
11048+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11049 fi
11050-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11051 fi
11052 rm -f conftest.val
11053+else
11054+ ac_cv_sizeof_float=0
11055 fi
11056-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
11057-echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
11058-
11059-
11060-
11061+fi
11062+echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
11063+echo "${ECHO_T}$ac_cv_sizeof_float" >&6
11064 cat >>confdefs.h <<_ACEOF
11065 #define SIZEOF_FLOAT $ac_cv_sizeof_float
11066 _ACEOF
11067
11068
11069-{ echo "$as_me:$LINENO: checking for double" >&5
11070-echo $ECHO_N "checking for double... $ECHO_C" >&6; }
11071+echo "$as_me:$LINENO: checking for double" >&5
11072+echo $ECHO_N "checking for double... $ECHO_C" >&6
11073 if test "${ac_cv_type_double+set}" = set; then
11074 echo $ECHO_N "(cached) $ECHO_C" >&6
11075 else
11076@@ -8930,57 +8136,60 @@
11077 cat >>conftest.$ac_ext <<_ACEOF
11078 /* end confdefs.h. */
11079 $ac_includes_default
11080-typedef double ac__type_new_;
11081 int
11082 main ()
11083 {
11084-if ((ac__type_new_ *) 0)
11085+if ((double *) 0)
11086 return 0;
11087-if (sizeof (ac__type_new_))
11088+if (sizeof (double))
11089 return 0;
11090 ;
11091 return 0;
11092 }
11093 _ACEOF
11094 rm -f conftest.$ac_objext
11095-if { (ac_try="$ac_compile"
11096-case "(($ac_try" in
11097- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11098- *) ac_try_echo=$ac_try;;
11099-esac
11100-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11101- (eval "$ac_compile") 2>conftest.er1
11102+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11103+ (eval $ac_compile) 2>conftest.er1
11104 ac_status=$?
11105 grep -v '^ *+' conftest.er1 >conftest.err
11106 rm -f conftest.er1
11107 cat conftest.err >&5
11108 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11109- (exit $ac_status); } && {
11110- test -z "$ac_c_werror_flag" ||
11111- test ! -s conftest.err
11112- } && test -s conftest.$ac_objext; then
11113+ (exit $ac_status); } &&
11114+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11115+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11116+ (eval $ac_try) 2>&5
11117+ ac_status=$?
11118+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11119+ (exit $ac_status); }; } &&
11120+ { ac_try='test -s conftest.$ac_objext'
11121+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11122+ (eval $ac_try) 2>&5
11123+ ac_status=$?
11124+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11125+ (exit $ac_status); }; }; then
11126 ac_cv_type_double=yes
11127 else
11128 echo "$as_me: failed program was:" >&5
11129 sed 's/^/| /' conftest.$ac_ext >&5
11130
11131- ac_cv_type_double=no
11132+ac_cv_type_double=no
11133 fi
11134-
11135-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11136+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11137 fi
11138-{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
11139-echo "${ECHO_T}$ac_cv_type_double" >&6; }
11140+echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
11141+echo "${ECHO_T}$ac_cv_type_double" >&6
11142
11143-# The cast to long int works around a bug in the HP C Compiler
11144-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
11145-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
11146-# This bug is HP SR number 8606223364.
11147-{ echo "$as_me:$LINENO: checking size of double" >&5
11148-echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
11149+echo "$as_me:$LINENO: checking size of double" >&5
11150+echo $ECHO_N "checking size of double... $ECHO_C" >&6
11151 if test "${ac_cv_sizeof_double+set}" = set; then
11152 echo $ECHO_N "(cached) $ECHO_C" >&6
11153 else
11154+ if test "$ac_cv_type_double" = yes; then
11155+ # The cast to unsigned long works around a bug in the HP C Compiler
11156+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
11157+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
11158+ # This bug is HP SR number 8606223364.
11159 if test "$cross_compiling" = yes; then
11160 # Depending upon the size, compute the lo and hi bounds.
11161 cat >conftest.$ac_ext <<_ACEOF
11162@@ -8990,11 +8199,10 @@
11163 cat >>conftest.$ac_ext <<_ACEOF
11164 /* end confdefs.h. */
11165 $ac_includes_default
11166- typedef double ac__type_sizeof_;
11167 int
11168 main ()
11169 {
11170-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
11171+static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)];
11172 test_array [0] = 0
11173
11174 ;
11175@@ -9002,22 +8210,26 @@
11176 }
11177 _ACEOF
11178 rm -f conftest.$ac_objext
11179-if { (ac_try="$ac_compile"
11180-case "(($ac_try" in
11181- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11182- *) ac_try_echo=$ac_try;;
11183-esac
11184-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11185- (eval "$ac_compile") 2>conftest.er1
11186+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11187+ (eval $ac_compile) 2>conftest.er1
11188 ac_status=$?
11189 grep -v '^ *+' conftest.er1 >conftest.err
11190 rm -f conftest.er1
11191 cat conftest.err >&5
11192 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11193- (exit $ac_status); } && {
11194- test -z "$ac_c_werror_flag" ||
11195- test ! -s conftest.err
11196- } && test -s conftest.$ac_objext; then
11197+ (exit $ac_status); } &&
11198+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11199+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11200+ (eval $ac_try) 2>&5
11201+ ac_status=$?
11202+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11203+ (exit $ac_status); }; } &&
11204+ { ac_try='test -s conftest.$ac_objext'
11205+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11206+ (eval $ac_try) 2>&5
11207+ ac_status=$?
11208+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11209+ (exit $ac_status); }; }; then
11210 ac_lo=0 ac_mid=0
11211 while :; do
11212 cat >conftest.$ac_ext <<_ACEOF
11213@@ -9027,11 +8239,10 @@
11214 cat >>conftest.$ac_ext <<_ACEOF
11215 /* end confdefs.h. */
11216 $ac_includes_default
11217- typedef double ac__type_sizeof_;
11218 int
11219 main ()
11220 {
11221-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
11222+static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
11223 test_array [0] = 0
11224
11225 ;
11226@@ -9039,53 +8250,55 @@
11227 }
11228 _ACEOF
11229 rm -f conftest.$ac_objext
11230-if { (ac_try="$ac_compile"
11231-case "(($ac_try" in
11232- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11233- *) ac_try_echo=$ac_try;;
11234-esac
11235-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11236- (eval "$ac_compile") 2>conftest.er1
11237+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11238+ (eval $ac_compile) 2>conftest.er1
11239 ac_status=$?
11240 grep -v '^ *+' conftest.er1 >conftest.err
11241 rm -f conftest.er1
11242 cat conftest.err >&5
11243 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11244- (exit $ac_status); } && {
11245- test -z "$ac_c_werror_flag" ||
11246- test ! -s conftest.err
11247- } && test -s conftest.$ac_objext; then
11248+ (exit $ac_status); } &&
11249+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11250+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11251+ (eval $ac_try) 2>&5
11252+ ac_status=$?
11253+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11254+ (exit $ac_status); }; } &&
11255+ { ac_try='test -s conftest.$ac_objext'
11256+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11257+ (eval $ac_try) 2>&5
11258+ ac_status=$?
11259+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11260+ (exit $ac_status); }; }; then
11261 ac_hi=$ac_mid; break
11262 else
11263 echo "$as_me: failed program was:" >&5
11264 sed 's/^/| /' conftest.$ac_ext >&5
11265
11266- ac_lo=`expr $ac_mid + 1`
11267- if test $ac_lo -le $ac_mid; then
11268- ac_lo= ac_hi=
11269- break
11270- fi
11271- ac_mid=`expr 2 '*' $ac_mid + 1`
11272+ac_lo=`expr $ac_mid + 1`
11273+ if test $ac_lo -le $ac_mid; then
11274+ ac_lo= ac_hi=
11275+ break
11276+ fi
11277+ ac_mid=`expr 2 '*' $ac_mid + 1`
11278 fi
11279-
11280-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11281+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11282 done
11283 else
11284 echo "$as_me: failed program was:" >&5
11285 sed 's/^/| /' conftest.$ac_ext >&5
11286
11287- cat >conftest.$ac_ext <<_ACEOF
11288+cat >conftest.$ac_ext <<_ACEOF
11289 /* confdefs.h. */
11290 _ACEOF
11291 cat confdefs.h >>conftest.$ac_ext
11292 cat >>conftest.$ac_ext <<_ACEOF
11293 /* end confdefs.h. */
11294 $ac_includes_default
11295- typedef double ac__type_sizeof_;
11296 int
11297 main ()
11298 {
11299-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
11300+static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)];
11301 test_array [0] = 0
11302
11303 ;
11304@@ -9093,22 +8306,26 @@
11305 }
11306 _ACEOF
11307 rm -f conftest.$ac_objext
11308-if { (ac_try="$ac_compile"
11309-case "(($ac_try" in
11310- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11311- *) ac_try_echo=$ac_try;;
11312-esac
11313-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11314- (eval "$ac_compile") 2>conftest.er1
11315+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11316+ (eval $ac_compile) 2>conftest.er1
11317 ac_status=$?
11318 grep -v '^ *+' conftest.er1 >conftest.err
11319 rm -f conftest.er1
11320 cat conftest.err >&5
11321 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11322- (exit $ac_status); } && {
11323- test -z "$ac_c_werror_flag" ||
11324- test ! -s conftest.err
11325- } && test -s conftest.$ac_objext; then
11326+ (exit $ac_status); } &&
11327+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11328+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11329+ (eval $ac_try) 2>&5
11330+ ac_status=$?
11331+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11332+ (exit $ac_status); }; } &&
11333+ { ac_try='test -s conftest.$ac_objext'
11334+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11335+ (eval $ac_try) 2>&5
11336+ ac_status=$?
11337+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11338+ (exit $ac_status); }; }; then
11339 ac_hi=-1 ac_mid=-1
11340 while :; do
11341 cat >conftest.$ac_ext <<_ACEOF
11342@@ -9118,11 +8335,10 @@
11343 cat >>conftest.$ac_ext <<_ACEOF
11344 /* end confdefs.h. */
11345 $ac_includes_default
11346- typedef double ac__type_sizeof_;
11347 int
11348 main ()
11349 {
11350-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
11351+static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)];
11352 test_array [0] = 0
11353
11354 ;
11355@@ -9130,48 +8346,49 @@
11356 }
11357 _ACEOF
11358 rm -f conftest.$ac_objext
11359-if { (ac_try="$ac_compile"
11360-case "(($ac_try" in
11361- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11362- *) ac_try_echo=$ac_try;;
11363-esac
11364-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11365- (eval "$ac_compile") 2>conftest.er1
11366+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11367+ (eval $ac_compile) 2>conftest.er1
11368 ac_status=$?
11369 grep -v '^ *+' conftest.er1 >conftest.err
11370 rm -f conftest.er1
11371 cat conftest.err >&5
11372 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11373- (exit $ac_status); } && {
11374- test -z "$ac_c_werror_flag" ||
11375- test ! -s conftest.err
11376- } && test -s conftest.$ac_objext; then
11377+ (exit $ac_status); } &&
11378+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11379+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11380+ (eval $ac_try) 2>&5
11381+ ac_status=$?
11382+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11383+ (exit $ac_status); }; } &&
11384+ { ac_try='test -s conftest.$ac_objext'
11385+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11386+ (eval $ac_try) 2>&5
11387+ ac_status=$?
11388+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11389+ (exit $ac_status); }; }; then
11390 ac_lo=$ac_mid; break
11391 else
11392 echo "$as_me: failed program was:" >&5
11393 sed 's/^/| /' conftest.$ac_ext >&5
11394
11395- ac_hi=`expr '(' $ac_mid ')' - 1`
11396- if test $ac_mid -le $ac_hi; then
11397- ac_lo= ac_hi=
11398- break
11399- fi
11400- ac_mid=`expr 2 '*' $ac_mid`
11401+ac_hi=`expr '(' $ac_mid ')' - 1`
11402+ if test $ac_mid -le $ac_hi; then
11403+ ac_lo= ac_hi=
11404+ break
11405+ fi
11406+ ac_mid=`expr 2 '*' $ac_mid`
11407 fi
11408-
11409-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11410+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11411 done
11412 else
11413 echo "$as_me: failed program was:" >&5
11414 sed 's/^/| /' conftest.$ac_ext >&5
11415
11416- ac_lo= ac_hi=
11417+ac_lo= ac_hi=
11418 fi
11419-
11420-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11421+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11422 fi
11423-
11424-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11425+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11426 # Binary search between lo and hi bounds.
11427 while test "x$ac_lo" != "x$ac_hi"; do
11428 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
11429@@ -9182,11 +8399,10 @@
11430 cat >>conftest.$ac_ext <<_ACEOF
11431 /* end confdefs.h. */
11432 $ac_includes_default
11433- typedef double ac__type_sizeof_;
11434 int
11435 main ()
11436 {
11437-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
11438+static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
11439 test_array [0] = 0
11440
11441 ;
11442@@ -9194,45 +8410,49 @@
11443 }
11444 _ACEOF
11445 rm -f conftest.$ac_objext
11446-if { (ac_try="$ac_compile"
11447-case "(($ac_try" in
11448- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11449- *) ac_try_echo=$ac_try;;
11450-esac
11451-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11452- (eval "$ac_compile") 2>conftest.er1
11453+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11454+ (eval $ac_compile) 2>conftest.er1
11455 ac_status=$?
11456 grep -v '^ *+' conftest.er1 >conftest.err
11457 rm -f conftest.er1
11458 cat conftest.err >&5
11459 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11460- (exit $ac_status); } && {
11461- test -z "$ac_c_werror_flag" ||
11462- test ! -s conftest.err
11463- } && test -s conftest.$ac_objext; then
11464+ (exit $ac_status); } &&
11465+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11466+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11467+ (eval $ac_try) 2>&5
11468+ ac_status=$?
11469+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11470+ (exit $ac_status); }; } &&
11471+ { ac_try='test -s conftest.$ac_objext'
11472+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11473+ (eval $ac_try) 2>&5
11474+ ac_status=$?
11475+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11476+ (exit $ac_status); }; }; then
11477 ac_hi=$ac_mid
11478 else
11479 echo "$as_me: failed program was:" >&5
11480 sed 's/^/| /' conftest.$ac_ext >&5
11481
11482- ac_lo=`expr '(' $ac_mid ')' + 1`
11483+ac_lo=`expr '(' $ac_mid ')' + 1`
11484 fi
11485-
11486-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11487+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11488 done
11489 case $ac_lo in
11490 ?*) ac_cv_sizeof_double=$ac_lo;;
11491-'') if test "$ac_cv_type_double" = yes; then
11492- { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
11493+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
11494 See \`config.log' for more details." >&5
11495-echo "$as_me: error: cannot compute sizeof (double)
11496+echo "$as_me: error: cannot compute sizeof (double), 77
11497 See \`config.log' for more details." >&2;}
11498- { (exit 77); exit 77; }; }
11499- else
11500- ac_cv_sizeof_double=0
11501- fi ;;
11502+ { (exit 1); exit 1; }; } ;;
11503 esac
11504 else
11505+ if test "$cross_compiling" = yes; then
11506+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
11507+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
11508+ { (exit 1); exit 1; }; }
11509+else
11510 cat >conftest.$ac_ext <<_ACEOF
11511 /* confdefs.h. */
11512 _ACEOF
11513@@ -9240,9 +8460,8 @@
11514 cat >>conftest.$ac_ext <<_ACEOF
11515 /* end confdefs.h. */
11516 $ac_includes_default
11517- typedef double ac__type_sizeof_;
11518-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
11519-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
11520+long longval () { return (long) (sizeof (double)); }
11521+unsigned long ulongval () { return (long) (sizeof (double)); }
11522 #include <stdio.h>
11523 #include <stdlib.h>
11524 int
11525@@ -9251,44 +8470,35 @@
11526
11527 FILE *f = fopen ("conftest.val", "w");
11528 if (! f)
11529- return 1;
11530- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
11531+ exit (1);
11532+ if (((long) (sizeof (double))) < 0)
11533 {
11534- long int i = longval ();
11535- if (i != ((long int) (sizeof (ac__type_sizeof_))))
11536- return 1;
11537+ long i = longval ();
11538+ if (i != ((long) (sizeof (double))))
11539+ exit (1);
11540 fprintf (f, "%ld\n", i);
11541 }
11542 else
11543 {
11544- unsigned long int i = ulongval ();
11545- if (i != ((long int) (sizeof (ac__type_sizeof_))))
11546- return 1;
11547+ unsigned long i = ulongval ();
11548+ if (i != ((long) (sizeof (double))))
11549+ exit (1);
11550 fprintf (f, "%lu\n", i);
11551 }
11552- return ferror (f) || fclose (f) != 0;
11553+ exit (ferror (f) || fclose (f) != 0);
11554
11555 ;
11556 return 0;
11557 }
11558 _ACEOF
11559 rm -f conftest$ac_exeext
11560-if { (ac_try="$ac_link"
11561-case "(($ac_try" in
11562- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11563- *) ac_try_echo=$ac_try;;
11564-esac
11565-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11566- (eval "$ac_link") 2>&5
11567+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11568+ (eval $ac_link) 2>&5
11569 ac_status=$?
11570 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11571 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11572- { (case "(($ac_try" in
11573- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11574- *) ac_try_echo=$ac_try;;
11575-esac
11576-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11577- (eval "$ac_try") 2>&5
11578+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11579+ (eval $ac_try) 2>&5
11580 ac_status=$?
11581 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11582 (exit $ac_status); }; }; then
11583@@ -9299,32 +8509,29 @@
11584 sed 's/^/| /' conftest.$ac_ext >&5
11585
11586 ( exit $ac_status )
11587-if test "$ac_cv_type_double" = yes; then
11588- { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
11589+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
11590 See \`config.log' for more details." >&5
11591-echo "$as_me: error: cannot compute sizeof (double)
11592+echo "$as_me: error: cannot compute sizeof (double), 77
11593 See \`config.log' for more details." >&2;}
11594- { (exit 77); exit 77; }; }
11595- else
11596- ac_cv_sizeof_double=0
11597- fi
11598+ { (exit 1); exit 1; }; }
11599+fi
11600+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11601 fi
11602-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11603 fi
11604 rm -f conftest.val
11605+else
11606+ ac_cv_sizeof_double=0
11607 fi
11608-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
11609-echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
11610-
11611-
11612-
11613+fi
11614+echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
11615+echo "${ECHO_T}$ac_cv_sizeof_double" >&6
11616 cat >>confdefs.h <<_ACEOF
11617 #define SIZEOF_DOUBLE $ac_cv_sizeof_double
11618 _ACEOF
11619
11620
11621-{ echo "$as_me:$LINENO: checking for time_t" >&5
11622-echo $ECHO_N "checking for time_t... $ECHO_C" >&6; }
11623+echo "$as_me:$LINENO: checking for time_t" >&5
11624+echo $ECHO_N "checking for time_t... $ECHO_C" >&6
11625 if test "${ac_cv_type_time_t+set}" = set; then
11626 echo $ECHO_N "(cached) $ECHO_C" >&6
11627 else
11628@@ -9335,57 +8542,60 @@
11629 cat >>conftest.$ac_ext <<_ACEOF
11630 /* end confdefs.h. */
11631 $ac_includes_default
11632-typedef time_t ac__type_new_;
11633 int
11634 main ()
11635 {
11636-if ((ac__type_new_ *) 0)
11637+if ((time_t *) 0)
11638 return 0;
11639-if (sizeof (ac__type_new_))
11640+if (sizeof (time_t))
11641 return 0;
11642 ;
11643 return 0;
11644 }
11645 _ACEOF
11646 rm -f conftest.$ac_objext
11647-if { (ac_try="$ac_compile"
11648-case "(($ac_try" in
11649- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11650- *) ac_try_echo=$ac_try;;
11651-esac
11652-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11653- (eval "$ac_compile") 2>conftest.er1
11654+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11655+ (eval $ac_compile) 2>conftest.er1
11656 ac_status=$?
11657 grep -v '^ *+' conftest.er1 >conftest.err
11658 rm -f conftest.er1
11659 cat conftest.err >&5
11660 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11661- (exit $ac_status); } && {
11662- test -z "$ac_c_werror_flag" ||
11663- test ! -s conftest.err
11664- } && test -s conftest.$ac_objext; then
11665+ (exit $ac_status); } &&
11666+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11667+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11668+ (eval $ac_try) 2>&5
11669+ ac_status=$?
11670+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11671+ (exit $ac_status); }; } &&
11672+ { ac_try='test -s conftest.$ac_objext'
11673+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11674+ (eval $ac_try) 2>&5
11675+ ac_status=$?
11676+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11677+ (exit $ac_status); }; }; then
11678 ac_cv_type_time_t=yes
11679 else
11680 echo "$as_me: failed program was:" >&5
11681 sed 's/^/| /' conftest.$ac_ext >&5
11682
11683- ac_cv_type_time_t=no
11684+ac_cv_type_time_t=no
11685 fi
11686-
11687-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11688+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11689 fi
11690-{ echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5
11691-echo "${ECHO_T}$ac_cv_type_time_t" >&6; }
11692+echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5
11693+echo "${ECHO_T}$ac_cv_type_time_t" >&6
11694
11695-# The cast to long int works around a bug in the HP C Compiler
11696-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
11697-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
11698-# This bug is HP SR number 8606223364.
11699-{ echo "$as_me:$LINENO: checking size of time_t" >&5
11700-echo $ECHO_N "checking size of time_t... $ECHO_C" >&6; }
11701+echo "$as_me:$LINENO: checking size of time_t" >&5
11702+echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
11703 if test "${ac_cv_sizeof_time_t+set}" = set; then
11704 echo $ECHO_N "(cached) $ECHO_C" >&6
11705 else
11706+ if test "$ac_cv_type_time_t" = yes; then
11707+ # The cast to unsigned long works around a bug in the HP C Compiler
11708+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
11709+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
11710+ # This bug is HP SR number 8606223364.
11711 if test "$cross_compiling" = yes; then
11712 # Depending upon the size, compute the lo and hi bounds.
11713 cat >conftest.$ac_ext <<_ACEOF
11714@@ -9395,11 +8605,10 @@
11715 cat >>conftest.$ac_ext <<_ACEOF
11716 /* end confdefs.h. */
11717 $ac_includes_default
11718- typedef time_t ac__type_sizeof_;
11719 int
11720 main ()
11721 {
11722-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
11723+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) >= 0)];
11724 test_array [0] = 0
11725
11726 ;
11727@@ -9407,22 +8616,26 @@
11728 }
11729 _ACEOF
11730 rm -f conftest.$ac_objext
11731-if { (ac_try="$ac_compile"
11732-case "(($ac_try" in
11733- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11734- *) ac_try_echo=$ac_try;;
11735-esac
11736-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11737- (eval "$ac_compile") 2>conftest.er1
11738+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11739+ (eval $ac_compile) 2>conftest.er1
11740 ac_status=$?
11741 grep -v '^ *+' conftest.er1 >conftest.err
11742 rm -f conftest.er1
11743 cat conftest.err >&5
11744 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11745- (exit $ac_status); } && {
11746- test -z "$ac_c_werror_flag" ||
11747- test ! -s conftest.err
11748- } && test -s conftest.$ac_objext; then
11749+ (exit $ac_status); } &&
11750+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11751+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11752+ (eval $ac_try) 2>&5
11753+ ac_status=$?
11754+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11755+ (exit $ac_status); }; } &&
11756+ { ac_try='test -s conftest.$ac_objext'
11757+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11758+ (eval $ac_try) 2>&5
11759+ ac_status=$?
11760+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11761+ (exit $ac_status); }; }; then
11762 ac_lo=0 ac_mid=0
11763 while :; do
11764 cat >conftest.$ac_ext <<_ACEOF
11765@@ -9432,11 +8645,10 @@
11766 cat >>conftest.$ac_ext <<_ACEOF
11767 /* end confdefs.h. */
11768 $ac_includes_default
11769- typedef time_t ac__type_sizeof_;
11770 int
11771 main ()
11772 {
11773-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
11774+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) <= $ac_mid)];
11775 test_array [0] = 0
11776
11777 ;
11778@@ -9444,53 +8656,55 @@
11779 }
11780 _ACEOF
11781 rm -f conftest.$ac_objext
11782-if { (ac_try="$ac_compile"
11783-case "(($ac_try" in
11784- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11785- *) ac_try_echo=$ac_try;;
11786-esac
11787-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11788- (eval "$ac_compile") 2>conftest.er1
11789+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11790+ (eval $ac_compile) 2>conftest.er1
11791 ac_status=$?
11792 grep -v '^ *+' conftest.er1 >conftest.err
11793 rm -f conftest.er1
11794 cat conftest.err >&5
11795 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11796- (exit $ac_status); } && {
11797- test -z "$ac_c_werror_flag" ||
11798- test ! -s conftest.err
11799- } && test -s conftest.$ac_objext; then
11800+ (exit $ac_status); } &&
11801+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11802+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11803+ (eval $ac_try) 2>&5
11804+ ac_status=$?
11805+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11806+ (exit $ac_status); }; } &&
11807+ { ac_try='test -s conftest.$ac_objext'
11808+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11809+ (eval $ac_try) 2>&5
11810+ ac_status=$?
11811+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11812+ (exit $ac_status); }; }; then
11813 ac_hi=$ac_mid; break
11814 else
11815 echo "$as_me: failed program was:" >&5
11816 sed 's/^/| /' conftest.$ac_ext >&5
11817
11818- ac_lo=`expr $ac_mid + 1`
11819- if test $ac_lo -le $ac_mid; then
11820- ac_lo= ac_hi=
11821- break
11822- fi
11823- ac_mid=`expr 2 '*' $ac_mid + 1`
11824+ac_lo=`expr $ac_mid + 1`
11825+ if test $ac_lo -le $ac_mid; then
11826+ ac_lo= ac_hi=
11827+ break
11828+ fi
11829+ ac_mid=`expr 2 '*' $ac_mid + 1`
11830 fi
11831-
11832-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11833+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11834 done
11835 else
11836 echo "$as_me: failed program was:" >&5
11837 sed 's/^/| /' conftest.$ac_ext >&5
11838
11839- cat >conftest.$ac_ext <<_ACEOF
11840+cat >conftest.$ac_ext <<_ACEOF
11841 /* confdefs.h. */
11842 _ACEOF
11843 cat confdefs.h >>conftest.$ac_ext
11844 cat >>conftest.$ac_ext <<_ACEOF
11845 /* end confdefs.h. */
11846 $ac_includes_default
11847- typedef time_t ac__type_sizeof_;
11848 int
11849 main ()
11850 {
11851-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
11852+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) < 0)];
11853 test_array [0] = 0
11854
11855 ;
11856@@ -9498,22 +8712,26 @@
11857 }
11858 _ACEOF
11859 rm -f conftest.$ac_objext
11860-if { (ac_try="$ac_compile"
11861-case "(($ac_try" in
11862- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11863- *) ac_try_echo=$ac_try;;
11864-esac
11865-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11866- (eval "$ac_compile") 2>conftest.er1
11867+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11868+ (eval $ac_compile) 2>conftest.er1
11869 ac_status=$?
11870 grep -v '^ *+' conftest.er1 >conftest.err
11871 rm -f conftest.er1
11872 cat conftest.err >&5
11873 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11874- (exit $ac_status); } && {
11875- test -z "$ac_c_werror_flag" ||
11876- test ! -s conftest.err
11877- } && test -s conftest.$ac_objext; then
11878+ (exit $ac_status); } &&
11879+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11880+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11881+ (eval $ac_try) 2>&5
11882+ ac_status=$?
11883+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11884+ (exit $ac_status); }; } &&
11885+ { ac_try='test -s conftest.$ac_objext'
11886+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11887+ (eval $ac_try) 2>&5
11888+ ac_status=$?
11889+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11890+ (exit $ac_status); }; }; then
11891 ac_hi=-1 ac_mid=-1
11892 while :; do
11893 cat >conftest.$ac_ext <<_ACEOF
11894@@ -9523,11 +8741,10 @@
11895 cat >>conftest.$ac_ext <<_ACEOF
11896 /* end confdefs.h. */
11897 $ac_includes_default
11898- typedef time_t ac__type_sizeof_;
11899 int
11900 main ()
11901 {
11902-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
11903+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) >= $ac_mid)];
11904 test_array [0] = 0
11905
11906 ;
11907@@ -9535,48 +8752,49 @@
11908 }
11909 _ACEOF
11910 rm -f conftest.$ac_objext
11911-if { (ac_try="$ac_compile"
11912-case "(($ac_try" in
11913- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11914- *) ac_try_echo=$ac_try;;
11915-esac
11916-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11917- (eval "$ac_compile") 2>conftest.er1
11918+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11919+ (eval $ac_compile) 2>conftest.er1
11920 ac_status=$?
11921 grep -v '^ *+' conftest.er1 >conftest.err
11922 rm -f conftest.er1
11923 cat conftest.err >&5
11924 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11925- (exit $ac_status); } && {
11926- test -z "$ac_c_werror_flag" ||
11927- test ! -s conftest.err
11928- } && test -s conftest.$ac_objext; then
11929+ (exit $ac_status); } &&
11930+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11931+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11932+ (eval $ac_try) 2>&5
11933+ ac_status=$?
11934+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11935+ (exit $ac_status); }; } &&
11936+ { ac_try='test -s conftest.$ac_objext'
11937+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11938+ (eval $ac_try) 2>&5
11939+ ac_status=$?
11940+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11941+ (exit $ac_status); }; }; then
11942 ac_lo=$ac_mid; break
11943 else
11944 echo "$as_me: failed program was:" >&5
11945 sed 's/^/| /' conftest.$ac_ext >&5
11946
11947- ac_hi=`expr '(' $ac_mid ')' - 1`
11948- if test $ac_mid -le $ac_hi; then
11949- ac_lo= ac_hi=
11950- break
11951- fi
11952- ac_mid=`expr 2 '*' $ac_mid`
11953+ac_hi=`expr '(' $ac_mid ')' - 1`
11954+ if test $ac_mid -le $ac_hi; then
11955+ ac_lo= ac_hi=
11956+ break
11957+ fi
11958+ ac_mid=`expr 2 '*' $ac_mid`
11959 fi
11960-
11961-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11962+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11963 done
11964 else
11965 echo "$as_me: failed program was:" >&5
11966 sed 's/^/| /' conftest.$ac_ext >&5
11967
11968- ac_lo= ac_hi=
11969+ac_lo= ac_hi=
11970 fi
11971-
11972-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11973+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11974 fi
11975-
11976-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11977+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11978 # Binary search between lo and hi bounds.
11979 while test "x$ac_lo" != "x$ac_hi"; do
11980 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
11981@@ -9587,11 +8805,10 @@
11982 cat >>conftest.$ac_ext <<_ACEOF
11983 /* end confdefs.h. */
11984 $ac_includes_default
11985- typedef time_t ac__type_sizeof_;
11986 int
11987 main ()
11988 {
11989-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
11990+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) <= $ac_mid)];
11991 test_array [0] = 0
11992
11993 ;
11994@@ -9599,45 +8816,49 @@
11995 }
11996 _ACEOF
11997 rm -f conftest.$ac_objext
11998-if { (ac_try="$ac_compile"
11999-case "(($ac_try" in
12000- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12001- *) ac_try_echo=$ac_try;;
12002-esac
12003-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12004- (eval "$ac_compile") 2>conftest.er1
12005+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12006+ (eval $ac_compile) 2>conftest.er1
12007 ac_status=$?
12008 grep -v '^ *+' conftest.er1 >conftest.err
12009 rm -f conftest.er1
12010 cat conftest.err >&5
12011 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12012- (exit $ac_status); } && {
12013- test -z "$ac_c_werror_flag" ||
12014- test ! -s conftest.err
12015- } && test -s conftest.$ac_objext; then
12016+ (exit $ac_status); } &&
12017+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12018+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12019+ (eval $ac_try) 2>&5
12020+ ac_status=$?
12021+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12022+ (exit $ac_status); }; } &&
12023+ { ac_try='test -s conftest.$ac_objext'
12024+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12025+ (eval $ac_try) 2>&5
12026+ ac_status=$?
12027+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12028+ (exit $ac_status); }; }; then
12029 ac_hi=$ac_mid
12030 else
12031 echo "$as_me: failed program was:" >&5
12032 sed 's/^/| /' conftest.$ac_ext >&5
12033
12034- ac_lo=`expr '(' $ac_mid ')' + 1`
12035+ac_lo=`expr '(' $ac_mid ')' + 1`
12036 fi
12037-
12038-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12039+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12040 done
12041 case $ac_lo in
12042 ?*) ac_cv_sizeof_time_t=$ac_lo;;
12043-'') if test "$ac_cv_type_time_t" = yes; then
12044- { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t)
12045+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t), 77
12046 See \`config.log' for more details." >&5
12047-echo "$as_me: error: cannot compute sizeof (time_t)
12048+echo "$as_me: error: cannot compute sizeof (time_t), 77
12049 See \`config.log' for more details." >&2;}
12050- { (exit 77); exit 77; }; }
12051- else
12052- ac_cv_sizeof_time_t=0
12053- fi ;;
12054+ { (exit 1); exit 1; }; } ;;
12055 esac
12056 else
12057+ if test "$cross_compiling" = yes; then
12058+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
12059+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
12060+ { (exit 1); exit 1; }; }
12061+else
12062 cat >conftest.$ac_ext <<_ACEOF
12063 /* confdefs.h. */
12064 _ACEOF
12065@@ -9645,9 +8866,8 @@
12066 cat >>conftest.$ac_ext <<_ACEOF
12067 /* end confdefs.h. */
12068 $ac_includes_default
12069- typedef time_t ac__type_sizeof_;
12070-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
12071-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
12072+long longval () { return (long) (sizeof (time_t)); }
12073+unsigned long ulongval () { return (long) (sizeof (time_t)); }
12074 #include <stdio.h>
12075 #include <stdlib.h>
12076 int
12077@@ -9656,44 +8876,35 @@
12078
12079 FILE *f = fopen ("conftest.val", "w");
12080 if (! f)
12081- return 1;
12082- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
12083+ exit (1);
12084+ if (((long) (sizeof (time_t))) < 0)
12085 {
12086- long int i = longval ();
12087- if (i != ((long int) (sizeof (ac__type_sizeof_))))
12088- return 1;
12089+ long i = longval ();
12090+ if (i != ((long) (sizeof (time_t))))
12091+ exit (1);
12092 fprintf (f, "%ld\n", i);
12093 }
12094 else
12095 {
12096- unsigned long int i = ulongval ();
12097- if (i != ((long int) (sizeof (ac__type_sizeof_))))
12098- return 1;
12099+ unsigned long i = ulongval ();
12100+ if (i != ((long) (sizeof (time_t))))
12101+ exit (1);
12102 fprintf (f, "%lu\n", i);
12103 }
12104- return ferror (f) || fclose (f) != 0;
12105+ exit (ferror (f) || fclose (f) != 0);
12106
12107 ;
12108 return 0;
12109 }
12110 _ACEOF
12111 rm -f conftest$ac_exeext
12112-if { (ac_try="$ac_link"
12113-case "(($ac_try" in
12114- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12115- *) ac_try_echo=$ac_try;;
12116-esac
12117-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12118- (eval "$ac_link") 2>&5
12119+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12120+ (eval $ac_link) 2>&5
12121 ac_status=$?
12122 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12123 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12124- { (case "(($ac_try" in
12125- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12126- *) ac_try_echo=$ac_try;;
12127-esac
12128-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12129- (eval "$ac_try") 2>&5
12130+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12131+ (eval $ac_try) 2>&5
12132 ac_status=$?
12133 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12134 (exit $ac_status); }; }; then
12135@@ -9704,25 +8915,22 @@
12136 sed 's/^/| /' conftest.$ac_ext >&5
12137
12138 ( exit $ac_status )
12139-if test "$ac_cv_type_time_t" = yes; then
12140- { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t)
12141+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t), 77
12142 See \`config.log' for more details." >&5
12143-echo "$as_me: error: cannot compute sizeof (time_t)
12144+echo "$as_me: error: cannot compute sizeof (time_t), 77
12145 See \`config.log' for more details." >&2;}
12146- { (exit 77); exit 77; }; }
12147- else
12148- ac_cv_sizeof_time_t=0
12149- fi
12150+ { (exit 1); exit 1; }; }
12151+fi
12152+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
12153 fi
12154-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
12155 fi
12156 rm -f conftest.val
12157+else
12158+ ac_cv_sizeof_time_t=0
12159 fi
12160-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5
12161-echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6; }
12162-
12163-
12164-
12165+fi
12166+echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5
12167+echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
12168 cat >>confdefs.h <<_ACEOF
12169 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
12170 _ACEOF
12171@@ -9731,9 +8939,9 @@
12172
12173 for id in pid_t gid_t uid_t; do
12174 as_ac_Type=`echo "ac_cv_type_$id" | $as_tr_sh`
12175-{ echo "$as_me:$LINENO: checking for $id" >&5
12176-echo $ECHO_N "checking for $id... $ECHO_C" >&6; }
12177-if { as_var=$as_ac_Type; eval "test \"\${$as_var+set}\" = set"; }; then
12178+echo "$as_me:$LINENO: checking for $id" >&5
12179+echo $ECHO_N "checking for $id... $ECHO_C" >&6
12180+if eval "test \"\${$as_ac_Type+set}\" = set"; then
12181 echo $ECHO_N "(cached) $ECHO_C" >&6
12182 else
12183 cat >conftest.$ac_ext <<_ACEOF
12184@@ -9743,48 +8951,49 @@
12185 cat >>conftest.$ac_ext <<_ACEOF
12186 /* end confdefs.h. */
12187 $ac_includes_default
12188-typedef $id ac__type_new_;
12189 int
12190 main ()
12191 {
12192-if ((ac__type_new_ *) 0)
12193+if (($id *) 0)
12194 return 0;
12195-if (sizeof (ac__type_new_))
12196+if (sizeof ($id))
12197 return 0;
12198 ;
12199 return 0;
12200 }
12201 _ACEOF
12202 rm -f conftest.$ac_objext
12203-if { (ac_try="$ac_compile"
12204-case "(($ac_try" in
12205- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12206- *) ac_try_echo=$ac_try;;
12207-esac
12208-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12209- (eval "$ac_compile") 2>conftest.er1
12210+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12211+ (eval $ac_compile) 2>conftest.er1
12212 ac_status=$?
12213 grep -v '^ *+' conftest.er1 >conftest.err
12214 rm -f conftest.er1
12215 cat conftest.err >&5
12216 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12217- (exit $ac_status); } && {
12218- test -z "$ac_c_werror_flag" ||
12219- test ! -s conftest.err
12220- } && test -s conftest.$ac_objext; then
12221+ (exit $ac_status); } &&
12222+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12223+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12224+ (eval $ac_try) 2>&5
12225+ ac_status=$?
12226+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12227+ (exit $ac_status); }; } &&
12228+ { ac_try='test -s conftest.$ac_objext'
12229+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12230+ (eval $ac_try) 2>&5
12231+ ac_status=$?
12232+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12233+ (exit $ac_status); }; }; then
12234 eval "$as_ac_Type=yes"
12235 else
12236 echo "$as_me: failed program was:" >&5
12237 sed 's/^/| /' conftest.$ac_ext >&5
12238
12239- eval "$as_ac_Type=no"
12240+eval "$as_ac_Type=no"
12241 fi
12242-
12243-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12244+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12245 fi
12246-ac_res=`eval echo '${'$as_ac_Type'}'`
12247- { echo "$as_me:$LINENO: result: $ac_res" >&5
12248-echo "${ECHO_T}$ac_res" >&6; }
12249+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Type'}'`" >&5
12250+echo "${ECHO_T}`eval echo '${'$as_ac_Type'}'`" >&6
12251 if test `eval echo '${'$as_ac_Type'}'` = yes; then
12252 typ=$id
12253 else
12254@@ -9797,8 +9006,8 @@
12255
12256 done
12257
12258-{ echo "$as_me:$LINENO: checking for prototypes" >&5
12259-echo $ECHO_N "checking for prototypes... $ECHO_C" >&6; }
12260+echo "$as_me:$LINENO: checking for prototypes" >&5
12261+echo $ECHO_N "checking for prototypes... $ECHO_C" >&6
12262 if test "${rb_cv_have_prototypes+set}" = set; then
12263 echo $ECHO_N "(cached) $ECHO_C" >&6
12264 else
12265@@ -9818,34 +9027,37 @@
12266 }
12267 _ACEOF
12268 rm -f conftest.$ac_objext
12269-if { (ac_try="$ac_compile"
12270-case "(($ac_try" in
12271- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12272- *) ac_try_echo=$ac_try;;
12273-esac
12274-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12275- (eval "$ac_compile") 2>conftest.er1
12276+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12277+ (eval $ac_compile) 2>conftest.er1
12278 ac_status=$?
12279 grep -v '^ *+' conftest.er1 >conftest.err
12280 rm -f conftest.er1
12281 cat conftest.err >&5
12282 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12283- (exit $ac_status); } && {
12284- test -z "$ac_c_werror_flag" ||
12285- test ! -s conftest.err
12286- } && test -s conftest.$ac_objext; then
12287+ (exit $ac_status); } &&
12288+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12289+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12290+ (eval $ac_try) 2>&5
12291+ ac_status=$?
12292+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12293+ (exit $ac_status); }; } &&
12294+ { ac_try='test -s conftest.$ac_objext'
12295+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12296+ (eval $ac_try) 2>&5
12297+ ac_status=$?
12298+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12299+ (exit $ac_status); }; }; then
12300 rb_cv_have_prototypes=yes
12301 else
12302 echo "$as_me: failed program was:" >&5
12303 sed 's/^/| /' conftest.$ac_ext >&5
12304
12305- rb_cv_have_prototypes=no
12306+rb_cv_have_prototypes=no
12307 fi
12308-
12309-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12310+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12311 fi
12312-{ echo "$as_me:$LINENO: result: $rb_cv_have_prototypes" >&5
12313-echo "${ECHO_T}$rb_cv_have_prototypes" >&6; }
12314+echo "$as_me:$LINENO: result: $rb_cv_have_prototypes" >&5
12315+echo "${ECHO_T}$rb_cv_have_prototypes" >&6
12316 if test "$rb_cv_have_prototypes" = yes; then
12317 cat >>confdefs.h <<\_ACEOF
12318 #define HAVE_PROTOTYPES 1
12319@@ -9853,8 +9065,8 @@
12320
12321 fi
12322
12323-{ echo "$as_me:$LINENO: checking token paste string" >&5
12324-echo $ECHO_N "checking token paste string... $ECHO_C" >&6; }
12325+echo "$as_me:$LINENO: checking token paste string" >&5
12326+echo $ECHO_N "checking token paste string... $ECHO_C" >&6
12327 if test "${rb_cv_tokenpaste+set}" = set; then
12328 echo $ECHO_N "(cached) $ECHO_C" >&6
12329 else
12330@@ -9874,34 +9086,37 @@
12331 }
12332 _ACEOF
12333 rm -f conftest.$ac_objext
12334-if { (ac_try="$ac_compile"
12335-case "(($ac_try" in
12336- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12337- *) ac_try_echo=$ac_try;;
12338-esac
12339-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12340- (eval "$ac_compile") 2>conftest.er1
12341+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12342+ (eval $ac_compile) 2>conftest.er1
12343 ac_status=$?
12344 grep -v '^ *+' conftest.er1 >conftest.err
12345 rm -f conftest.er1
12346 cat conftest.err >&5
12347 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12348- (exit $ac_status); } && {
12349- test -z "$ac_c_werror_flag" ||
12350- test ! -s conftest.err
12351- } && test -s conftest.$ac_objext; then
12352+ (exit $ac_status); } &&
12353+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12354+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12355+ (eval $ac_try) 2>&5
12356+ ac_status=$?
12357+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12358+ (exit $ac_status); }; } &&
12359+ { ac_try='test -s conftest.$ac_objext'
12360+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12361+ (eval $ac_try) 2>&5
12362+ ac_status=$?
12363+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12364+ (exit $ac_status); }; }; then
12365 rb_cv_tokenpaste=ansi
12366 else
12367 echo "$as_me: failed program was:" >&5
12368 sed 's/^/| /' conftest.$ac_ext >&5
12369
12370- rb_cv_tokenpaste=knr
12371+rb_cv_tokenpaste=knr
12372 fi
12373-
12374-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12375+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12376 fi
12377-{ echo "$as_me:$LINENO: result: $rb_cv_tokenpaste" >&5
12378-echo "${ECHO_T}$rb_cv_tokenpaste" >&6; }
12379+echo "$as_me:$LINENO: result: $rb_cv_tokenpaste" >&5
12380+echo "${ECHO_T}$rb_cv_tokenpaste" >&6
12381 if test "$rb_cv_tokenpaste" = ansi; then
12382 cat >>confdefs.h <<\_ACEOF
12383 #define TOKEN_PASTE(x,y) x##y
12384@@ -9914,8 +9129,8 @@
12385
12386 fi
12387
12388-{ echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5
12389-echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6; }
12390+echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5
12391+echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6
12392 if test "${rb_cv_stdarg+set}" = set; then
12393 echo $ECHO_N "(cached) $ECHO_C" >&6
12394 else
12395@@ -9945,34 +9160,37 @@
12396 }
12397 _ACEOF
12398 rm -f conftest.$ac_objext
12399-if { (ac_try="$ac_compile"
12400-case "(($ac_try" in
12401- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12402- *) ac_try_echo=$ac_try;;
12403-esac
12404-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12405- (eval "$ac_compile") 2>conftest.er1
12406+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12407+ (eval $ac_compile) 2>conftest.er1
12408 ac_status=$?
12409 grep -v '^ *+' conftest.er1 >conftest.err
12410 rm -f conftest.er1
12411 cat conftest.err >&5
12412 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12413- (exit $ac_status); } && {
12414- test -z "$ac_c_werror_flag" ||
12415- test ! -s conftest.err
12416- } && test -s conftest.$ac_objext; then
12417+ (exit $ac_status); } &&
12418+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12419+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12420+ (eval $ac_try) 2>&5
12421+ ac_status=$?
12422+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12423+ (exit $ac_status); }; } &&
12424+ { ac_try='test -s conftest.$ac_objext'
12425+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12426+ (eval $ac_try) 2>&5
12427+ ac_status=$?
12428+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12429+ (exit $ac_status); }; }; then
12430 rb_cv_stdarg=yes
12431 else
12432 echo "$as_me: failed program was:" >&5
12433 sed 's/^/| /' conftest.$ac_ext >&5
12434
12435- rb_cv_stdarg=no
12436+rb_cv_stdarg=no
12437 fi
12438-
12439-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12440+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12441 fi
12442-{ echo "$as_me:$LINENO: result: $rb_cv_stdarg" >&5
12443-echo "${ECHO_T}$rb_cv_stdarg" >&6; }
12444+echo "$as_me:$LINENO: result: $rb_cv_stdarg" >&5
12445+echo "${ECHO_T}$rb_cv_stdarg" >&6
12446 if test "$rb_cv_stdarg" = yes; then
12447 cat >>confdefs.h <<\_ACEOF
12448 #define HAVE_STDARG_PROTOTYPES 1
12449@@ -9982,8 +9200,8 @@
12450
12451
12452
12453- { echo "$as_me:$LINENO: checking for noreturn function attribute" >&5
12454-echo $ECHO_N "checking for noreturn function attribute... $ECHO_C" >&6; }
12455+ echo "$as_me:$LINENO: checking for noreturn function attribute" >&5
12456+echo $ECHO_N "checking for noreturn function attribute... $ECHO_C" >&6
12457 if test "${rb_cv_func_noreturn+set}" = set; then
12458 echo $ECHO_N "(cached) $ECHO_C" >&6
12459 else
12460@@ -10012,31 +9230,33 @@
12461 }
12462 _ACEOF
12463 rm -f conftest.$ac_objext
12464-if { (ac_try="$ac_compile"
12465-case "(($ac_try" in
12466- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12467- *) ac_try_echo=$ac_try;;
12468-esac
12469-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12470- (eval "$ac_compile") 2>conftest.er1
12471+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12472+ (eval $ac_compile) 2>conftest.er1
12473 ac_status=$?
12474 grep -v '^ *+' conftest.er1 >conftest.err
12475 rm -f conftest.er1
12476 cat conftest.err >&5
12477 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12478- (exit $ac_status); } && {
12479- test -z "$ac_c_werror_flag" ||
12480- test ! -s conftest.err
12481- } && test -s conftest.$ac_objext; then
12482- rb_cv_func_noreturn="$mac"; break
12483-else
12484+ (exit $ac_status); } &&
12485+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12486+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12487+ (eval $ac_try) 2>&5
12488+ ac_status=$?
12489+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12490+ (exit $ac_status); }; } &&
12491+ { ac_try='test -s conftest.$ac_objext'
12492+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12493+ (eval $ac_try) 2>&5
12494+ ac_status=$?
12495+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12496+ (exit $ac_status); }; }; then
12497+ rb_cv_func_noreturn="$mac"; break
12498+else
12499 echo "$as_me: failed program was:" >&5
12500 sed 's/^/| /' conftest.$ac_ext >&5
12501
12502-
12503 fi
12504-
12505-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12506+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12507 done
12508 if test "${rb_c_werror_flag+set}"; then
12509 ac_c_werror_flag="$rb_c_werror_flag"
12510@@ -10045,8 +9265,8 @@
12511 fi
12512
12513 fi
12514-{ echo "$as_me:$LINENO: result: $rb_cv_func_noreturn" >&5
12515-echo "${ECHO_T}$rb_cv_func_noreturn" >&6; }
12516+echo "$as_me:$LINENO: result: $rb_cv_func_noreturn" >&5
12517+echo "${ECHO_T}$rb_cv_func_noreturn" >&6
12518 cat >>confdefs.h <<_ACEOF
12519 #define NORETURN(x) $rb_cv_func_noreturn
12520 _ACEOF
12521@@ -10054,8 +9274,8 @@
12522
12523
12524
12525- { echo "$as_me:$LINENO: checking for noinline function attribute" >&5
12526-echo $ECHO_N "checking for noinline function attribute... $ECHO_C" >&6; }
12527+ echo "$as_me:$LINENO: checking for noinline function attribute" >&5
12528+echo $ECHO_N "checking for noinline function attribute... $ECHO_C" >&6
12529 if test "${rb_cv_func_noinline+set}" = set; then
12530 echo $ECHO_N "(cached) $ECHO_C" >&6
12531 else
12532@@ -10084,31 +9304,33 @@
12533 }
12534 _ACEOF
12535 rm -f conftest.$ac_objext
12536-if { (ac_try="$ac_compile"
12537-case "(($ac_try" in
12538- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12539- *) ac_try_echo=$ac_try;;
12540-esac
12541-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12542- (eval "$ac_compile") 2>conftest.er1
12543+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12544+ (eval $ac_compile) 2>conftest.er1
12545 ac_status=$?
12546 grep -v '^ *+' conftest.er1 >conftest.err
12547 rm -f conftest.er1
12548 cat conftest.err >&5
12549 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12550- (exit $ac_status); } && {
12551- test -z "$ac_c_werror_flag" ||
12552- test ! -s conftest.err
12553- } && test -s conftest.$ac_objext; then
12554+ (exit $ac_status); } &&
12555+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12556+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12557+ (eval $ac_try) 2>&5
12558+ ac_status=$?
12559+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12560+ (exit $ac_status); }; } &&
12561+ { ac_try='test -s conftest.$ac_objext'
12562+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12563+ (eval $ac_try) 2>&5
12564+ ac_status=$?
12565+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12566+ (exit $ac_status); }; }; then
12567 rb_cv_func_noinline="$mac"; break
12568 else
12569 echo "$as_me: failed program was:" >&5
12570 sed 's/^/| /' conftest.$ac_ext >&5
12571
12572-
12573 fi
12574-
12575-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12576+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12577 done
12578 if test "${rb_c_werror_flag+set}"; then
12579 ac_c_werror_flag="$rb_c_werror_flag"
12580@@ -10117,8 +9339,8 @@
12581 fi
12582
12583 fi
12584-{ echo "$as_me:$LINENO: result: $rb_cv_func_noinline" >&5
12585-echo "${ECHO_T}$rb_cv_func_noinline" >&6; }
12586+echo "$as_me:$LINENO: result: $rb_cv_func_noinline" >&5
12587+echo "${ECHO_T}$rb_cv_func_noinline" >&6
12588 cat >>confdefs.h <<_ACEOF
12589 #define NOINLINE(x) $rb_cv_func_noinline
12590 _ACEOF
12591@@ -10127,8 +9349,8 @@
12592
12593
12594
12595-{ echo "$as_me:$LINENO: checking for RUBY_EXTERN" >&5
12596-echo $ECHO_N "checking for RUBY_EXTERN... $ECHO_C" >&6; }
12597+echo "$as_me:$LINENO: checking for RUBY_EXTERN" >&5
12598+echo $ECHO_N "checking for RUBY_EXTERN... $ECHO_C" >&6
12599 if test "${rb_cv_ruby_extern+set}" = set; then
12600 echo $ECHO_N "(cached) $ECHO_C" >&6
12601 else
12602@@ -10150,35 +9372,37 @@
12603 }
12604 _ACEOF
12605 rm -f conftest.$ac_objext
12606-if { (ac_try="$ac_compile"
12607-case "(($ac_try" in
12608- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12609- *) ac_try_echo=$ac_try;;
12610-esac
12611-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12612- (eval "$ac_compile") 2>conftest.er1
12613+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12614+ (eval $ac_compile) 2>conftest.er1
12615 ac_status=$?
12616 grep -v '^ *+' conftest.er1 >conftest.err
12617 rm -f conftest.er1
12618 cat conftest.err >&5
12619 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12620- (exit $ac_status); } && {
12621- test -z "$ac_c_werror_flag" ||
12622- test ! -s conftest.err
12623- } && test -s conftest.$ac_objext; then
12624+ (exit $ac_status); } &&
12625+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12626+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12627+ (eval $ac_try) 2>&5
12628+ ac_status=$?
12629+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12630+ (exit $ac_status); }; } &&
12631+ { ac_try='test -s conftest.$ac_objext'
12632+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12633+ (eval $ac_try) 2>&5
12634+ ac_status=$?
12635+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12636+ (exit $ac_status); }; }; then
12637 :
12638 else
12639 echo "$as_me: failed program was:" >&5
12640 sed 's/^/| /' conftest.$ac_ext >&5
12641
12642-
12643 fi
12644-
12645-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12646+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12647 done
12648 fi
12649-{ echo "$as_me:$LINENO: result: $rb_cv_ruby_extern" >&5
12650-echo "${ECHO_T}$rb_cv_ruby_extern" >&6; }
12651+echo "$as_me:$LINENO: result: $rb_cv_ruby_extern" >&5
12652+echo "${ECHO_T}$rb_cv_ruby_extern" >&6
12653 test "x$rb_cv_ruby_extern" = xno || cat >>confdefs.h <<_ACEOF
12654 #define RUBY_EXTERN $rb_cv_ruby_extern
12655 _ACEOF
12656@@ -10186,8 +9410,8 @@
12657
12658 XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
12659
12660-{ echo "$as_me:$LINENO: checking whether sys_nerr is declared" >&5
12661-echo $ECHO_N "checking whether sys_nerr is declared... $ECHO_C" >&6; }
12662+echo "$as_me:$LINENO: checking whether sys_nerr is declared" >&5
12663+echo $ECHO_N "checking whether sys_nerr is declared... $ECHO_C" >&6
12664 if test "${ac_cv_have_decl_sys_nerr+set}" = set; then
12665 echo $ECHO_N "(cached) $ECHO_C" >&6
12666 else
12667@@ -10204,7 +9428,7 @@
12668 main ()
12669 {
12670 #ifndef sys_nerr
12671- (void) sys_nerr;
12672+ char *p = (char *) sys_nerr;
12673 #endif
12674
12675 ;
12676@@ -10212,34 +9436,37 @@
12677 }
12678 _ACEOF
12679 rm -f conftest.$ac_objext
12680-if { (ac_try="$ac_compile"
12681-case "(($ac_try" in
12682- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12683- *) ac_try_echo=$ac_try;;
12684-esac
12685-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12686- (eval "$ac_compile") 2>conftest.er1
12687+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12688+ (eval $ac_compile) 2>conftest.er1
12689 ac_status=$?
12690 grep -v '^ *+' conftest.er1 >conftest.err
12691 rm -f conftest.er1
12692 cat conftest.err >&5
12693 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12694- (exit $ac_status); } && {
12695- test -z "$ac_c_werror_flag" ||
12696- test ! -s conftest.err
12697- } && test -s conftest.$ac_objext; then
12698+ (exit $ac_status); } &&
12699+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12700+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12701+ (eval $ac_try) 2>&5
12702+ ac_status=$?
12703+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12704+ (exit $ac_status); }; } &&
12705+ { ac_try='test -s conftest.$ac_objext'
12706+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12707+ (eval $ac_try) 2>&5
12708+ ac_status=$?
12709+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12710+ (exit $ac_status); }; }; then
12711 ac_cv_have_decl_sys_nerr=yes
12712 else
12713 echo "$as_me: failed program was:" >&5
12714 sed 's/^/| /' conftest.$ac_ext >&5
12715
12716- ac_cv_have_decl_sys_nerr=no
12717+ac_cv_have_decl_sys_nerr=no
12718 fi
12719-
12720-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12721+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
12722 fi
12723-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_nerr" >&5
12724-echo "${ECHO_T}$ac_cv_have_decl_sys_nerr" >&6; }
12725+echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_nerr" >&5
12726+echo "${ECHO_T}$ac_cv_have_decl_sys_nerr" >&6
12727 if test $ac_cv_have_decl_sys_nerr = yes; then
12728
12729 cat >>confdefs.h <<_ACEOF
12730@@ -10258,33 +9485,33 @@
12731
12732
12733
12734-# Check whether --with-libc_r was given.
12735+# Check whether --with-libc_r or --without-libc_r was given.
12736 if test "${with_libc_r+set}" = set; then
12737- withval=$with_libc_r;
12738+ withval="$with_libc_r"
12739+
12740 case $withval in
12741 yes) with_libc_r=yes;;
12742 *) with_libc_r=no;;
12743 esac
12744 else
12745 with_libc_r=no
12746-fi
12747+fi;
12748
12749-
12750-# Check whether --enable-pthread was given.
12751+# Check whether --enable-pthread or --disable-pthread was given.
12752 if test "${enable_pthread+set}" = set; then
12753- enableval=$enable_pthread; enable_pthread=$enableval
12754+ enableval="$enable_pthread"
12755+ enable_pthread=$enableval
12756 else
12757 enable_pthread=no
12758-fi
12759+fi;
12760
12761-
12762-# Check whether --enable-fastthread was given.
12763+# Check whether --enable-fastthread or --disable-fastthread was given.
12764 if test "${enable_fastthread+set}" = set; then
12765- enableval=$enable_fastthread;
12766- : handled by ext/thread/extconf.rb
12767+ enableval="$enable_fastthread"
12768
12769-fi
12770+ : handled by ext/thread/extconf.rb
12771
12772+fi;
12773
12774 case "$target_os" in
12775 nextstep*) ;;
12776@@ -10347,8 +9574,8 @@
12777 bsdi*) LIBS="-lm $LIBS"
12778 ac_cv_sizeof_rlim_t=8;;
12779 freebsd*) LIBS="-lm $LIBS"
12780- { echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
12781-echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6; }
12782+ echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
12783+echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6
12784 if test "${rb_cv_lib_xpg4_needed+set}" = set; then
12785 echo $ECHO_N "(cached) $ECHO_C" >&6
12786 else
12787@@ -10366,22 +9593,24 @@
12788 #endif
12789
12790 _ACEOF
12791-if { (ac_try="$ac_cpp conftest.$ac_ext"
12792-case "(($ac_try" in
12793- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12794- *) ac_try_echo=$ac_try;;
12795-esac
12796-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12797- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
12798+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
12799+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12800 ac_status=$?
12801 grep -v '^ *+' conftest.er1 >conftest.err
12802 rm -f conftest.er1
12803 cat conftest.err >&5
12804 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12805- (exit $ac_status); } >/dev/null && {
12806- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
12807- test ! -s conftest.err
12808- }; then
12809+ (exit $ac_status); } >/dev/null; then
12810+ if test -s conftest.err; then
12811+ ac_cpp_err=$ac_c_preproc_warn_flag
12812+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
12813+ else
12814+ ac_cpp_err=
12815+ fi
12816+else
12817+ ac_cpp_err=yes
12818+fi
12819+if test -z "$ac_cpp_err"; then
12820 rb_cv_lib_xpg4_needed=no
12821 else
12822 echo "$as_me: failed program was:" >&5
12823@@ -10389,15 +9618,14 @@
12824
12825 rb_cv_lib_xpg4_needed=yes
12826 fi
12827-
12828 rm -f conftest.err conftest.$ac_ext
12829 fi
12830-{ echo "$as_me:$LINENO: result: $rb_cv_lib_xpg4_needed" >&5
12831-echo "${ECHO_T}$rb_cv_lib_xpg4_needed" >&6; }
12832+echo "$as_me:$LINENO: result: $rb_cv_lib_xpg4_needed" >&5
12833+echo "${ECHO_T}$rb_cv_lib_xpg4_needed" >&6
12834 if test "$rb_cv_lib_xpg4_needed" = yes; then
12835
12836-{ echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
12837-echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6; }
12838+echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
12839+echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6
12840 if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then
12841 echo $ECHO_N "(cached) $ECHO_C" >&6
12842 else
12843@@ -10410,53 +9638,55 @@
12844 cat >>conftest.$ac_ext <<_ACEOF
12845 /* end confdefs.h. */
12846
12847-/* Override any GCC internal prototype to avoid an error.
12848- Use char because int might match the return type of a GCC
12849- builtin and then its argument prototype would still apply. */
12850+/* Override any gcc2 internal prototype to avoid an error. */
12851 #ifdef __cplusplus
12852 extern "C"
12853 #endif
12854+/* We use char because int might match the return type of a gcc2
12855+ builtin and then its argument prototype would still apply. */
12856 char setlocale ();
12857 int
12858 main ()
12859 {
12860-return setlocale ();
12861+setlocale ();
12862 ;
12863 return 0;
12864 }
12865 _ACEOF
12866 rm -f conftest.$ac_objext conftest$ac_exeext
12867-if { (ac_try="$ac_link"
12868-case "(($ac_try" in
12869- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12870- *) ac_try_echo=$ac_try;;
12871-esac
12872-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12873- (eval "$ac_link") 2>conftest.er1
12874+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12875+ (eval $ac_link) 2>conftest.er1
12876 ac_status=$?
12877 grep -v '^ *+' conftest.er1 >conftest.err
12878 rm -f conftest.er1
12879 cat conftest.err >&5
12880 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12881- (exit $ac_status); } && {
12882- test -z "$ac_c_werror_flag" ||
12883- test ! -s conftest.err
12884- } && test -s conftest$ac_exeext &&
12885- $as_test_x conftest$ac_exeext; then
12886+ (exit $ac_status); } &&
12887+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12888+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12889+ (eval $ac_try) 2>&5
12890+ ac_status=$?
12891+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12892+ (exit $ac_status); }; } &&
12893+ { ac_try='test -s conftest$ac_exeext'
12894+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12895+ (eval $ac_try) 2>&5
12896+ ac_status=$?
12897+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12898+ (exit $ac_status); }; }; then
12899 ac_cv_lib_xpg4_setlocale=yes
12900 else
12901 echo "$as_me: failed program was:" >&5
12902 sed 's/^/| /' conftest.$ac_ext >&5
12903
12904- ac_cv_lib_xpg4_setlocale=no
12905+ac_cv_lib_xpg4_setlocale=no
12906 fi
12907-
12908-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12909+rm -f conftest.err conftest.$ac_objext \
12910 conftest$ac_exeext conftest.$ac_ext
12911 LIBS=$ac_check_lib_save_LIBS
12912 fi
12913-{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
12914-echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6; }
12915+echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
12916+echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6
12917 if test $ac_cv_lib_xpg4_setlocale = yes; then
12918 cat >>confdefs.h <<_ACEOF
12919 #define HAVE_LIBXPG4 1
12920@@ -10468,8 +9698,8 @@
12921
12922 fi
12923 if test "$with_libc_r" = yes; then
12924- { echo "$as_me:$LINENO: checking whether libc_r is supplementary to libc" >&5
12925-echo $ECHO_N "checking whether libc_r is supplementary to libc... $ECHO_C" >&6; }
12926+ echo "$as_me:$LINENO: checking whether libc_r is supplementary to libc" >&5
12927+echo $ECHO_N "checking whether libc_r is supplementary to libc... $ECHO_C" >&6
12928 if test "${rb_cv_supplementary_lib_c_r+set}" = set; then
12929 echo $ECHO_N "(cached) $ECHO_C" >&6
12930 else
12931@@ -10486,22 +9716,24 @@
12932 #endif
12933
12934 _ACEOF
12935-if { (ac_try="$ac_cpp conftest.$ac_ext"
12936-case "(($ac_try" in
12937- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12938- *) ac_try_echo=$ac_try;;
12939-esac
12940-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12941- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
12942+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
12943+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12944 ac_status=$?
12945 grep -v '^ *+' conftest.er1 >conftest.err
12946 rm -f conftest.er1
12947 cat conftest.err >&5
12948 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12949- (exit $ac_status); } >/dev/null && {
12950- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
12951- test ! -s conftest.err
12952- }; then
12953+ (exit $ac_status); } >/dev/null; then
12954+ if test -s conftest.err; then
12955+ ac_cpp_err=$ac_c_preproc_warn_flag
12956+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
12957+ else
12958+ ac_cpp_err=
12959+ fi
12960+else
12961+ ac_cpp_err=yes
12962+fi
12963+if test -z "$ac_cpp_err"; then
12964 rb_cv_supplementary_lib_c_r=no
12965 else
12966 echo "$as_me: failed program was:" >&5
12967@@ -10509,11 +9741,10 @@
12968
12969 rb_cv_supplementary_lib_c_r=yes
12970 fi
12971-
12972 rm -f conftest.err conftest.$ac_ext
12973 fi
12974-{ echo "$as_me:$LINENO: result: $rb_cv_supplementary_lib_c_r" >&5
12975-echo "${ECHO_T}$rb_cv_supplementary_lib_c_r" >&6; }
12976+echo "$as_me:$LINENO: result: $rb_cv_supplementary_lib_c_r" >&5
12977+echo "${ECHO_T}$rb_cv_supplementary_lib_c_r" >&6
12978 if test "$rb_cv_supplementary_lib_c_r" = yes; then
12979 MAINLIBS="-lc_r $MAINLIBS"
12980 fi
12981@@ -10533,8 +9764,8 @@
12982 *) LIBS="-lm $LIBS";;
12983 esac
12984
12985-{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
12986-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
12987+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
12988+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
12989 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
12990 echo $ECHO_N "(cached) $ECHO_C" >&6
12991 else
12992@@ -10547,53 +9778,55 @@
12993 cat >>conftest.$ac_ext <<_ACEOF
12994 /* end confdefs.h. */
12995
12996-/* Override any GCC internal prototype to avoid an error.
12997- Use char because int might match the return type of a GCC
12998- builtin and then its argument prototype would still apply. */
12999+/* Override any gcc2 internal prototype to avoid an error. */
13000 #ifdef __cplusplus
13001 extern "C"
13002 #endif
13003+/* We use char because int might match the return type of a gcc2
13004+ builtin and then its argument prototype would still apply. */
13005 char crypt ();
13006 int
13007 main ()
13008 {
13009-return crypt ();
13010+crypt ();
13011 ;
13012 return 0;
13013 }
13014 _ACEOF
13015 rm -f conftest.$ac_objext conftest$ac_exeext
13016-if { (ac_try="$ac_link"
13017-case "(($ac_try" in
13018- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13019- *) ac_try_echo=$ac_try;;
13020-esac
13021-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13022- (eval "$ac_link") 2>conftest.er1
13023+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13024+ (eval $ac_link) 2>conftest.er1
13025 ac_status=$?
13026 grep -v '^ *+' conftest.er1 >conftest.err
13027 rm -f conftest.er1
13028 cat conftest.err >&5
13029 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13030- (exit $ac_status); } && {
13031- test -z "$ac_c_werror_flag" ||
13032- test ! -s conftest.err
13033- } && test -s conftest$ac_exeext &&
13034- $as_test_x conftest$ac_exeext; then
13035+ (exit $ac_status); } &&
13036+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13037+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13038+ (eval $ac_try) 2>&5
13039+ ac_status=$?
13040+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13041+ (exit $ac_status); }; } &&
13042+ { ac_try='test -s conftest$ac_exeext'
13043+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13044+ (eval $ac_try) 2>&5
13045+ ac_status=$?
13046+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13047+ (exit $ac_status); }; }; then
13048 ac_cv_lib_crypt_crypt=yes
13049 else
13050 echo "$as_me: failed program was:" >&5
13051 sed 's/^/| /' conftest.$ac_ext >&5
13052
13053- ac_cv_lib_crypt_crypt=no
13054+ac_cv_lib_crypt_crypt=no
13055 fi
13056-
13057-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13058+rm -f conftest.err conftest.$ac_objext \
13059 conftest$ac_exeext conftest.$ac_ext
13060 LIBS=$ac_check_lib_save_LIBS
13061 fi
13062-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
13063-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
13064+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
13065+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
13066 if test $ac_cv_lib_crypt_crypt = yes; then
13067 cat >>confdefs.h <<_ACEOF
13068 #define HAVE_LIBCRYPT 1
13069@@ -10604,8 +9837,8 @@
13070 fi
13071
13072
13073-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
13074-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
13075+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
13076+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
13077 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
13078 echo $ECHO_N "(cached) $ECHO_C" >&6
13079 else
13080@@ -10618,53 +9851,55 @@
13081 cat >>conftest.$ac_ext <<_ACEOF
13082 /* end confdefs.h. */
13083
13084-/* Override any GCC internal prototype to avoid an error.
13085- Use char because int might match the return type of a GCC
13086- builtin and then its argument prototype would still apply. */
13087+/* Override any gcc2 internal prototype to avoid an error. */
13088 #ifdef __cplusplus
13089 extern "C"
13090 #endif
13091+/* We use char because int might match the return type of a gcc2
13092+ builtin and then its argument prototype would still apply. */
13093 char dlopen ();
13094 int
13095 main ()
13096 {
13097-return dlopen ();
13098+dlopen ();
13099 ;
13100 return 0;
13101 }
13102 _ACEOF
13103 rm -f conftest.$ac_objext conftest$ac_exeext
13104-if { (ac_try="$ac_link"
13105-case "(($ac_try" in
13106- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13107- *) ac_try_echo=$ac_try;;
13108-esac
13109-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13110- (eval "$ac_link") 2>conftest.er1
13111+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13112+ (eval $ac_link) 2>conftest.er1
13113 ac_status=$?
13114 grep -v '^ *+' conftest.er1 >conftest.err
13115 rm -f conftest.er1
13116 cat conftest.err >&5
13117 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13118- (exit $ac_status); } && {
13119- test -z "$ac_c_werror_flag" ||
13120- test ! -s conftest.err
13121- } && test -s conftest$ac_exeext &&
13122- $as_test_x conftest$ac_exeext; then
13123+ (exit $ac_status); } &&
13124+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13125+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13126+ (eval $ac_try) 2>&5
13127+ ac_status=$?
13128+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13129+ (exit $ac_status); }; } &&
13130+ { ac_try='test -s conftest$ac_exeext'
13131+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13132+ (eval $ac_try) 2>&5
13133+ ac_status=$?
13134+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13135+ (exit $ac_status); }; }; then
13136 ac_cv_lib_dl_dlopen=yes
13137 else
13138 echo "$as_me: failed program was:" >&5
13139 sed 's/^/| /' conftest.$ac_ext >&5
13140
13141- ac_cv_lib_dl_dlopen=no
13142+ac_cv_lib_dl_dlopen=no
13143 fi
13144-
13145-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13146+rm -f conftest.err conftest.$ac_objext \
13147 conftest$ac_exeext conftest.$ac_ext
13148 LIBS=$ac_check_lib_save_LIBS
13149 fi
13150-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
13151-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
13152+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
13153+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
13154 if test $ac_cv_lib_dl_dlopen = yes; then
13155 cat >>confdefs.h <<_ACEOF
13156 #define HAVE_LIBDL 1
13157@@ -10675,8 +9910,8 @@
13158 fi
13159 # Dynamic linking for SunOS/Solaris and SYSV
13160
13161-{ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
13162-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
13163+echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
13164+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
13165 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
13166 echo $ECHO_N "(cached) $ECHO_C" >&6
13167 else
13168@@ -10689,53 +9924,55 @@
13169 cat >>conftest.$ac_ext <<_ACEOF
13170 /* end confdefs.h. */
13171
13172-/* Override any GCC internal prototype to avoid an error.
13173- Use char because int might match the return type of a GCC
13174- builtin and then its argument prototype would still apply. */
13175+/* Override any gcc2 internal prototype to avoid an error. */
13176 #ifdef __cplusplus
13177 extern "C"
13178 #endif
13179+/* We use char because int might match the return type of a gcc2
13180+ builtin and then its argument prototype would still apply. */
13181 char shl_load ();
13182 int
13183 main ()
13184 {
13185-return shl_load ();
13186+shl_load ();
13187 ;
13188 return 0;
13189 }
13190 _ACEOF
13191 rm -f conftest.$ac_objext conftest$ac_exeext
13192-if { (ac_try="$ac_link"
13193-case "(($ac_try" in
13194- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13195- *) ac_try_echo=$ac_try;;
13196-esac
13197-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13198- (eval "$ac_link") 2>conftest.er1
13199+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13200+ (eval $ac_link) 2>conftest.er1
13201 ac_status=$?
13202 grep -v '^ *+' conftest.er1 >conftest.err
13203 rm -f conftest.er1
13204 cat conftest.err >&5
13205 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13206- (exit $ac_status); } && {
13207- test -z "$ac_c_werror_flag" ||
13208- test ! -s conftest.err
13209- } && test -s conftest$ac_exeext &&
13210- $as_test_x conftest$ac_exeext; then
13211+ (exit $ac_status); } &&
13212+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13213+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13214+ (eval $ac_try) 2>&5
13215+ ac_status=$?
13216+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13217+ (exit $ac_status); }; } &&
13218+ { ac_try='test -s conftest$ac_exeext'
13219+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13220+ (eval $ac_try) 2>&5
13221+ ac_status=$?
13222+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13223+ (exit $ac_status); }; }; then
13224 ac_cv_lib_dld_shl_load=yes
13225 else
13226 echo "$as_me: failed program was:" >&5
13227 sed 's/^/| /' conftest.$ac_ext >&5
13228
13229- ac_cv_lib_dld_shl_load=no
13230+ac_cv_lib_dld_shl_load=no
13231 fi
13232-
13233-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13234+rm -f conftest.err conftest.$ac_objext \
13235 conftest$ac_exeext conftest.$ac_ext
13236 LIBS=$ac_check_lib_save_LIBS
13237 fi
13238-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
13239-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
13240+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
13241+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
13242 if test $ac_cv_lib_dld_shl_load = yes; then
13243 cat >>confdefs.h <<_ACEOF
13244 #define HAVE_LIBDLD 1
13245@@ -10761,9 +9998,9 @@
13246 ac_header_dirent=no
13247 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
13248 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
13249-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
13250-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
13251-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
13252+echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
13253+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
13254+if eval "test \"\${$as_ac_Header+set}\" = set"; then
13255 echo $ECHO_N "(cached) $ECHO_C" >&6
13256 else
13257 cat >conftest.$ac_ext <<_ACEOF
13258@@ -10785,35 +10022,37 @@
13259 }
13260 _ACEOF
13261 rm -f conftest.$ac_objext
13262-if { (ac_try="$ac_compile"
13263-case "(($ac_try" in
13264- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13265- *) ac_try_echo=$ac_try;;
13266-esac
13267-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13268- (eval "$ac_compile") 2>conftest.er1
13269+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13270+ (eval $ac_compile) 2>conftest.er1
13271 ac_status=$?
13272 grep -v '^ *+' conftest.er1 >conftest.err
13273 rm -f conftest.er1
13274 cat conftest.err >&5
13275 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13276- (exit $ac_status); } && {
13277- test -z "$ac_c_werror_flag" ||
13278- test ! -s conftest.err
13279- } && test -s conftest.$ac_objext; then
13280+ (exit $ac_status); } &&
13281+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13282+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13283+ (eval $ac_try) 2>&5
13284+ ac_status=$?
13285+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13286+ (exit $ac_status); }; } &&
13287+ { ac_try='test -s conftest.$ac_objext'
13288+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13289+ (eval $ac_try) 2>&5
13290+ ac_status=$?
13291+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13292+ (exit $ac_status); }; }; then
13293 eval "$as_ac_Header=yes"
13294 else
13295 echo "$as_me: failed program was:" >&5
13296 sed 's/^/| /' conftest.$ac_ext >&5
13297
13298- eval "$as_ac_Header=no"
13299+eval "$as_ac_Header=no"
13300 fi
13301-
13302-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13303+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13304 fi
13305-ac_res=`eval echo '${'$as_ac_Header'}'`
13306- { echo "$as_me:$LINENO: result: $ac_res" >&5
13307-echo "${ECHO_T}$ac_res" >&6; }
13308+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
13309+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
13310 if test `eval echo '${'$as_ac_Header'}'` = yes; then
13311 cat >>confdefs.h <<_ACEOF
13312 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
13313@@ -10825,12 +10064,13 @@
13314 done
13315 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
13316 if test $ac_header_dirent = dirent.h; then
13317- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
13318-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
13319+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
13320+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
13321 if test "${ac_cv_search_opendir+set}" = set; then
13322 echo $ECHO_N "(cached) $ECHO_C" >&6
13323 else
13324 ac_func_search_save_LIBS=$LIBS
13325+ac_cv_search_opendir=no
13326 cat >conftest.$ac_ext <<_ACEOF
13327 /* confdefs.h. */
13328 _ACEOF
13329@@ -10838,83 +10078,124 @@
13330 cat >>conftest.$ac_ext <<_ACEOF
13331 /* end confdefs.h. */
13332
13333-/* Override any GCC internal prototype to avoid an error.
13334- Use char because int might match the return type of a GCC
13335- builtin and then its argument prototype would still apply. */
13336+/* Override any gcc2 internal prototype to avoid an error. */
13337 #ifdef __cplusplus
13338 extern "C"
13339 #endif
13340+/* We use char because int might match the return type of a gcc2
13341+ builtin and then its argument prototype would still apply. */
13342 char opendir ();
13343 int
13344 main ()
13345 {
13346-return opendir ();
13347+opendir ();
13348 ;
13349 return 0;
13350 }
13351 _ACEOF
13352-for ac_lib in '' dir; do
13353- if test -z "$ac_lib"; then
13354- ac_res="none required"
13355- else
13356- ac_res=-l$ac_lib
13357- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13358- fi
13359- rm -f conftest.$ac_objext conftest$ac_exeext
13360-if { (ac_try="$ac_link"
13361-case "(($ac_try" in
13362- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13363- *) ac_try_echo=$ac_try;;
13364-esac
13365-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13366- (eval "$ac_link") 2>conftest.er1
13367+rm -f conftest.$ac_objext conftest$ac_exeext
13368+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13369+ (eval $ac_link) 2>conftest.er1
13370 ac_status=$?
13371 grep -v '^ *+' conftest.er1 >conftest.err
13372 rm -f conftest.er1
13373 cat conftest.err >&5
13374 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13375- (exit $ac_status); } && {
13376- test -z "$ac_c_werror_flag" ||
13377- test ! -s conftest.err
13378- } && test -s conftest$ac_exeext &&
13379- $as_test_x conftest$ac_exeext; then
13380- ac_cv_search_opendir=$ac_res
13381+ (exit $ac_status); } &&
13382+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13383+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13384+ (eval $ac_try) 2>&5
13385+ ac_status=$?
13386+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13387+ (exit $ac_status); }; } &&
13388+ { ac_try='test -s conftest$ac_exeext'
13389+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13390+ (eval $ac_try) 2>&5
13391+ ac_status=$?
13392+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13393+ (exit $ac_status); }; }; then
13394+ ac_cv_search_opendir="none required"
13395 else
13396 echo "$as_me: failed program was:" >&5
13397 sed 's/^/| /' conftest.$ac_ext >&5
13398
13399-
13400 fi
13401+rm -f conftest.err conftest.$ac_objext \
13402+ conftest$ac_exeext conftest.$ac_ext
13403+if test "$ac_cv_search_opendir" = no; then
13404+ for ac_lib in dir; do
13405+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13406+ cat >conftest.$ac_ext <<_ACEOF
13407+/* confdefs.h. */
13408+_ACEOF
13409+cat confdefs.h >>conftest.$ac_ext
13410+cat >>conftest.$ac_ext <<_ACEOF
13411+/* end confdefs.h. */
13412
13413-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13414- conftest$ac_exeext
13415- if test "${ac_cv_search_opendir+set}" = set; then
13416- break
13417-fi
13418-done
13419-if test "${ac_cv_search_opendir+set}" = set; then
13420- :
13421+/* Override any gcc2 internal prototype to avoid an error. */
13422+#ifdef __cplusplus
13423+extern "C"
13424+#endif
13425+/* We use char because int might match the return type of a gcc2
13426+ builtin and then its argument prototype would still apply. */
13427+char opendir ();
13428+int
13429+main ()
13430+{
13431+opendir ();
13432+ ;
13433+ return 0;
13434+}
13435+_ACEOF
13436+rm -f conftest.$ac_objext conftest$ac_exeext
13437+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13438+ (eval $ac_link) 2>conftest.er1
13439+ ac_status=$?
13440+ grep -v '^ *+' conftest.er1 >conftest.err
13441+ rm -f conftest.er1
13442+ cat conftest.err >&5
13443+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13444+ (exit $ac_status); } &&
13445+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13446+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13447+ (eval $ac_try) 2>&5
13448+ ac_status=$?
13449+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13450+ (exit $ac_status); }; } &&
13451+ { ac_try='test -s conftest$ac_exeext'
13452+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13453+ (eval $ac_try) 2>&5
13454+ ac_status=$?
13455+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13456+ (exit $ac_status); }; }; then
13457+ ac_cv_search_opendir="-l$ac_lib"
13458+break
13459 else
13460- ac_cv_search_opendir=no
13461+ echo "$as_me: failed program was:" >&5
13462+sed 's/^/| /' conftest.$ac_ext >&5
13463+
13464+fi
13465+rm -f conftest.err conftest.$ac_objext \
13466+ conftest$ac_exeext conftest.$ac_ext
13467+ done
13468 fi
13469-rm conftest.$ac_ext
13470 LIBS=$ac_func_search_save_LIBS
13471 fi
13472-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
13473-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
13474-ac_res=$ac_cv_search_opendir
13475-if test "$ac_res" != no; then
13476- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13477+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
13478+echo "${ECHO_T}$ac_cv_search_opendir" >&6
13479+if test "$ac_cv_search_opendir" != no; then
13480+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
13481
13482 fi
13483
13484 else
13485- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
13486-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
13487+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
13488+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
13489 if test "${ac_cv_search_opendir+set}" = set; then
13490 echo $ECHO_N "(cached) $ECHO_C" >&6
13491 else
13492 ac_func_search_save_LIBS=$LIBS
13493+ac_cv_search_opendir=no
13494 cat >conftest.$ac_ext <<_ACEOF
13495 /* confdefs.h. */
13496 _ACEOF
13497@@ -10922,80 +10203,120 @@
13498 cat >>conftest.$ac_ext <<_ACEOF
13499 /* end confdefs.h. */
13500
13501-/* Override any GCC internal prototype to avoid an error.
13502- Use char because int might match the return type of a GCC
13503- builtin and then its argument prototype would still apply. */
13504+/* Override any gcc2 internal prototype to avoid an error. */
13505 #ifdef __cplusplus
13506 extern "C"
13507 #endif
13508+/* We use char because int might match the return type of a gcc2
13509+ builtin and then its argument prototype would still apply. */
13510 char opendir ();
13511 int
13512 main ()
13513 {
13514-return opendir ();
13515+opendir ();
13516 ;
13517 return 0;
13518 }
13519 _ACEOF
13520-for ac_lib in '' x; do
13521- if test -z "$ac_lib"; then
13522- ac_res="none required"
13523- else
13524- ac_res=-l$ac_lib
13525- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13526- fi
13527- rm -f conftest.$ac_objext conftest$ac_exeext
13528-if { (ac_try="$ac_link"
13529-case "(($ac_try" in
13530- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13531- *) ac_try_echo=$ac_try;;
13532-esac
13533-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13534- (eval "$ac_link") 2>conftest.er1
13535+rm -f conftest.$ac_objext conftest$ac_exeext
13536+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13537+ (eval $ac_link) 2>conftest.er1
13538 ac_status=$?
13539 grep -v '^ *+' conftest.er1 >conftest.err
13540 rm -f conftest.er1
13541 cat conftest.err >&5
13542 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13543- (exit $ac_status); } && {
13544- test -z "$ac_c_werror_flag" ||
13545- test ! -s conftest.err
13546- } && test -s conftest$ac_exeext &&
13547- $as_test_x conftest$ac_exeext; then
13548- ac_cv_search_opendir=$ac_res
13549+ (exit $ac_status); } &&
13550+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13551+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13552+ (eval $ac_try) 2>&5
13553+ ac_status=$?
13554+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13555+ (exit $ac_status); }; } &&
13556+ { ac_try='test -s conftest$ac_exeext'
13557+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13558+ (eval $ac_try) 2>&5
13559+ ac_status=$?
13560+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13561+ (exit $ac_status); }; }; then
13562+ ac_cv_search_opendir="none required"
13563 else
13564 echo "$as_me: failed program was:" >&5
13565 sed 's/^/| /' conftest.$ac_ext >&5
13566
13567-
13568 fi
13569+rm -f conftest.err conftest.$ac_objext \
13570+ conftest$ac_exeext conftest.$ac_ext
13571+if test "$ac_cv_search_opendir" = no; then
13572+ for ac_lib in x; do
13573+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13574+ cat >conftest.$ac_ext <<_ACEOF
13575+/* confdefs.h. */
13576+_ACEOF
13577+cat confdefs.h >>conftest.$ac_ext
13578+cat >>conftest.$ac_ext <<_ACEOF
13579+/* end confdefs.h. */
13580
13581-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13582- conftest$ac_exeext
13583- if test "${ac_cv_search_opendir+set}" = set; then
13584- break
13585-fi
13586-done
13587-if test "${ac_cv_search_opendir+set}" = set; then
13588- :
13589+/* Override any gcc2 internal prototype to avoid an error. */
13590+#ifdef __cplusplus
13591+extern "C"
13592+#endif
13593+/* We use char because int might match the return type of a gcc2
13594+ builtin and then its argument prototype would still apply. */
13595+char opendir ();
13596+int
13597+main ()
13598+{
13599+opendir ();
13600+ ;
13601+ return 0;
13602+}
13603+_ACEOF
13604+rm -f conftest.$ac_objext conftest$ac_exeext
13605+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13606+ (eval $ac_link) 2>conftest.er1
13607+ ac_status=$?
13608+ grep -v '^ *+' conftest.er1 >conftest.err
13609+ rm -f conftest.er1
13610+ cat conftest.err >&5
13611+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13612+ (exit $ac_status); } &&
13613+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13614+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13615+ (eval $ac_try) 2>&5
13616+ ac_status=$?
13617+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13618+ (exit $ac_status); }; } &&
13619+ { ac_try='test -s conftest$ac_exeext'
13620+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13621+ (eval $ac_try) 2>&5
13622+ ac_status=$?
13623+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13624+ (exit $ac_status); }; }; then
13625+ ac_cv_search_opendir="-l$ac_lib"
13626+break
13627 else
13628- ac_cv_search_opendir=no
13629+ echo "$as_me: failed program was:" >&5
13630+sed 's/^/| /' conftest.$ac_ext >&5
13631+
13632+fi
13633+rm -f conftest.err conftest.$ac_objext \
13634+ conftest$ac_exeext conftest.$ac_ext
13635+ done
13636 fi
13637-rm conftest.$ac_ext
13638 LIBS=$ac_func_search_save_LIBS
13639 fi
13640-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
13641-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
13642-ac_res=$ac_cv_search_opendir
13643-if test "$ac_res" != no; then
13644- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13645+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
13646+echo "${ECHO_T}$ac_cv_search_opendir" >&6
13647+if test "$ac_cv_search_opendir" != no; then
13648+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
13649
13650 fi
13651
13652 fi
13653
13654-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
13655-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
13656+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
13657+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
13658 if test "${ac_cv_header_stdc+set}" = set; then
13659 echo $ECHO_N "(cached) $ECHO_C" >&6
13660 else
13661@@ -11019,31 +10340,34 @@
13662 }
13663 _ACEOF
13664 rm -f conftest.$ac_objext
13665-if { (ac_try="$ac_compile"
13666-case "(($ac_try" in
13667- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13668- *) ac_try_echo=$ac_try;;
13669-esac
13670-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13671- (eval "$ac_compile") 2>conftest.er1
13672+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13673+ (eval $ac_compile) 2>conftest.er1
13674 ac_status=$?
13675 grep -v '^ *+' conftest.er1 >conftest.err
13676 rm -f conftest.er1
13677 cat conftest.err >&5
13678 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13679- (exit $ac_status); } && {
13680- test -z "$ac_c_werror_flag" ||
13681- test ! -s conftest.err
13682- } && test -s conftest.$ac_objext; then
13683+ (exit $ac_status); } &&
13684+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13685+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13686+ (eval $ac_try) 2>&5
13687+ ac_status=$?
13688+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13689+ (exit $ac_status); }; } &&
13690+ { ac_try='test -s conftest.$ac_objext'
13691+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13692+ (eval $ac_try) 2>&5
13693+ ac_status=$?
13694+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13695+ (exit $ac_status); }; }; then
13696 ac_cv_header_stdc=yes
13697 else
13698 echo "$as_me: failed program was:" >&5
13699 sed 's/^/| /' conftest.$ac_ext >&5
13700
13701- ac_cv_header_stdc=no
13702+ac_cv_header_stdc=no
13703 fi
13704-
13705-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13706+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13707
13708 if test $ac_cv_header_stdc = yes; then
13709 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
13710@@ -11099,7 +10423,6 @@
13711 cat >>conftest.$ac_ext <<_ACEOF
13712 /* end confdefs.h. */
13713 #include <ctype.h>
13714-#include <stdlib.h>
13715 #if ((' ' & 0x0FF) == 0x020)
13716 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
13717 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
13718@@ -11119,27 +10442,18 @@
13719 for (i = 0; i < 256; i++)
13720 if (XOR (islower (i), ISLOWER (i))
13721 || toupper (i) != TOUPPER (i))
13722- return 2;
13723- return 0;
13724+ exit(2);
13725+ exit (0);
13726 }
13727 _ACEOF
13728 rm -f conftest$ac_exeext
13729-if { (ac_try="$ac_link"
13730-case "(($ac_try" in
13731- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13732- *) ac_try_echo=$ac_try;;
13733-esac
13734-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13735- (eval "$ac_link") 2>&5
13736+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13737+ (eval $ac_link) 2>&5
13738 ac_status=$?
13739 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13740 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13741- { (case "(($ac_try" in
13742- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13743- *) ac_try_echo=$ac_try;;
13744-esac
13745-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13746- (eval "$ac_try") 2>&5
13747+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13748+ (eval $ac_try) 2>&5
13749 ac_status=$?
13750 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13751 (exit $ac_status); }; }; then
13752@@ -11152,14 +10466,12 @@
13753 ( exit $ac_status )
13754 ac_cv_header_stdc=no
13755 fi
13756-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13757+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13758 fi
13759-
13760-
13761 fi
13762 fi
13763-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
13764-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
13765+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
13766+echo "${ECHO_T}$ac_cv_header_stdc" >&6
13767 if test $ac_cv_header_stdc = yes; then
13768
13769 cat >>confdefs.h <<\_ACEOF
13770@@ -11168,8 +10480,8 @@
13771
13772 fi
13773
13774-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
13775-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
13776+echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
13777+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
13778 if test "${ac_cv_header_sys_wait_h+set}" = set; then
13779 echo $ECHO_N "(cached) $ECHO_C" >&6
13780 else
13781@@ -11182,7 +10494,7 @@
13782 #include <sys/types.h>
13783 #include <sys/wait.h>
13784 #ifndef WEXITSTATUS
13785-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
13786+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
13787 #endif
13788 #ifndef WIFEXITED
13789 # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
13790@@ -11199,34 +10511,37 @@
13791 }
13792 _ACEOF
13793 rm -f conftest.$ac_objext
13794-if { (ac_try="$ac_compile"
13795-case "(($ac_try" in
13796- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13797- *) ac_try_echo=$ac_try;;
13798-esac
13799-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13800- (eval "$ac_compile") 2>conftest.er1
13801+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13802+ (eval $ac_compile) 2>conftest.er1
13803 ac_status=$?
13804 grep -v '^ *+' conftest.er1 >conftest.err
13805 rm -f conftest.er1
13806 cat conftest.err >&5
13807 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13808- (exit $ac_status); } && {
13809- test -z "$ac_c_werror_flag" ||
13810- test ! -s conftest.err
13811- } && test -s conftest.$ac_objext; then
13812+ (exit $ac_status); } &&
13813+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13814+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13815+ (eval $ac_try) 2>&5
13816+ ac_status=$?
13817+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13818+ (exit $ac_status); }; } &&
13819+ { ac_try='test -s conftest.$ac_objext'
13820+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13821+ (eval $ac_try) 2>&5
13822+ ac_status=$?
13823+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13824+ (exit $ac_status); }; }; then
13825 ac_cv_header_sys_wait_h=yes
13826 else
13827 echo "$as_me: failed program was:" >&5
13828 sed 's/^/| /' conftest.$ac_ext >&5
13829
13830- ac_cv_header_sys_wait_h=no
13831+ac_cv_header_sys_wait_h=no
13832 fi
13833-
13834-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13835+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13836 fi
13837-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
13838-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
13839+echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
13840+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
13841 if test $ac_cv_header_sys_wait_h = yes; then
13842
13843 cat >>confdefs.h <<\_ACEOF
13844@@ -11271,19 +10586,18 @@
13845 ucontext.h intrinsics.h
13846 do
13847 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
13848-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
13849- { echo "$as_me:$LINENO: checking for $ac_header" >&5
13850-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
13851-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
13852+if eval "test \"\${$as_ac_Header+set}\" = set"; then
13853+ echo "$as_me:$LINENO: checking for $ac_header" >&5
13854+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
13855+if eval "test \"\${$as_ac_Header+set}\" = set"; then
13856 echo $ECHO_N "(cached) $ECHO_C" >&6
13857 fi
13858-ac_res=`eval echo '${'$as_ac_Header'}'`
13859- { echo "$as_me:$LINENO: result: $ac_res" >&5
13860-echo "${ECHO_T}$ac_res" >&6; }
13861+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
13862+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
13863 else
13864 # Is the header compilable?
13865-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
13866-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
13867+echo "$as_me:$LINENO: checking $ac_header usability" >&5
13868+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
13869 cat >conftest.$ac_ext <<_ACEOF
13870 /* confdefs.h. */
13871 _ACEOF
13872@@ -11294,37 +10608,40 @@
13873 #include <$ac_header>
13874 _ACEOF
13875 rm -f conftest.$ac_objext
13876-if { (ac_try="$ac_compile"
13877-case "(($ac_try" in
13878- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13879- *) ac_try_echo=$ac_try;;
13880-esac
13881-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13882- (eval "$ac_compile") 2>conftest.er1
13883+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13884+ (eval $ac_compile) 2>conftest.er1
13885 ac_status=$?
13886 grep -v '^ *+' conftest.er1 >conftest.err
13887 rm -f conftest.er1
13888 cat conftest.err >&5
13889 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13890- (exit $ac_status); } && {
13891- test -z "$ac_c_werror_flag" ||
13892- test ! -s conftest.err
13893- } && test -s conftest.$ac_objext; then
13894+ (exit $ac_status); } &&
13895+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13896+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13897+ (eval $ac_try) 2>&5
13898+ ac_status=$?
13899+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13900+ (exit $ac_status); }; } &&
13901+ { ac_try='test -s conftest.$ac_objext'
13902+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13903+ (eval $ac_try) 2>&5
13904+ ac_status=$?
13905+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
13906+ (exit $ac_status); }; }; then
13907 ac_header_compiler=yes
13908 else
13909 echo "$as_me: failed program was:" >&5
13910 sed 's/^/| /' conftest.$ac_ext >&5
13911
13912- ac_header_compiler=no
13913+ac_header_compiler=no
13914 fi
13915-
13916-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13917-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
13918-echo "${ECHO_T}$ac_header_compiler" >&6; }
13919+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13920+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
13921+echo "${ECHO_T}$ac_header_compiler" >&6
13922
13923 # Is the header present?
13924-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
13925-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
13926+echo "$as_me:$LINENO: checking $ac_header presence" >&5
13927+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
13928 cat >conftest.$ac_ext <<_ACEOF
13929 /* confdefs.h. */
13930 _ACEOF
13931@@ -11333,22 +10650,24 @@
13932 /* end confdefs.h. */
13933 #include <$ac_header>
13934 _ACEOF
13935-if { (ac_try="$ac_cpp conftest.$ac_ext"
13936-case "(($ac_try" in
13937- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13938- *) ac_try_echo=$ac_try;;
13939-esac
13940-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13941- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
13942+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
13943+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
13944 ac_status=$?
13945 grep -v '^ *+' conftest.er1 >conftest.err
13946 rm -f conftest.er1
13947 cat conftest.err >&5
13948 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13949- (exit $ac_status); } >/dev/null && {
13950- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
13951- test ! -s conftest.err
13952- }; then
13953+ (exit $ac_status); } >/dev/null; then
13954+ if test -s conftest.err; then
13955+ ac_cpp_err=$ac_c_preproc_warn_flag
13956+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
13957+ else
13958+ ac_cpp_err=
13959+ fi
13960+else
13961+ ac_cpp_err=yes
13962+fi
13963+if test -z "$ac_cpp_err"; then
13964 ac_header_preproc=yes
13965 else
13966 echo "$as_me: failed program was:" >&5
13967@@ -11356,10 +10675,9 @@
13968
13969 ac_header_preproc=no
13970 fi
13971-
13972 rm -f conftest.err conftest.$ac_ext
13973-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
13974-echo "${ECHO_T}$ac_header_preproc" >&6; }
13975+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
13976+echo "${ECHO_T}$ac_header_preproc" >&6
13977
13978 # So? What about this header?
13979 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
13980@@ -11383,19 +10701,25 @@
13981 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
13982 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
13983 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
13984-
13985+ (
13986+ cat <<\_ASBOX
13987+## ------------------------------------------ ##
13988+## Report this to the AC_PACKAGE_NAME lists. ##
13989+## ------------------------------------------ ##
13990+_ASBOX
13991+ ) |
13992+ sed "s/^/$as_me: WARNING: /" >&2
13993 ;;
13994 esac
13995-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
13996-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
13997-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
13998+echo "$as_me:$LINENO: checking for $ac_header" >&5
13999+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14000+if eval "test \"\${$as_ac_Header+set}\" = set"; then
14001 echo $ECHO_N "(cached) $ECHO_C" >&6
14002 else
14003 eval "$as_ac_Header=\$ac_header_preproc"
14004 fi
14005-ac_res=`eval echo '${'$as_ac_Header'}'`
14006- { echo "$as_me:$LINENO: result: $ac_res" >&5
14007-echo "${ECHO_T}$ac_res" >&6; }
14008+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
14009+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14010
14011 fi
14012 if test `eval echo '${'$as_ac_Header'}'` = yes; then
14013@@ -11408,8 +10732,8 @@
14014 done
14015
14016
14017-{ echo "$as_me:$LINENO: checking for rlim_t" >&5
14018-echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; }
14019+echo "$as_me:$LINENO: checking for rlim_t" >&5
14020+echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6
14021 if test "${ac_cv_type_rlim_t+set}" = set; then
14022 echo $ECHO_N "(cached) $ECHO_C" >&6
14023 else
14024@@ -11435,57 +10759,60 @@
14025 #include <stdio.h>
14026
14027
14028-typedef rlim_t ac__type_new_;
14029 int
14030 main ()
14031 {
14032-if ((ac__type_new_ *) 0)
14033+if ((rlim_t *) 0)
14034 return 0;
14035-if (sizeof (ac__type_new_))
14036+if (sizeof (rlim_t))
14037 return 0;
14038 ;
14039 return 0;
14040 }
14041 _ACEOF
14042 rm -f conftest.$ac_objext
14043-if { (ac_try="$ac_compile"
14044-case "(($ac_try" in
14045- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14046- *) ac_try_echo=$ac_try;;
14047-esac
14048-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14049- (eval "$ac_compile") 2>conftest.er1
14050+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14051+ (eval $ac_compile) 2>conftest.er1
14052 ac_status=$?
14053 grep -v '^ *+' conftest.er1 >conftest.err
14054 rm -f conftest.er1
14055 cat conftest.err >&5
14056 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14057- (exit $ac_status); } && {
14058- test -z "$ac_c_werror_flag" ||
14059- test ! -s conftest.err
14060- } && test -s conftest.$ac_objext; then
14061+ (exit $ac_status); } &&
14062+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14063+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14064+ (eval $ac_try) 2>&5
14065+ ac_status=$?
14066+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14067+ (exit $ac_status); }; } &&
14068+ { ac_try='test -s conftest.$ac_objext'
14069+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14070+ (eval $ac_try) 2>&5
14071+ ac_status=$?
14072+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14073+ (exit $ac_status); }; }; then
14074 ac_cv_type_rlim_t=yes
14075 else
14076 echo "$as_me: failed program was:" >&5
14077 sed 's/^/| /' conftest.$ac_ext >&5
14078
14079- ac_cv_type_rlim_t=no
14080+ac_cv_type_rlim_t=no
14081 fi
14082-
14083-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14084+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14085 fi
14086-{ echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
14087-echo "${ECHO_T}$ac_cv_type_rlim_t" >&6; }
14088+echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
14089+echo "${ECHO_T}$ac_cv_type_rlim_t" >&6
14090
14091-# The cast to long int works around a bug in the HP C Compiler
14092-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
14093-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
14094-# This bug is HP SR number 8606223364.
14095-{ echo "$as_me:$LINENO: checking size of rlim_t" >&5
14096-echo $ECHO_N "checking size of rlim_t... $ECHO_C" >&6; }
14097+echo "$as_me:$LINENO: checking size of rlim_t" >&5
14098+echo $ECHO_N "checking size of rlim_t... $ECHO_C" >&6
14099 if test "${ac_cv_sizeof_rlim_t+set}" = set; then
14100 echo $ECHO_N "(cached) $ECHO_C" >&6
14101 else
14102+ if test "$ac_cv_type_rlim_t" = yes; then
14103+ # The cast to unsigned long works around a bug in the HP C Compiler
14104+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
14105+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
14106+ # This bug is HP SR number 8606223364.
14107 if test "$cross_compiling" = yes; then
14108 # Depending upon the size, compute the lo and hi bounds.
14109 cat >conftest.$ac_ext <<_ACEOF
14110@@ -11510,11 +10837,10 @@
14111 #include <stdio.h>
14112
14113
14114- typedef rlim_t ac__type_sizeof_;
14115 int
14116 main ()
14117 {
14118-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
14119+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) >= 0)];
14120 test_array [0] = 0
14121
14122 ;
14123@@ -11522,26 +10848,30 @@
14124 }
14125 _ACEOF
14126 rm -f conftest.$ac_objext
14127-if { (ac_try="$ac_compile"
14128-case "(($ac_try" in
14129- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14130- *) ac_try_echo=$ac_try;;
14131-esac
14132-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14133- (eval "$ac_compile") 2>conftest.er1
14134+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14135+ (eval $ac_compile) 2>conftest.er1
14136 ac_status=$?
14137 grep -v '^ *+' conftest.er1 >conftest.err
14138 rm -f conftest.er1
14139 cat conftest.err >&5
14140 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14141- (exit $ac_status); } && {
14142- test -z "$ac_c_werror_flag" ||
14143- test ! -s conftest.err
14144- } && test -s conftest.$ac_objext; then
14145- ac_lo=0 ac_mid=0
14146- while :; do
14147- cat >conftest.$ac_ext <<_ACEOF
14148-/* confdefs.h. */
14149+ (exit $ac_status); } &&
14150+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14151+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14152+ (eval $ac_try) 2>&5
14153+ ac_status=$?
14154+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14155+ (exit $ac_status); }; } &&
14156+ { ac_try='test -s conftest.$ac_objext'
14157+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14158+ (eval $ac_try) 2>&5
14159+ ac_status=$?
14160+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14161+ (exit $ac_status); }; }; then
14162+ ac_lo=0 ac_mid=0
14163+ while :; do
14164+ cat >conftest.$ac_ext <<_ACEOF
14165+/* confdefs.h. */
14166 _ACEOF
14167 cat confdefs.h >>conftest.$ac_ext
14168 cat >>conftest.$ac_ext <<_ACEOF
14169@@ -11562,11 +10892,10 @@
14170 #include <stdio.h>
14171
14172
14173- typedef rlim_t ac__type_sizeof_;
14174 int
14175 main ()
14176 {
14177-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
14178+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) <= $ac_mid)];
14179 test_array [0] = 0
14180
14181 ;
14182@@ -11574,42 +10903,45 @@
14183 }
14184 _ACEOF
14185 rm -f conftest.$ac_objext
14186-if { (ac_try="$ac_compile"
14187-case "(($ac_try" in
14188- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14189- *) ac_try_echo=$ac_try;;
14190-esac
14191-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14192- (eval "$ac_compile") 2>conftest.er1
14193+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14194+ (eval $ac_compile) 2>conftest.er1
14195 ac_status=$?
14196 grep -v '^ *+' conftest.er1 >conftest.err
14197 rm -f conftest.er1
14198 cat conftest.err >&5
14199 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14200- (exit $ac_status); } && {
14201- test -z "$ac_c_werror_flag" ||
14202- test ! -s conftest.err
14203- } && test -s conftest.$ac_objext; then
14204+ (exit $ac_status); } &&
14205+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14206+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14207+ (eval $ac_try) 2>&5
14208+ ac_status=$?
14209+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14210+ (exit $ac_status); }; } &&
14211+ { ac_try='test -s conftest.$ac_objext'
14212+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14213+ (eval $ac_try) 2>&5
14214+ ac_status=$?
14215+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14216+ (exit $ac_status); }; }; then
14217 ac_hi=$ac_mid; break
14218 else
14219 echo "$as_me: failed program was:" >&5
14220 sed 's/^/| /' conftest.$ac_ext >&5
14221
14222- ac_lo=`expr $ac_mid + 1`
14223- if test $ac_lo -le $ac_mid; then
14224- ac_lo= ac_hi=
14225- break
14226- fi
14227- ac_mid=`expr 2 '*' $ac_mid + 1`
14228+ac_lo=`expr $ac_mid + 1`
14229+ if test $ac_lo -le $ac_mid; then
14230+ ac_lo= ac_hi=
14231+ break
14232+ fi
14233+ ac_mid=`expr 2 '*' $ac_mid + 1`
14234 fi
14235-
14236-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14237+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14238 done
14239 else
14240 echo "$as_me: failed program was:" >&5
14241 sed 's/^/| /' conftest.$ac_ext >&5
14242
14243- cat >conftest.$ac_ext <<_ACEOF
14244+cat >conftest.$ac_ext <<_ACEOF
14245 /* confdefs.h. */
14246 _ACEOF
14247 cat confdefs.h >>conftest.$ac_ext
14248@@ -11631,11 +10963,10 @@
14249 #include <stdio.h>
14250
14251
14252- typedef rlim_t ac__type_sizeof_;
14253 int
14254 main ()
14255 {
14256-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
14257+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) < 0)];
14258 test_array [0] = 0
14259
14260 ;
14261@@ -11643,22 +10974,26 @@
14262 }
14263 _ACEOF
14264 rm -f conftest.$ac_objext
14265-if { (ac_try="$ac_compile"
14266-case "(($ac_try" in
14267- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14268- *) ac_try_echo=$ac_try;;
14269-esac
14270-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14271- (eval "$ac_compile") 2>conftest.er1
14272+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14273+ (eval $ac_compile) 2>conftest.er1
14274 ac_status=$?
14275 grep -v '^ *+' conftest.er1 >conftest.err
14276 rm -f conftest.er1
14277 cat conftest.err >&5
14278 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14279- (exit $ac_status); } && {
14280- test -z "$ac_c_werror_flag" ||
14281- test ! -s conftest.err
14282- } && test -s conftest.$ac_objext; then
14283+ (exit $ac_status); } &&
14284+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14285+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14286+ (eval $ac_try) 2>&5
14287+ ac_status=$?
14288+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14289+ (exit $ac_status); }; } &&
14290+ { ac_try='test -s conftest.$ac_objext'
14291+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14292+ (eval $ac_try) 2>&5
14293+ ac_status=$?
14294+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14295+ (exit $ac_status); }; }; then
14296 ac_hi=-1 ac_mid=-1
14297 while :; do
14298 cat >conftest.$ac_ext <<_ACEOF
14299@@ -11683,11 +11018,10 @@
14300 #include <stdio.h>
14301
14302
14303- typedef rlim_t ac__type_sizeof_;
14304 int
14305 main ()
14306 {
14307-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
14308+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) >= $ac_mid)];
14309 test_array [0] = 0
14310
14311 ;
14312@@ -11695,48 +11029,49 @@
14313 }
14314 _ACEOF
14315 rm -f conftest.$ac_objext
14316-if { (ac_try="$ac_compile"
14317-case "(($ac_try" in
14318- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14319- *) ac_try_echo=$ac_try;;
14320-esac
14321-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14322- (eval "$ac_compile") 2>conftest.er1
14323+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14324+ (eval $ac_compile) 2>conftest.er1
14325 ac_status=$?
14326 grep -v '^ *+' conftest.er1 >conftest.err
14327 rm -f conftest.er1
14328 cat conftest.err >&5
14329 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14330- (exit $ac_status); } && {
14331- test -z "$ac_c_werror_flag" ||
14332- test ! -s conftest.err
14333- } && test -s conftest.$ac_objext; then
14334+ (exit $ac_status); } &&
14335+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14336+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14337+ (eval $ac_try) 2>&5
14338+ ac_status=$?
14339+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14340+ (exit $ac_status); }; } &&
14341+ { ac_try='test -s conftest.$ac_objext'
14342+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14343+ (eval $ac_try) 2>&5
14344+ ac_status=$?
14345+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14346+ (exit $ac_status); }; }; then
14347 ac_lo=$ac_mid; break
14348 else
14349 echo "$as_me: failed program was:" >&5
14350 sed 's/^/| /' conftest.$ac_ext >&5
14351
14352- ac_hi=`expr '(' $ac_mid ')' - 1`
14353- if test $ac_mid -le $ac_hi; then
14354- ac_lo= ac_hi=
14355- break
14356- fi
14357- ac_mid=`expr 2 '*' $ac_mid`
14358+ac_hi=`expr '(' $ac_mid ')' - 1`
14359+ if test $ac_mid -le $ac_hi; then
14360+ ac_lo= ac_hi=
14361+ break
14362+ fi
14363+ ac_mid=`expr 2 '*' $ac_mid`
14364 fi
14365-
14366-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14367+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14368 done
14369 else
14370 echo "$as_me: failed program was:" >&5
14371 sed 's/^/| /' conftest.$ac_ext >&5
14372
14373- ac_lo= ac_hi=
14374+ac_lo= ac_hi=
14375 fi
14376-
14377-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14378+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14379 fi
14380-
14381-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14382+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14383 # Binary search between lo and hi bounds.
14384 while test "x$ac_lo" != "x$ac_hi"; do
14385 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
14386@@ -11762,11 +11097,10 @@
14387 #include <stdio.h>
14388
14389
14390- typedef rlim_t ac__type_sizeof_;
14391 int
14392 main ()
14393 {
14394-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
14395+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) <= $ac_mid)];
14396 test_array [0] = 0
14397
14398 ;
14399@@ -11774,45 +11108,49 @@
14400 }
14401 _ACEOF
14402 rm -f conftest.$ac_objext
14403-if { (ac_try="$ac_compile"
14404-case "(($ac_try" in
14405- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14406- *) ac_try_echo=$ac_try;;
14407-esac
14408-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14409- (eval "$ac_compile") 2>conftest.er1
14410+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14411+ (eval $ac_compile) 2>conftest.er1
14412 ac_status=$?
14413 grep -v '^ *+' conftest.er1 >conftest.err
14414 rm -f conftest.er1
14415 cat conftest.err >&5
14416 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14417- (exit $ac_status); } && {
14418- test -z "$ac_c_werror_flag" ||
14419- test ! -s conftest.err
14420- } && test -s conftest.$ac_objext; then
14421+ (exit $ac_status); } &&
14422+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14423+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14424+ (eval $ac_try) 2>&5
14425+ ac_status=$?
14426+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14427+ (exit $ac_status); }; } &&
14428+ { ac_try='test -s conftest.$ac_objext'
14429+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14430+ (eval $ac_try) 2>&5
14431+ ac_status=$?
14432+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14433+ (exit $ac_status); }; }; then
14434 ac_hi=$ac_mid
14435 else
14436 echo "$as_me: failed program was:" >&5
14437 sed 's/^/| /' conftest.$ac_ext >&5
14438
14439- ac_lo=`expr '(' $ac_mid ')' + 1`
14440+ac_lo=`expr '(' $ac_mid ')' + 1`
14441 fi
14442-
14443-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14444+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14445 done
14446 case $ac_lo in
14447 ?*) ac_cv_sizeof_rlim_t=$ac_lo;;
14448-'') if test "$ac_cv_type_rlim_t" = yes; then
14449- { { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t)
14450+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t), 77
14451 See \`config.log' for more details." >&5
14452-echo "$as_me: error: cannot compute sizeof (rlim_t)
14453+echo "$as_me: error: cannot compute sizeof (rlim_t), 77
14454 See \`config.log' for more details." >&2;}
14455- { (exit 77); exit 77; }; }
14456- else
14457- ac_cv_sizeof_rlim_t=0
14458- fi ;;
14459+ { (exit 1); exit 1; }; } ;;
14460 esac
14461 else
14462+ if test "$cross_compiling" = yes; then
14463+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
14464+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
14465+ { (exit 1); exit 1; }; }
14466+else
14467 cat >conftest.$ac_ext <<_ACEOF
14468 /* confdefs.h. */
14469 _ACEOF
14470@@ -11835,9 +11173,8 @@
14471 #include <stdio.h>
14472
14473
14474- typedef rlim_t ac__type_sizeof_;
14475-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
14476-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
14477+long longval () { return (long) (sizeof (rlim_t)); }
14478+unsigned long ulongval () { return (long) (sizeof (rlim_t)); }
14479 #include <stdio.h>
14480 #include <stdlib.h>
14481 int
14482@@ -11846,44 +11183,35 @@
14483
14484 FILE *f = fopen ("conftest.val", "w");
14485 if (! f)
14486- return 1;
14487- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
14488+ exit (1);
14489+ if (((long) (sizeof (rlim_t))) < 0)
14490 {
14491- long int i = longval ();
14492- if (i != ((long int) (sizeof (ac__type_sizeof_))))
14493- return 1;
14494+ long i = longval ();
14495+ if (i != ((long) (sizeof (rlim_t))))
14496+ exit (1);
14497 fprintf (f, "%ld\n", i);
14498 }
14499 else
14500 {
14501- unsigned long int i = ulongval ();
14502- if (i != ((long int) (sizeof (ac__type_sizeof_))))
14503- return 1;
14504+ unsigned long i = ulongval ();
14505+ if (i != ((long) (sizeof (rlim_t))))
14506+ exit (1);
14507 fprintf (f, "%lu\n", i);
14508 }
14509- return ferror (f) || fclose (f) != 0;
14510+ exit (ferror (f) || fclose (f) != 0);
14511
14512 ;
14513 return 0;
14514 }
14515 _ACEOF
14516 rm -f conftest$ac_exeext
14517-if { (ac_try="$ac_link"
14518-case "(($ac_try" in
14519- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14520- *) ac_try_echo=$ac_try;;
14521-esac
14522-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14523- (eval "$ac_link") 2>&5
14524+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14525+ (eval $ac_link) 2>&5
14526 ac_status=$?
14527 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14528 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14529- { (case "(($ac_try" in
14530- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14531- *) ac_try_echo=$ac_try;;
14532-esac
14533-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14534- (eval "$ac_try") 2>&5
14535+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14536+ (eval $ac_try) 2>&5
14537 ac_status=$?
14538 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14539 (exit $ac_status); }; }; then
14540@@ -11894,33 +11222,30 @@
14541 sed 's/^/| /' conftest.$ac_ext >&5
14542
14543 ( exit $ac_status )
14544-if test "$ac_cv_type_rlim_t" = yes; then
14545- { { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t)
14546+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t), 77
14547 See \`config.log' for more details." >&5
14548-echo "$as_me: error: cannot compute sizeof (rlim_t)
14549+echo "$as_me: error: cannot compute sizeof (rlim_t), 77
14550 See \`config.log' for more details." >&2;}
14551- { (exit 77); exit 77; }; }
14552- else
14553- ac_cv_sizeof_rlim_t=0
14554- fi
14555+ { (exit 1); exit 1; }; }
14556+fi
14557+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14558 fi
14559-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14560 fi
14561 rm -f conftest.val
14562+else
14563+ ac_cv_sizeof_rlim_t=0
14564 fi
14565-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_rlim_t" >&5
14566-echo "${ECHO_T}$ac_cv_sizeof_rlim_t" >&6; }
14567-
14568-
14569-
14570+fi
14571+echo "$as_me:$LINENO: result: $ac_cv_sizeof_rlim_t" >&5
14572+echo "${ECHO_T}$ac_cv_sizeof_rlim_t" >&6
14573 cat >>confdefs.h <<_ACEOF
14574 #define SIZEOF_RLIM_T $ac_cv_sizeof_rlim_t
14575 _ACEOF
14576
14577
14578
14579-{ echo "$as_me:$LINENO: checking for size_t" >&5
14580-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
14581+echo "$as_me:$LINENO: checking for size_t" >&5
14582+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
14583 if test "${ac_cv_type_size_t+set}" = set; then
14584 echo $ECHO_N "(cached) $ECHO_C" >&6
14585 else
14586@@ -11931,59 +11256,62 @@
14587 cat >>conftest.$ac_ext <<_ACEOF
14588 /* end confdefs.h. */
14589 $ac_includes_default
14590-typedef size_t ac__type_new_;
14591 int
14592 main ()
14593 {
14594-if ((ac__type_new_ *) 0)
14595+if ((size_t *) 0)
14596 return 0;
14597-if (sizeof (ac__type_new_))
14598+if (sizeof (size_t))
14599 return 0;
14600 ;
14601 return 0;
14602 }
14603 _ACEOF
14604 rm -f conftest.$ac_objext
14605-if { (ac_try="$ac_compile"
14606-case "(($ac_try" in
14607- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14608- *) ac_try_echo=$ac_try;;
14609-esac
14610-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14611- (eval "$ac_compile") 2>conftest.er1
14612+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14613+ (eval $ac_compile) 2>conftest.er1
14614 ac_status=$?
14615 grep -v '^ *+' conftest.er1 >conftest.err
14616 rm -f conftest.er1
14617 cat conftest.err >&5
14618 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14619- (exit $ac_status); } && {
14620- test -z "$ac_c_werror_flag" ||
14621- test ! -s conftest.err
14622- } && test -s conftest.$ac_objext; then
14623+ (exit $ac_status); } &&
14624+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14625+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14626+ (eval $ac_try) 2>&5
14627+ ac_status=$?
14628+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14629+ (exit $ac_status); }; } &&
14630+ { ac_try='test -s conftest.$ac_objext'
14631+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14632+ (eval $ac_try) 2>&5
14633+ ac_status=$?
14634+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14635+ (exit $ac_status); }; }; then
14636 ac_cv_type_size_t=yes
14637 else
14638 echo "$as_me: failed program was:" >&5
14639 sed 's/^/| /' conftest.$ac_ext >&5
14640
14641- ac_cv_type_size_t=no
14642+ac_cv_type_size_t=no
14643 fi
14644-
14645-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14646+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14647 fi
14648-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
14649-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
14650+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
14651+echo "${ECHO_T}$ac_cv_type_size_t" >&6
14652 if test $ac_cv_type_size_t = yes; then
14653 :
14654 else
14655
14656 cat >>confdefs.h <<_ACEOF
14657-#define size_t unsigned int
14658+#define size_t unsigned
14659 _ACEOF
14660
14661 fi
14662
14663-{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
14664-echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
14665+
14666+echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
14667+echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
14668 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
14669 echo $ECHO_N "(cached) $ECHO_C" >&6
14670 else
14671@@ -12005,28 +11333,32 @@
14672 }
14673 _ACEOF
14674 rm -f conftest.$ac_objext
14675-if { (ac_try="$ac_compile"
14676-case "(($ac_try" in
14677- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14678- *) ac_try_echo=$ac_try;;
14679-esac
14680-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14681- (eval "$ac_compile") 2>conftest.er1
14682+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14683+ (eval $ac_compile) 2>conftest.er1
14684 ac_status=$?
14685 grep -v '^ *+' conftest.er1 >conftest.err
14686 rm -f conftest.er1
14687 cat conftest.err >&5
14688 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14689- (exit $ac_status); } && {
14690- test -z "$ac_c_werror_flag" ||
14691- test ! -s conftest.err
14692- } && test -s conftest.$ac_objext; then
14693+ (exit $ac_status); } &&
14694+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14695+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14696+ (eval $ac_try) 2>&5
14697+ ac_status=$?
14698+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14699+ (exit $ac_status); }; } &&
14700+ { ac_try='test -s conftest.$ac_objext'
14701+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14702+ (eval $ac_try) 2>&5
14703+ ac_status=$?
14704+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14705+ (exit $ac_status); }; }; then
14706 ac_cv_member_struct_stat_st_blksize=yes
14707 else
14708 echo "$as_me: failed program was:" >&5
14709 sed 's/^/| /' conftest.$ac_ext >&5
14710
14711- cat >conftest.$ac_ext <<_ACEOF
14712+cat >conftest.$ac_ext <<_ACEOF
14713 /* confdefs.h. */
14714 _ACEOF
14715 cat confdefs.h >>conftest.$ac_ext
14716@@ -12044,37 +11376,39 @@
14717 }
14718 _ACEOF
14719 rm -f conftest.$ac_objext
14720-if { (ac_try="$ac_compile"
14721-case "(($ac_try" in
14722- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14723- *) ac_try_echo=$ac_try;;
14724-esac
14725-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14726- (eval "$ac_compile") 2>conftest.er1
14727+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14728+ (eval $ac_compile) 2>conftest.er1
14729 ac_status=$?
14730 grep -v '^ *+' conftest.er1 >conftest.err
14731 rm -f conftest.er1
14732 cat conftest.err >&5
14733 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14734- (exit $ac_status); } && {
14735- test -z "$ac_c_werror_flag" ||
14736- test ! -s conftest.err
14737- } && test -s conftest.$ac_objext; then
14738+ (exit $ac_status); } &&
14739+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14740+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14741+ (eval $ac_try) 2>&5
14742+ ac_status=$?
14743+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14744+ (exit $ac_status); }; } &&
14745+ { ac_try='test -s conftest.$ac_objext'
14746+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14747+ (eval $ac_try) 2>&5
14748+ ac_status=$?
14749+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14750+ (exit $ac_status); }; }; then
14751 ac_cv_member_struct_stat_st_blksize=yes
14752 else
14753 echo "$as_me: failed program was:" >&5
14754 sed 's/^/| /' conftest.$ac_ext >&5
14755
14756- ac_cv_member_struct_stat_st_blksize=no
14757+ac_cv_member_struct_stat_st_blksize=no
14758 fi
14759-
14760-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14761+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14762 fi
14763-
14764-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14765+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14766 fi
14767-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
14768-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
14769+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
14770+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
14771 if test $ac_cv_member_struct_stat_st_blksize = yes; then
14772
14773 cat >>confdefs.h <<_ACEOF
14774@@ -12089,8 +11423,8 @@
14775 fi
14776
14777
14778-{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
14779-echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
14780+echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
14781+echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
14782 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
14783 echo $ECHO_N "(cached) $ECHO_C" >&6
14784 else
14785@@ -12112,28 +11446,32 @@
14786 }
14787 _ACEOF
14788 rm -f conftest.$ac_objext
14789-if { (ac_try="$ac_compile"
14790-case "(($ac_try" in
14791- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14792- *) ac_try_echo=$ac_try;;
14793-esac
14794-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14795- (eval "$ac_compile") 2>conftest.er1
14796+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14797+ (eval $ac_compile) 2>conftest.er1
14798 ac_status=$?
14799 grep -v '^ *+' conftest.er1 >conftest.err
14800 rm -f conftest.er1
14801 cat conftest.err >&5
14802 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14803- (exit $ac_status); } && {
14804- test -z "$ac_c_werror_flag" ||
14805- test ! -s conftest.err
14806- } && test -s conftest.$ac_objext; then
14807+ (exit $ac_status); } &&
14808+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14809+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14810+ (eval $ac_try) 2>&5
14811+ ac_status=$?
14812+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14813+ (exit $ac_status); }; } &&
14814+ { ac_try='test -s conftest.$ac_objext'
14815+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14816+ (eval $ac_try) 2>&5
14817+ ac_status=$?
14818+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14819+ (exit $ac_status); }; }; then
14820 ac_cv_member_struct_stat_st_blocks=yes
14821 else
14822 echo "$as_me: failed program was:" >&5
14823 sed 's/^/| /' conftest.$ac_ext >&5
14824
14825- cat >conftest.$ac_ext <<_ACEOF
14826+cat >conftest.$ac_ext <<_ACEOF
14827 /* confdefs.h. */
14828 _ACEOF
14829 cat confdefs.h >>conftest.$ac_ext
14830@@ -12151,37 +11489,39 @@
14831 }
14832 _ACEOF
14833 rm -f conftest.$ac_objext
14834-if { (ac_try="$ac_compile"
14835-case "(($ac_try" in
14836- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14837- *) ac_try_echo=$ac_try;;
14838-esac
14839-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14840- (eval "$ac_compile") 2>conftest.er1
14841+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14842+ (eval $ac_compile) 2>conftest.er1
14843 ac_status=$?
14844 grep -v '^ *+' conftest.er1 >conftest.err
14845 rm -f conftest.er1
14846 cat conftest.err >&5
14847 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14848- (exit $ac_status); } && {
14849- test -z "$ac_c_werror_flag" ||
14850- test ! -s conftest.err
14851- } && test -s conftest.$ac_objext; then
14852+ (exit $ac_status); } &&
14853+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14854+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14855+ (eval $ac_try) 2>&5
14856+ ac_status=$?
14857+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14858+ (exit $ac_status); }; } &&
14859+ { ac_try='test -s conftest.$ac_objext'
14860+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14861+ (eval $ac_try) 2>&5
14862+ ac_status=$?
14863+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14864+ (exit $ac_status); }; }; then
14865 ac_cv_member_struct_stat_st_blocks=yes
14866 else
14867 echo "$as_me: failed program was:" >&5
14868 sed 's/^/| /' conftest.$ac_ext >&5
14869
14870- ac_cv_member_struct_stat_st_blocks=no
14871+ac_cv_member_struct_stat_st_blocks=no
14872 fi
14873-
14874-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14875+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14876 fi
14877-
14878-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14879+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
14880 fi
14881-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
14882-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
14883+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
14884+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
14885 if test $ac_cv_member_struct_stat_st_blocks = yes; then
14886
14887 cat >>confdefs.h <<_ACEOF
14888@@ -12194,17 +11534,20 @@
14889 _ACEOF
14890
14891 else
14892- case " $LIBOBJS " in
14893+ case $LIBOBJS in
14894+ "fileblocks.$ac_objext" | \
14895+ *" fileblocks.$ac_objext" | \
14896+ "fileblocks.$ac_objext "* | \
14897 *" fileblocks.$ac_objext "* ) ;;
14898- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
14899- ;;
14900+ *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" ;;
14901 esac
14902
14903 fi
14904
14905
14906-{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
14907-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
14908+
14909+echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
14910+echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
14911 if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
14912 echo $ECHO_N "(cached) $ECHO_C" >&6
14913 else
14914@@ -12226,28 +11569,32 @@
14915 }
14916 _ACEOF
14917 rm -f conftest.$ac_objext
14918-if { (ac_try="$ac_compile"
14919-case "(($ac_try" in
14920- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14921- *) ac_try_echo=$ac_try;;
14922-esac
14923-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14924- (eval "$ac_compile") 2>conftest.er1
14925+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14926+ (eval $ac_compile) 2>conftest.er1
14927 ac_status=$?
14928 grep -v '^ *+' conftest.er1 >conftest.err
14929 rm -f conftest.er1
14930 cat conftest.err >&5
14931 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14932- (exit $ac_status); } && {
14933- test -z "$ac_c_werror_flag" ||
14934- test ! -s conftest.err
14935- } && test -s conftest.$ac_objext; then
14936+ (exit $ac_status); } &&
14937+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14938+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14939+ (eval $ac_try) 2>&5
14940+ ac_status=$?
14941+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14942+ (exit $ac_status); }; } &&
14943+ { ac_try='test -s conftest.$ac_objext'
14944+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14945+ (eval $ac_try) 2>&5
14946+ ac_status=$?
14947+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14948+ (exit $ac_status); }; }; then
14949 ac_cv_member_struct_stat_st_rdev=yes
14950 else
14951 echo "$as_me: failed program was:" >&5
14952 sed 's/^/| /' conftest.$ac_ext >&5
14953
14954- cat >conftest.$ac_ext <<_ACEOF
14955+cat >conftest.$ac_ext <<_ACEOF
14956 /* confdefs.h. */
14957 _ACEOF
14958 cat confdefs.h >>conftest.$ac_ext
14959@@ -12265,37 +11612,39 @@
14960 }
14961 _ACEOF
14962 rm -f conftest.$ac_objext
14963-if { (ac_try="$ac_compile"
14964-case "(($ac_try" in
14965- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14966- *) ac_try_echo=$ac_try;;
14967-esac
14968-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14969- (eval "$ac_compile") 2>conftest.er1
14970+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14971+ (eval $ac_compile) 2>conftest.er1
14972 ac_status=$?
14973 grep -v '^ *+' conftest.er1 >conftest.err
14974 rm -f conftest.er1
14975 cat conftest.err >&5
14976 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14977- (exit $ac_status); } && {
14978- test -z "$ac_c_werror_flag" ||
14979- test ! -s conftest.err
14980- } && test -s conftest.$ac_objext; then
14981+ (exit $ac_status); } &&
14982+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14983+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14984+ (eval $ac_try) 2>&5
14985+ ac_status=$?
14986+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14987+ (exit $ac_status); }; } &&
14988+ { ac_try='test -s conftest.$ac_objext'
14989+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14990+ (eval $ac_try) 2>&5
14991+ ac_status=$?
14992+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
14993+ (exit $ac_status); }; }; then
14994 ac_cv_member_struct_stat_st_rdev=yes
14995 else
14996 echo "$as_me: failed program was:" >&5
14997 sed 's/^/| /' conftest.$ac_ext >&5
14998
14999- ac_cv_member_struct_stat_st_rdev=no
15000+ac_cv_member_struct_stat_st_rdev=no
15001 fi
15002-
15003-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15004+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15005 fi
15006-
15007-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15008+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15009 fi
15010-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
15011-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
15012+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
15013+echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
15014 if test $ac_cv_member_struct_stat_st_rdev = yes; then
15015
15016 cat >>confdefs.h <<_ACEOF
15017@@ -12311,8 +11660,8 @@
15018
15019
15020
15021-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
15022-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
15023+echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
15024+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
15025 if test "${ac_cv_type_uid_t+set}" = set; then
15026 echo $ECHO_N "(cached) $ECHO_C" >&6
15027 else
15028@@ -12334,8 +11683,8 @@
15029 rm -f conftest*
15030
15031 fi
15032-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
15033-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
15034+echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
15035+echo "${ECHO_T}$ac_cv_type_uid_t" >&6
15036 if test $ac_cv_type_uid_t = no; then
15037
15038 cat >>confdefs.h <<\_ACEOF
15039@@ -12349,8 +11698,8 @@
15040
15041 fi
15042
15043-{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
15044-echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
15045+echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
15046+echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
15047 if test "${ac_cv_type_getgroups+set}" = set; then
15048 echo $ECHO_N "(cached) $ECHO_C" >&6
15049 else
15050@@ -12364,7 +11713,7 @@
15051 cat >>conftest.$ac_ext <<_ACEOF
15052 /* end confdefs.h. */
15053 /* Thanks to Mike Rendell for this test. */
15054-$ac_includes_default
15055+#include <sys/types.h>
15056 #define NGID 256
15057 #undef MAX
15058 #define MAX(x, y) ((x) > (y) ? (x) : (y))
15059@@ -12374,7 +11723,7 @@
15060 {
15061 gid_t gidset[NGID];
15062 int i, n;
15063- union { gid_t gval; long int lval; } val;
15064+ union { gid_t gval; long lval; } val;
15065
15066 val.lval = -1;
15067 for (i = 0; i < NGID; i++)
15068@@ -12382,28 +11731,18 @@
15069 n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
15070 gidset);
15071 /* Exit non-zero if getgroups seems to require an array of ints. This
15072- happens when gid_t is short int but getgroups modifies an array
15073- of ints. */
15074- return n > 0 && gidset[n] != val.gval;
15075+ happens when gid_t is short but getgroups modifies an array of ints. */
15076+ exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
15077 }
15078 _ACEOF
15079 rm -f conftest$ac_exeext
15080-if { (ac_try="$ac_link"
15081-case "(($ac_try" in
15082- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15083- *) ac_try_echo=$ac_try;;
15084-esac
15085-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15086- (eval "$ac_link") 2>&5
15087+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15088+ (eval $ac_link) 2>&5
15089 ac_status=$?
15090 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15091 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
15092- { (case "(($ac_try" in
15093- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15094- *) ac_try_echo=$ac_try;;
15095-esac
15096-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15097- (eval "$ac_try") 2>&5
15098+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15099+ (eval $ac_try) 2>&5
15100 ac_status=$?
15101 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15102 (exit $ac_status); }; }; then
15103@@ -12416,10 +11755,8 @@
15104 ( exit $ac_status )
15105 ac_cv_type_getgroups=int
15106 fi
15107-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15108+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15109 fi
15110-
15111-
15112 if test $ac_cv_type_getgroups = cross; then
15113 cat >conftest.$ac_ext <<_ACEOF
15114 /* confdefs.h. */
15115@@ -12440,16 +11777,16 @@
15116
15117 fi
15118 fi
15119-{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
15120-echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
15121+echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
15122+echo "${ECHO_T}$ac_cv_type_getgroups" >&6
15123
15124 cat >>confdefs.h <<_ACEOF
15125 #define GETGROUPS_T $ac_cv_type_getgroups
15126 _ACEOF
15127
15128
15129-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
15130-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
15131+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
15132+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
15133 if test "${ac_cv_type_signal+set}" = set; then
15134 echo $ECHO_N "(cached) $ECHO_C" >&6
15135 else
15136@@ -12461,44 +11798,55 @@
15137 /* end confdefs.h. */
15138 #include <sys/types.h>
15139 #include <signal.h>
15140+#ifdef signal
15141+# undef signal
15142+#endif
15143+#ifdef __cplusplus
15144+extern "C" void (*signal (int, void (*)(int)))(int);
15145+#else
15146+void (*signal ()) ();
15147+#endif
15148
15149 int
15150 main ()
15151 {
15152-return *(signal (0, 0)) (0) == 1;
15153+int i;
15154 ;
15155 return 0;
15156 }
15157 _ACEOF
15158 rm -f conftest.$ac_objext
15159-if { (ac_try="$ac_compile"
15160-case "(($ac_try" in
15161- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15162- *) ac_try_echo=$ac_try;;
15163-esac
15164-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15165- (eval "$ac_compile") 2>conftest.er1
15166+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15167+ (eval $ac_compile) 2>conftest.er1
15168 ac_status=$?
15169 grep -v '^ *+' conftest.er1 >conftest.err
15170 rm -f conftest.er1
15171 cat conftest.err >&5
15172 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15173- (exit $ac_status); } && {
15174- test -z "$ac_c_werror_flag" ||
15175- test ! -s conftest.err
15176- } && test -s conftest.$ac_objext; then
15177- ac_cv_type_signal=int
15178+ (exit $ac_status); } &&
15179+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15180+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15181+ (eval $ac_try) 2>&5
15182+ ac_status=$?
15183+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15184+ (exit $ac_status); }; } &&
15185+ { ac_try='test -s conftest.$ac_objext'
15186+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15187+ (eval $ac_try) 2>&5
15188+ ac_status=$?
15189+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15190+ (exit $ac_status); }; }; then
15191+ ac_cv_type_signal=void
15192 else
15193 echo "$as_me: failed program was:" >&5
15194 sed 's/^/| /' conftest.$ac_ext >&5
15195
15196- ac_cv_type_signal=void
15197+ac_cv_type_signal=int
15198 fi
15199-
15200-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15201+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15202 fi
15203-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
15204-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
15205+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
15206+echo "${ECHO_T}$ac_cv_type_signal" >&6
15207
15208 cat >>confdefs.h <<_ACEOF
15209 #define RETSIGTYPE $ac_cv_type_signal
15210@@ -12522,8 +11870,8 @@
15211 *)
15212 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
15213 # for constant arguments. Useless!
15214-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
15215-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
15216+echo "$as_me:$LINENO: checking for working alloca.h" >&5
15217+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
15218 if test "${ac_cv_working_alloca_h+set}" = set; then
15219 echo $ECHO_N "(cached) $ECHO_C" >&6
15220 else
15221@@ -12538,42 +11886,43 @@
15222 main ()
15223 {
15224 char *p = (char *) alloca (2 * sizeof (int));
15225- if (p) return 0;
15226 ;
15227 return 0;
15228 }
15229 _ACEOF
15230 rm -f conftest.$ac_objext conftest$ac_exeext
15231-if { (ac_try="$ac_link"
15232-case "(($ac_try" in
15233- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15234- *) ac_try_echo=$ac_try;;
15235-esac
15236-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15237- (eval "$ac_link") 2>conftest.er1
15238+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15239+ (eval $ac_link) 2>conftest.er1
15240 ac_status=$?
15241 grep -v '^ *+' conftest.er1 >conftest.err
15242 rm -f conftest.er1
15243 cat conftest.err >&5
15244 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15245- (exit $ac_status); } && {
15246- test -z "$ac_c_werror_flag" ||
15247- test ! -s conftest.err
15248- } && test -s conftest$ac_exeext &&
15249- $as_test_x conftest$ac_exeext; then
15250+ (exit $ac_status); } &&
15251+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15252+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15253+ (eval $ac_try) 2>&5
15254+ ac_status=$?
15255+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15256+ (exit $ac_status); }; } &&
15257+ { ac_try='test -s conftest$ac_exeext'
15258+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15259+ (eval $ac_try) 2>&5
15260+ ac_status=$?
15261+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15262+ (exit $ac_status); }; }; then
15263 ac_cv_working_alloca_h=yes
15264 else
15265 echo "$as_me: failed program was:" >&5
15266 sed 's/^/| /' conftest.$ac_ext >&5
15267
15268- ac_cv_working_alloca_h=no
15269+ac_cv_working_alloca_h=no
15270 fi
15271-
15272-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15273+rm -f conftest.err conftest.$ac_objext \
15274 conftest$ac_exeext conftest.$ac_ext
15275 fi
15276-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
15277-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
15278+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
15279+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
15280 if test $ac_cv_working_alloca_h = yes; then
15281
15282 cat >>confdefs.h <<\_ACEOF
15283@@ -12582,8 +11931,8 @@
15284
15285 fi
15286
15287-{ echo "$as_me:$LINENO: checking for alloca" >&5
15288-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
15289+echo "$as_me:$LINENO: checking for alloca" >&5
15290+echo $ECHO_N "checking for alloca... $ECHO_C" >&6
15291 if test "${ac_cv_func_alloca_works+set}" = set; then
15292 echo $ECHO_N "(cached) $ECHO_C" >&6
15293 else
15294@@ -12600,7 +11949,7 @@
15295 # include <malloc.h>
15296 # define alloca _alloca
15297 # else
15298-# ifdef HAVE_ALLOCA_H
15299+# if HAVE_ALLOCA_H
15300 # include <alloca.h>
15301 # else
15302 # ifdef _AIX
15303@@ -12618,42 +11967,43 @@
15304 main ()
15305 {
15306 char *p = (char *) alloca (1);
15307- if (p) return 0;
15308 ;
15309 return 0;
15310 }
15311 _ACEOF
15312 rm -f conftest.$ac_objext conftest$ac_exeext
15313-if { (ac_try="$ac_link"
15314-case "(($ac_try" in
15315- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15316- *) ac_try_echo=$ac_try;;
15317-esac
15318-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15319- (eval "$ac_link") 2>conftest.er1
15320+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15321+ (eval $ac_link) 2>conftest.er1
15322 ac_status=$?
15323 grep -v '^ *+' conftest.er1 >conftest.err
15324 rm -f conftest.er1
15325 cat conftest.err >&5
15326 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15327- (exit $ac_status); } && {
15328- test -z "$ac_c_werror_flag" ||
15329- test ! -s conftest.err
15330- } && test -s conftest$ac_exeext &&
15331- $as_test_x conftest$ac_exeext; then
15332+ (exit $ac_status); } &&
15333+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15334+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15335+ (eval $ac_try) 2>&5
15336+ ac_status=$?
15337+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15338+ (exit $ac_status); }; } &&
15339+ { ac_try='test -s conftest$ac_exeext'
15340+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15341+ (eval $ac_try) 2>&5
15342+ ac_status=$?
15343+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15344+ (exit $ac_status); }; }; then
15345 ac_cv_func_alloca_works=yes
15346 else
15347 echo "$as_me: failed program was:" >&5
15348 sed 's/^/| /' conftest.$ac_ext >&5
15349
15350- ac_cv_func_alloca_works=no
15351+ac_cv_func_alloca_works=no
15352 fi
15353-
15354-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15355+rm -f conftest.err conftest.$ac_objext \
15356 conftest$ac_exeext conftest.$ac_ext
15357 fi
15358-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
15359-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
15360+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
15361+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
15362
15363 if test $ac_cv_func_alloca_works = yes; then
15364
15365@@ -12667,15 +12017,15 @@
15366 # contain a buggy version. If you still want to use their alloca,
15367 # use ar to extract alloca.o from them instead of compiling alloca.c.
15368
15369-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
15370+ALLOCA=alloca.$ac_objext
15371
15372 cat >>confdefs.h <<\_ACEOF
15373 #define C_ALLOCA 1
15374 _ACEOF
15375
15376
15377-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
15378-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
15379+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
15380+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
15381 if test "${ac_cv_os_cray+set}" = set; then
15382 echo $ECHO_N "(cached) $ECHO_C" >&6
15383 else
15384@@ -12685,7 +12035,7 @@
15385 cat confdefs.h >>conftest.$ac_ext
15386 cat >>conftest.$ac_ext <<_ACEOF
15387 /* end confdefs.h. */
15388-#if defined CRAY && ! defined CRAY2
15389+#if defined(CRAY) && ! defined(CRAY2)
15390 webecray
15391 #else
15392 wenotbecray
15393@@ -12701,14 +12051,14 @@
15394 rm -f conftest*
15395
15396 fi
15397-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
15398-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
15399+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
15400+echo "${ECHO_T}$ac_cv_os_cray" >&6
15401 if test $ac_cv_os_cray = yes; then
15402 for ac_func in _getb67 GETB67 getb67; do
15403 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
15404-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
15405-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
15406-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15407+echo "$as_me:$LINENO: checking for $ac_func" >&5
15408+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
15409+if eval "test \"\${$as_ac_var+set}\" = set"; then
15410 echo $ECHO_N "(cached) $ECHO_C" >&6
15411 else
15412 cat >conftest.$ac_ext <<_ACEOF
15413@@ -12734,60 +12084,67 @@
15414
15415 #undef $ac_func
15416
15417-/* Override any GCC internal prototype to avoid an error.
15418- Use char because int might match the return type of a GCC
15419- builtin and then its argument prototype would still apply. */
15420+/* Override any gcc2 internal prototype to avoid an error. */
15421 #ifdef __cplusplus
15422 extern "C"
15423+{
15424 #endif
15425+/* We use char because int might match the return type of a gcc2
15426+ builtin and then its argument prototype would still apply. */
15427 char $ac_func ();
15428 /* The GNU C library defines this for functions which it implements
15429 to always fail with ENOSYS. Some functions are actually named
15430 something starting with __ and the normal name is an alias. */
15431-#if defined __stub_$ac_func || defined __stub___$ac_func
15432+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15433 choke me
15434+#else
15435+char (*f) () = $ac_func;
15436+#endif
15437+#ifdef __cplusplus
15438+}
15439 #endif
15440
15441 int
15442 main ()
15443 {
15444-return $ac_func ();
15445+return f != $ac_func;
15446 ;
15447 return 0;
15448 }
15449 _ACEOF
15450 rm -f conftest.$ac_objext conftest$ac_exeext
15451-if { (ac_try="$ac_link"
15452-case "(($ac_try" in
15453- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15454- *) ac_try_echo=$ac_try;;
15455-esac
15456-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15457- (eval "$ac_link") 2>conftest.er1
15458+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15459+ (eval $ac_link) 2>conftest.er1
15460 ac_status=$?
15461 grep -v '^ *+' conftest.er1 >conftest.err
15462 rm -f conftest.er1
15463 cat conftest.err >&5
15464 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15465- (exit $ac_status); } && {
15466- test -z "$ac_c_werror_flag" ||
15467- test ! -s conftest.err
15468- } && test -s conftest$ac_exeext &&
15469- $as_test_x conftest$ac_exeext; then
15470+ (exit $ac_status); } &&
15471+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15472+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15473+ (eval $ac_try) 2>&5
15474+ ac_status=$?
15475+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15476+ (exit $ac_status); }; } &&
15477+ { ac_try='test -s conftest$ac_exeext'
15478+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15479+ (eval $ac_try) 2>&5
15480+ ac_status=$?
15481+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15482+ (exit $ac_status); }; }; then
15483 eval "$as_ac_var=yes"
15484 else
15485 echo "$as_me: failed program was:" >&5
15486 sed 's/^/| /' conftest.$ac_ext >&5
15487
15488- eval "$as_ac_var=no"
15489+eval "$as_ac_var=no"
15490 fi
15491-
15492-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15493+rm -f conftest.err conftest.$ac_objext \
15494 conftest$ac_exeext conftest.$ac_ext
15495 fi
15496-ac_res=`eval echo '${'$as_ac_var'}'`
15497- { echo "$as_me:$LINENO: result: $ac_res" >&5
15498-echo "${ECHO_T}$ac_res" >&6; }
15499+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
15500+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
15501 if test `eval echo '${'$as_ac_var'}'` = yes; then
15502
15503 cat >>confdefs.h <<_ACEOF
15504@@ -12800,8 +12157,8 @@
15505 done
15506 fi
15507
15508-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
15509-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
15510+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
15511+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
15512 if test "${ac_cv_c_stack_direction+set}" = set; then
15513 echo $ECHO_N "(cached) $ECHO_C" >&6
15514 else
15515@@ -12814,7 +12171,6 @@
15516 cat confdefs.h >>conftest.$ac_ext
15517 cat >>conftest.$ac_ext <<_ACEOF
15518 /* end confdefs.h. */
15519-$ac_includes_default
15520 int
15521 find_stack_direction ()
15522 {
15523@@ -12832,26 +12188,17 @@
15524 int
15525 main ()
15526 {
15527- return find_stack_direction () < 0;
15528+ exit (find_stack_direction () < 0);
15529 }
15530 _ACEOF
15531 rm -f conftest$ac_exeext
15532-if { (ac_try="$ac_link"
15533-case "(($ac_try" in
15534- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15535- *) ac_try_echo=$ac_try;;
15536-esac
15537-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15538- (eval "$ac_link") 2>&5
15539+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15540+ (eval $ac_link) 2>&5
15541 ac_status=$?
15542 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15543 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
15544- { (case "(($ac_try" in
15545- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15546- *) ac_try_echo=$ac_try;;
15547-esac
15548-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15549- (eval "$ac_try") 2>&5
15550+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15551+ (eval $ac_try) 2>&5
15552 ac_status=$?
15553 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15554 (exit $ac_status); }; }; then
15555@@ -12864,13 +12211,11 @@
15556 ( exit $ac_status )
15557 ac_cv_c_stack_direction=-1
15558 fi
15559-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15560+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15561 fi
15562-
15563-
15564 fi
15565-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
15566-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
15567+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
15568+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
15569
15570 cat >>confdefs.h <<_ACEOF
15571 #define STACK_DIRECTION $ac_cv_c_stack_direction
15572@@ -12881,8 +12226,8 @@
15573
15574 ;;
15575 esac
15576-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
15577-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
15578+echo "$as_me:$LINENO: checking for working memcmp" >&5
15579+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
15580 if test "${ac_cv_func_memcmp_working+set}" = set; then
15581 echo $ECHO_N "(cached) $ECHO_C" >&6
15582 else
15583@@ -12901,9 +12246,9 @@
15584 {
15585
15586 /* Some versions of memcmp are not 8-bit clean. */
15587- char c0 = '\100', c1 = '\200', c2 = '\201';
15588+ char c0 = 0x40, c1 = 0x80, c2 = 0x81;
15589 if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
15590- return 1;
15591+ exit (1);
15592
15593 /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
15594 or more and with at least one buffer not starting on a 4-byte boundary.
15595@@ -12919,9 +12264,9 @@
15596 strcpy (a, "--------01111111");
15597 strcpy (b, "--------10000000");
15598 if (memcmp (a, b, 16) >= 0)
15599- return 1;
15600+ exit (1);
15601 }
15602- return 0;
15603+ exit (0);
15604 }
15605
15606 ;
15607@@ -12929,22 +12274,13 @@
15608 }
15609 _ACEOF
15610 rm -f conftest$ac_exeext
15611-if { (ac_try="$ac_link"
15612-case "(($ac_try" in
15613- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15614- *) ac_try_echo=$ac_try;;
15615-esac
15616-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15617- (eval "$ac_link") 2>&5
15618+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15619+ (eval $ac_link) 2>&5
15620 ac_status=$?
15621 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15622 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
15623- { (case "(($ac_try" in
15624- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15625- *) ac_try_echo=$ac_try;;
15626-esac
15627-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15628- (eval "$ac_try") 2>&5
15629+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15630+ (eval $ac_try) 2>&5
15631 ac_status=$?
15632 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15633 (exit $ac_status); }; }; then
15634@@ -12957,71 +12293,70 @@
15635 ( exit $ac_status )
15636 ac_cv_func_memcmp_working=no
15637 fi
15638-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15639+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
15640 fi
15641-
15642-
15643 fi
15644-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
15645-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
15646-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
15647+echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
15648+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
15649+test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
15650+ "memcmp.$ac_objext" | \
15651+ *" memcmp.$ac_objext" | \
15652+ "memcmp.$ac_objext "* | \
15653 *" memcmp.$ac_objext "* ) ;;
15654- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
15655- ;;
15656+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
15657 esac
15658
15659
15660-{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
15661-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
15662+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
15663+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
15664 if test "${ac_cv_sys_largefile_source+set}" = set; then
15665 echo $ECHO_N "(cached) $ECHO_C" >&6
15666 else
15667 while :; do
15668+ ac_cv_sys_largefile_source=no
15669 cat >conftest.$ac_ext <<_ACEOF
15670 /* confdefs.h. */
15671 _ACEOF
15672 cat confdefs.h >>conftest.$ac_ext
15673 cat >>conftest.$ac_ext <<_ACEOF
15674 /* end confdefs.h. */
15675-#include <sys/types.h> /* for off_t */
15676- #include <stdio.h>
15677+#include <stdio.h>
15678 int
15679 main ()
15680 {
15681-int (*fp) (FILE *, off_t, int) = fseeko;
15682- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
15683+return !fseeko;
15684 ;
15685 return 0;
15686 }
15687 _ACEOF
15688-rm -f conftest.$ac_objext conftest$ac_exeext
15689-if { (ac_try="$ac_link"
15690-case "(($ac_try" in
15691- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15692- *) ac_try_echo=$ac_try;;
15693-esac
15694-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15695- (eval "$ac_link") 2>conftest.er1
15696+rm -f conftest.$ac_objext
15697+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15698+ (eval $ac_compile) 2>conftest.er1
15699 ac_status=$?
15700 grep -v '^ *+' conftest.er1 >conftest.err
15701 rm -f conftest.er1
15702 cat conftest.err >&5
15703 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15704- (exit $ac_status); } && {
15705- test -z "$ac_c_werror_flag" ||
15706- test ! -s conftest.err
15707- } && test -s conftest$ac_exeext &&
15708- $as_test_x conftest$ac_exeext; then
15709- ac_cv_sys_largefile_source=no; break
15710+ (exit $ac_status); } &&
15711+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15712+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15713+ (eval $ac_try) 2>&5
15714+ ac_status=$?
15715+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15716+ (exit $ac_status); }; } &&
15717+ { ac_try='test -s conftest.$ac_objext'
15718+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15719+ (eval $ac_try) 2>&5
15720+ ac_status=$?
15721+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15722+ (exit $ac_status); }; }; then
15723+ break
15724 else
15725 echo "$as_me: failed program was:" >&5
15726 sed 's/^/| /' conftest.$ac_ext >&5
15727
15728-
15729 fi
15730-
15731-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15732- conftest$ac_exeext conftest.$ac_ext
15733+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15734 cat >conftest.$ac_ext <<_ACEOF
15735 /* confdefs.h. */
15736 _ACEOF
15737@@ -13029,65 +12364,114 @@
15738 cat >>conftest.$ac_ext <<_ACEOF
15739 /* end confdefs.h. */
15740 #define _LARGEFILE_SOURCE 1
15741-#include <sys/types.h> /* for off_t */
15742- #include <stdio.h>
15743+#include <stdio.h>
15744 int
15745 main ()
15746 {
15747-int (*fp) (FILE *, off_t, int) = fseeko;
15748- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
15749+return !fseeko;
15750 ;
15751 return 0;
15752 }
15753 _ACEOF
15754-rm -f conftest.$ac_objext conftest$ac_exeext
15755-if { (ac_try="$ac_link"
15756-case "(($ac_try" in
15757- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15758- *) ac_try_echo=$ac_try;;
15759-esac
15760-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15761- (eval "$ac_link") 2>conftest.er1
15762+rm -f conftest.$ac_objext
15763+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15764+ (eval $ac_compile) 2>conftest.er1
15765 ac_status=$?
15766 grep -v '^ *+' conftest.er1 >conftest.err
15767 rm -f conftest.er1
15768 cat conftest.err >&5
15769 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15770- (exit $ac_status); } && {
15771- test -z "$ac_c_werror_flag" ||
15772- test ! -s conftest.err
15773- } && test -s conftest$ac_exeext &&
15774- $as_test_x conftest$ac_exeext; then
15775+ (exit $ac_status); } &&
15776+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15777+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15778+ (eval $ac_try) 2>&5
15779+ ac_status=$?
15780+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15781+ (exit $ac_status); }; } &&
15782+ { ac_try='test -s conftest.$ac_objext'
15783+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15784+ (eval $ac_try) 2>&5
15785+ ac_status=$?
15786+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15787+ (exit $ac_status); }; }; then
15788 ac_cv_sys_largefile_source=1; break
15789 else
15790 echo "$as_me: failed program was:" >&5
15791 sed 's/^/| /' conftest.$ac_ext >&5
15792
15793-
15794 fi
15795-
15796-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15797- conftest$ac_exeext conftest.$ac_ext
15798- ac_cv_sys_largefile_source=unknown
15799+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
15800 break
15801 done
15802 fi
15803-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
15804-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
15805-case $ac_cv_sys_largefile_source in #(
15806- no | unknown) ;;
15807- *)
15808+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
15809+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
15810+if test "$ac_cv_sys_largefile_source" != no; then
15811+
15812 cat >>confdefs.h <<_ACEOF
15813 #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
15814 _ACEOF
15815-;;
15816-esac
15817+
15818+fi
15819 rm -f conftest*
15820
15821 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
15822 # in glibc 2.1.3, but that breaks too many other things.
15823 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
15824-if test $ac_cv_sys_largefile_source != unknown; then
15825+echo "$as_me:$LINENO: checking for fseeko" >&5
15826+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
15827+if test "${ac_cv_func_fseeko+set}" = set; then
15828+ echo $ECHO_N "(cached) $ECHO_C" >&6
15829+else
15830+ cat >conftest.$ac_ext <<_ACEOF
15831+/* confdefs.h. */
15832+_ACEOF
15833+cat confdefs.h >>conftest.$ac_ext
15834+cat >>conftest.$ac_ext <<_ACEOF
15835+/* end confdefs.h. */
15836+#include <stdio.h>
15837+int
15838+main ()
15839+{
15840+return fseeko && fseeko (stdin, 0, 0);
15841+ ;
15842+ return 0;
15843+}
15844+_ACEOF
15845+rm -f conftest.$ac_objext conftest$ac_exeext
15846+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15847+ (eval $ac_link) 2>conftest.er1
15848+ ac_status=$?
15849+ grep -v '^ *+' conftest.er1 >conftest.err
15850+ rm -f conftest.er1
15851+ cat conftest.err >&5
15852+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15853+ (exit $ac_status); } &&
15854+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15855+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15856+ (eval $ac_try) 2>&5
15857+ ac_status=$?
15858+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15859+ (exit $ac_status); }; } &&
15860+ { ac_try='test -s conftest$ac_exeext'
15861+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15862+ (eval $ac_try) 2>&5
15863+ ac_status=$?
15864+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15865+ (exit $ac_status); }; }; then
15866+ ac_cv_func_fseeko=yes
15867+else
15868+ echo "$as_me: failed program was:" >&5
15869+sed 's/^/| /' conftest.$ac_ext >&5
15870+
15871+ac_cv_func_fseeko=no
15872+fi
15873+rm -f conftest.err conftest.$ac_objext \
15874+ conftest$ac_exeext conftest.$ac_ext
15875+fi
15876+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
15877+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
15878+if test $ac_cv_func_fseeko = yes; then
15879
15880 cat >>confdefs.h <<\_ACEOF
15881 #define HAVE_FSEEKO 1
15882@@ -13099,9 +12483,9 @@
15883 for ac_func in ftello
15884 do
15885 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
15886-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
15887-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
15888-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15889+echo "$as_me:$LINENO: checking for $ac_func" >&5
15890+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
15891+if eval "test \"\${$as_ac_var+set}\" = set"; then
15892 echo $ECHO_N "(cached) $ECHO_C" >&6
15893 else
15894 cat >conftest.$ac_ext <<_ACEOF
15895@@ -13127,60 +12511,67 @@
15896
15897 #undef $ac_func
15898
15899-/* Override any GCC internal prototype to avoid an error.
15900- Use char because int might match the return type of a GCC
15901- builtin and then its argument prototype would still apply. */
15902+/* Override any gcc2 internal prototype to avoid an error. */
15903 #ifdef __cplusplus
15904 extern "C"
15905+{
15906 #endif
15907+/* We use char because int might match the return type of a gcc2
15908+ builtin and then its argument prototype would still apply. */
15909 char $ac_func ();
15910 /* The GNU C library defines this for functions which it implements
15911 to always fail with ENOSYS. Some functions are actually named
15912 something starting with __ and the normal name is an alias. */
15913-#if defined __stub_$ac_func || defined __stub___$ac_func
15914+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15915 choke me
15916+#else
15917+char (*f) () = $ac_func;
15918+#endif
15919+#ifdef __cplusplus
15920+}
15921 #endif
15922
15923 int
15924 main ()
15925 {
15926-return $ac_func ();
15927+return f != $ac_func;
15928 ;
15929 return 0;
15930 }
15931 _ACEOF
15932 rm -f conftest.$ac_objext conftest$ac_exeext
15933-if { (ac_try="$ac_link"
15934-case "(($ac_try" in
15935- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15936- *) ac_try_echo=$ac_try;;
15937-esac
15938-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15939- (eval "$ac_link") 2>conftest.er1
15940+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15941+ (eval $ac_link) 2>conftest.er1
15942 ac_status=$?
15943 grep -v '^ *+' conftest.er1 >conftest.err
15944 rm -f conftest.er1
15945 cat conftest.err >&5
15946 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15947- (exit $ac_status); } && {
15948- test -z "$ac_c_werror_flag" ||
15949- test ! -s conftest.err
15950- } && test -s conftest$ac_exeext &&
15951- $as_test_x conftest$ac_exeext; then
15952+ (exit $ac_status); } &&
15953+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15954+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15955+ (eval $ac_try) 2>&5
15956+ ac_status=$?
15957+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15958+ (exit $ac_status); }; } &&
15959+ { ac_try='test -s conftest$ac_exeext'
15960+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15961+ (eval $ac_try) 2>&5
15962+ ac_status=$?
15963+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
15964+ (exit $ac_status); }; }; then
15965 eval "$as_ac_var=yes"
15966 else
15967 echo "$as_me: failed program was:" >&5
15968 sed 's/^/| /' conftest.$ac_ext >&5
15969
15970- eval "$as_ac_var=no"
15971+eval "$as_ac_var=no"
15972 fi
15973-
15974-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15975+rm -f conftest.err conftest.$ac_objext \
15976 conftest$ac_exeext conftest.$ac_ext
15977 fi
15978-ac_res=`eval echo '${'$as_ac_var'}'`
15979- { echo "$as_me:$LINENO: result: $ac_res" >&5
15980-echo "${ECHO_T}$ac_res" >&6; }
15981+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
15982+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
15983 if test `eval echo '${'$as_ac_var'}'` = yes; then
15984 cat >>confdefs.h <<_ACEOF
15985 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
15986@@ -13212,9 +12603,9 @@
15987 isnan finite isinf hypot acosh erf
15988 do
15989 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
15990-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
15991-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
15992-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
15993+echo "$as_me:$LINENO: checking for $ac_func" >&5
15994+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
15995+if eval "test \"\${$as_ac_var+set}\" = set"; then
15996 echo $ECHO_N "(cached) $ECHO_C" >&6
15997 else
15998 cat >conftest.$ac_ext <<_ACEOF
15999@@ -13240,70 +12631,79 @@
16000
16001 #undef $ac_func
16002
16003-/* Override any GCC internal prototype to avoid an error.
16004- Use char because int might match the return type of a GCC
16005- builtin and then its argument prototype would still apply. */
16006+/* Override any gcc2 internal prototype to avoid an error. */
16007 #ifdef __cplusplus
16008 extern "C"
16009+{
16010 #endif
16011+/* We use char because int might match the return type of a gcc2
16012+ builtin and then its argument prototype would still apply. */
16013 char $ac_func ();
16014 /* The GNU C library defines this for functions which it implements
16015 to always fail with ENOSYS. Some functions are actually named
16016 something starting with __ and the normal name is an alias. */
16017-#if defined __stub_$ac_func || defined __stub___$ac_func
16018+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
16019 choke me
16020+#else
16021+char (*f) () = $ac_func;
16022 #endif
16023-
16024-int
16025+#ifdef __cplusplus
16026+}
16027+#endif
16028+
16029+int
16030 main ()
16031 {
16032-return $ac_func ();
16033+return f != $ac_func;
16034 ;
16035 return 0;
16036 }
16037 _ACEOF
16038 rm -f conftest.$ac_objext conftest$ac_exeext
16039-if { (ac_try="$ac_link"
16040-case "(($ac_try" in
16041- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16042- *) ac_try_echo=$ac_try;;
16043-esac
16044-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16045- (eval "$ac_link") 2>conftest.er1
16046+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16047+ (eval $ac_link) 2>conftest.er1
16048 ac_status=$?
16049 grep -v '^ *+' conftest.er1 >conftest.err
16050 rm -f conftest.er1
16051 cat conftest.err >&5
16052 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16053- (exit $ac_status); } && {
16054- test -z "$ac_c_werror_flag" ||
16055- test ! -s conftest.err
16056- } && test -s conftest$ac_exeext &&
16057- $as_test_x conftest$ac_exeext; then
16058+ (exit $ac_status); } &&
16059+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16060+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16061+ (eval $ac_try) 2>&5
16062+ ac_status=$?
16063+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16064+ (exit $ac_status); }; } &&
16065+ { ac_try='test -s conftest$ac_exeext'
16066+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16067+ (eval $ac_try) 2>&5
16068+ ac_status=$?
16069+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16070+ (exit $ac_status); }; }; then
16071 eval "$as_ac_var=yes"
16072 else
16073 echo "$as_me: failed program was:" >&5
16074 sed 's/^/| /' conftest.$ac_ext >&5
16075
16076- eval "$as_ac_var=no"
16077+eval "$as_ac_var=no"
16078 fi
16079-
16080-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16081+rm -f conftest.err conftest.$ac_objext \
16082 conftest$ac_exeext conftest.$ac_ext
16083 fi
16084-ac_res=`eval echo '${'$as_ac_var'}'`
16085- { echo "$as_me:$LINENO: result: $ac_res" >&5
16086-echo "${ECHO_T}$ac_res" >&6; }
16087+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
16088+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
16089 if test `eval echo '${'$as_ac_var'}'` = yes; then
16090 cat >>confdefs.h <<_ACEOF
16091 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
16092 _ACEOF
16093
16094 else
16095- case " $LIBOBJS " in
16096+ case $LIBOBJS in
16097+ "$ac_func.$ac_objext" | \
16098+ *" $ac_func.$ac_objext" | \
16099+ "$ac_func.$ac_objext "* | \
16100 *" $ac_func.$ac_objext "* ) ;;
16101- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
16102- ;;
16103+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
16104 esac
16105
16106 fi
16107@@ -13382,9 +12782,9 @@
16108 cosh sinh tanh setuid setgid setenv unsetenv
16109 do
16110 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
16111-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
16112-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
16113-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
16114+echo "$as_me:$LINENO: checking for $ac_func" >&5
16115+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
16116+if eval "test \"\${$as_ac_var+set}\" = set"; then
16117 echo $ECHO_N "(cached) $ECHO_C" >&6
16118 else
16119 cat >conftest.$ac_ext <<_ACEOF
16120@@ -13410,60 +12810,67 @@
16121
16122 #undef $ac_func
16123
16124-/* Override any GCC internal prototype to avoid an error.
16125- Use char because int might match the return type of a GCC
16126- builtin and then its argument prototype would still apply. */
16127+/* Override any gcc2 internal prototype to avoid an error. */
16128 #ifdef __cplusplus
16129 extern "C"
16130+{
16131 #endif
16132+/* We use char because int might match the return type of a gcc2
16133+ builtin and then its argument prototype would still apply. */
16134 char $ac_func ();
16135 /* The GNU C library defines this for functions which it implements
16136 to always fail with ENOSYS. Some functions are actually named
16137 something starting with __ and the normal name is an alias. */
16138-#if defined __stub_$ac_func || defined __stub___$ac_func
16139+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
16140 choke me
16141+#else
16142+char (*f) () = $ac_func;
16143+#endif
16144+#ifdef __cplusplus
16145+}
16146 #endif
16147
16148 int
16149 main ()
16150 {
16151-return $ac_func ();
16152+return f != $ac_func;
16153 ;
16154 return 0;
16155 }
16156 _ACEOF
16157 rm -f conftest.$ac_objext conftest$ac_exeext
16158-if { (ac_try="$ac_link"
16159-case "(($ac_try" in
16160- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16161- *) ac_try_echo=$ac_try;;
16162-esac
16163-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16164- (eval "$ac_link") 2>conftest.er1
16165+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16166+ (eval $ac_link) 2>conftest.er1
16167 ac_status=$?
16168 grep -v '^ *+' conftest.er1 >conftest.err
16169 rm -f conftest.er1
16170 cat conftest.err >&5
16171 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16172- (exit $ac_status); } && {
16173- test -z "$ac_c_werror_flag" ||
16174- test ! -s conftest.err
16175- } && test -s conftest$ac_exeext &&
16176- $as_test_x conftest$ac_exeext; then
16177+ (exit $ac_status); } &&
16178+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16179+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16180+ (eval $ac_try) 2>&5
16181+ ac_status=$?
16182+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16183+ (exit $ac_status); }; } &&
16184+ { ac_try='test -s conftest$ac_exeext'
16185+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16186+ (eval $ac_try) 2>&5
16187+ ac_status=$?
16188+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16189+ (exit $ac_status); }; }; then
16190 eval "$as_ac_var=yes"
16191 else
16192 echo "$as_me: failed program was:" >&5
16193 sed 's/^/| /' conftest.$ac_ext >&5
16194
16195- eval "$as_ac_var=no"
16196+eval "$as_ac_var=no"
16197 fi
16198-
16199-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16200+rm -f conftest.err conftest.$ac_objext \
16201 conftest$ac_exeext conftest.$ac_ext
16202 fi
16203-ac_res=`eval echo '${'$as_ac_var'}'`
16204- { echo "$as_me:$LINENO: result: $ac_res" >&5
16205-echo "${ECHO_T}$ac_res" >&6; }
16206+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
16207+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
16208 if test `eval echo '${'$as_ac_var'}'` = yes; then
16209 cat >>confdefs.h <<_ACEOF
16210 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
16211@@ -13472,11 +12879,11 @@
16212 fi
16213 done
16214
16215-# Check whether --enable-setreuid was given.
16216+# Check whether --enable-setreuid or --disable-setreuid was given.
16217 if test "${enable_setreuid+set}" = set; then
16218- enableval=$enable_setreuid; use_setreuid=$enableval
16219-fi
16220-
16221+ enableval="$enable_setreuid"
16222+ use_setreuid=$enableval
16223+fi;
16224 if test "$use_setreuid" = yes; then
16225 cat >>confdefs.h <<\_ACEOF
16226 #define USE_SETREUID 1
16227@@ -13487,8 +12894,8 @@
16228 _ACEOF
16229
16230 fi
16231-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
16232-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
16233+echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
16234+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
16235 if test "${ac_cv_struct_tm+set}" = set; then
16236 echo $ECHO_N "(cached) $ECHO_C" >&6
16237 else
16238@@ -13504,42 +12911,43 @@
16239 int
16240 main ()
16241 {
16242-struct tm tm;
16243- int *p = &tm.tm_sec;
16244- return !p;
16245+struct tm *tp; tp->tm_sec;
16246 ;
16247 return 0;
16248 }
16249 _ACEOF
16250 rm -f conftest.$ac_objext
16251-if { (ac_try="$ac_compile"
16252-case "(($ac_try" in
16253- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16254- *) ac_try_echo=$ac_try;;
16255-esac
16256-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16257- (eval "$ac_compile") 2>conftest.er1
16258+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16259+ (eval $ac_compile) 2>conftest.er1
16260 ac_status=$?
16261 grep -v '^ *+' conftest.er1 >conftest.err
16262 rm -f conftest.er1
16263 cat conftest.err >&5
16264 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16265- (exit $ac_status); } && {
16266- test -z "$ac_c_werror_flag" ||
16267- test ! -s conftest.err
16268- } && test -s conftest.$ac_objext; then
16269+ (exit $ac_status); } &&
16270+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16271+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16272+ (eval $ac_try) 2>&5
16273+ ac_status=$?
16274+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16275+ (exit $ac_status); }; } &&
16276+ { ac_try='test -s conftest.$ac_objext'
16277+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16278+ (eval $ac_try) 2>&5
16279+ ac_status=$?
16280+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16281+ (exit $ac_status); }; }; then
16282 ac_cv_struct_tm=time.h
16283 else
16284 echo "$as_me: failed program was:" >&5
16285 sed 's/^/| /' conftest.$ac_ext >&5
16286
16287- ac_cv_struct_tm=sys/time.h
16288+ac_cv_struct_tm=sys/time.h
16289 fi
16290-
16291-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16292+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16293 fi
16294-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
16295-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
16296+echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
16297+echo "${ECHO_T}$ac_cv_struct_tm" >&6
16298 if test $ac_cv_struct_tm = sys/time.h; then
16299
16300 cat >>confdefs.h <<\_ACEOF
16301@@ -13548,8 +12956,8 @@
16302
16303 fi
16304
16305-{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
16306-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
16307+echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
16308+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
16309 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
16310 echo $ECHO_N "(cached) $ECHO_C" >&6
16311 else
16312@@ -13574,28 +12982,32 @@
16313 }
16314 _ACEOF
16315 rm -f conftest.$ac_objext
16316-if { (ac_try="$ac_compile"
16317-case "(($ac_try" in
16318- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16319- *) ac_try_echo=$ac_try;;
16320-esac
16321-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16322- (eval "$ac_compile") 2>conftest.er1
16323+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16324+ (eval $ac_compile) 2>conftest.er1
16325 ac_status=$?
16326 grep -v '^ *+' conftest.er1 >conftest.err
16327 rm -f conftest.er1
16328 cat conftest.err >&5
16329 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16330- (exit $ac_status); } && {
16331- test -z "$ac_c_werror_flag" ||
16332- test ! -s conftest.err
16333- } && test -s conftest.$ac_objext; then
16334+ (exit $ac_status); } &&
16335+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16336+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16337+ (eval $ac_try) 2>&5
16338+ ac_status=$?
16339+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16340+ (exit $ac_status); }; } &&
16341+ { ac_try='test -s conftest.$ac_objext'
16342+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16343+ (eval $ac_try) 2>&5
16344+ ac_status=$?
16345+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16346+ (exit $ac_status); }; }; then
16347 ac_cv_member_struct_tm_tm_zone=yes
16348 else
16349 echo "$as_me: failed program was:" >&5
16350 sed 's/^/| /' conftest.$ac_ext >&5
16351
16352- cat >conftest.$ac_ext <<_ACEOF
16353+cat >conftest.$ac_ext <<_ACEOF
16354 /* confdefs.h. */
16355 _ACEOF
16356 cat confdefs.h >>conftest.$ac_ext
16357@@ -13616,37 +13028,39 @@
16358 }
16359 _ACEOF
16360 rm -f conftest.$ac_objext
16361-if { (ac_try="$ac_compile"
16362-case "(($ac_try" in
16363- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16364- *) ac_try_echo=$ac_try;;
16365-esac
16366-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16367- (eval "$ac_compile") 2>conftest.er1
16368+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16369+ (eval $ac_compile) 2>conftest.er1
16370 ac_status=$?
16371 grep -v '^ *+' conftest.er1 >conftest.err
16372 rm -f conftest.er1
16373 cat conftest.err >&5
16374 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16375- (exit $ac_status); } && {
16376- test -z "$ac_c_werror_flag" ||
16377- test ! -s conftest.err
16378- } && test -s conftest.$ac_objext; then
16379+ (exit $ac_status); } &&
16380+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16381+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16382+ (eval $ac_try) 2>&5
16383+ ac_status=$?
16384+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16385+ (exit $ac_status); }; } &&
16386+ { ac_try='test -s conftest.$ac_objext'
16387+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16388+ (eval $ac_try) 2>&5
16389+ ac_status=$?
16390+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16391+ (exit $ac_status); }; }; then
16392 ac_cv_member_struct_tm_tm_zone=yes
16393 else
16394 echo "$as_me: failed program was:" >&5
16395 sed 's/^/| /' conftest.$ac_ext >&5
16396
16397- ac_cv_member_struct_tm_tm_zone=no
16398+ac_cv_member_struct_tm_tm_zone=no
16399 fi
16400-
16401-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16402+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16403 fi
16404-
16405-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16406+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16407 fi
16408-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
16409-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
16410+echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
16411+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
16412 if test $ac_cv_member_struct_tm_tm_zone = yes; then
16413
16414 cat >>confdefs.h <<_ACEOF
16415@@ -13663,77 +13077,8 @@
16416 _ACEOF
16417
16418 else
16419- { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
16420-echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
16421-if test "${ac_cv_have_decl_tzname+set}" = set; then
16422- echo $ECHO_N "(cached) $ECHO_C" >&6
16423-else
16424- cat >conftest.$ac_ext <<_ACEOF
16425-/* confdefs.h. */
16426-_ACEOF
16427-cat confdefs.h >>conftest.$ac_ext
16428-cat >>conftest.$ac_ext <<_ACEOF
16429-/* end confdefs.h. */
16430-#include <time.h>
16431-
16432-int
16433-main ()
16434-{
16435-#ifndef tzname
16436- (void) tzname;
16437-#endif
16438-
16439- ;
16440- return 0;
16441-}
16442-_ACEOF
16443-rm -f conftest.$ac_objext
16444-if { (ac_try="$ac_compile"
16445-case "(($ac_try" in
16446- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16447- *) ac_try_echo=$ac_try;;
16448-esac
16449-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16450- (eval "$ac_compile") 2>conftest.er1
16451- ac_status=$?
16452- grep -v '^ *+' conftest.er1 >conftest.err
16453- rm -f conftest.er1
16454- cat conftest.err >&5
16455- echo "$as_me:$LINENO: \$? = $ac_status" >&5
16456- (exit $ac_status); } && {
16457- test -z "$ac_c_werror_flag" ||
16458- test ! -s conftest.err
16459- } && test -s conftest.$ac_objext; then
16460- ac_cv_have_decl_tzname=yes
16461-else
16462- echo "$as_me: failed program was:" >&5
16463-sed 's/^/| /' conftest.$ac_ext >&5
16464-
16465- ac_cv_have_decl_tzname=no
16466-fi
16467-
16468-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16469-fi
16470-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
16471-echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
16472-if test $ac_cv_have_decl_tzname = yes; then
16473-
16474-cat >>confdefs.h <<_ACEOF
16475-#define HAVE_DECL_TZNAME 1
16476-_ACEOF
16477-
16478-
16479-else
16480- cat >>confdefs.h <<_ACEOF
16481-#define HAVE_DECL_TZNAME 0
16482-_ACEOF
16483-
16484-
16485-fi
16486-
16487-
16488- { echo "$as_me:$LINENO: checking for tzname" >&5
16489-echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
16490+ echo "$as_me:$LINENO: checking for tzname" >&5
16491+echo $ECHO_N "checking for tzname... $ECHO_C" >&6
16492 if test "${ac_cv_var_tzname+set}" = set; then
16493 echo $ECHO_N "(cached) $ECHO_C" >&6
16494 else
16495@@ -13744,49 +13089,51 @@
16496 cat >>conftest.$ac_ext <<_ACEOF
16497 /* end confdefs.h. */
16498 #include <time.h>
16499-#if !HAVE_DECL_TZNAME
16500-extern char *tzname[];
16501+#ifndef tzname /* For SGI. */
16502+extern char *tzname[]; /* RS6000 and others reject char **tzname. */
16503 #endif
16504
16505 int
16506 main ()
16507 {
16508-return tzname[0][0];
16509+atoi(*tzname);
16510 ;
16511 return 0;
16512 }
16513 _ACEOF
16514 rm -f conftest.$ac_objext conftest$ac_exeext
16515-if { (ac_try="$ac_link"
16516-case "(($ac_try" in
16517- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16518- *) ac_try_echo=$ac_try;;
16519-esac
16520-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16521- (eval "$ac_link") 2>conftest.er1
16522+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16523+ (eval $ac_link) 2>conftest.er1
16524 ac_status=$?
16525 grep -v '^ *+' conftest.er1 >conftest.err
16526 rm -f conftest.er1
16527 cat conftest.err >&5
16528 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16529- (exit $ac_status); } && {
16530- test -z "$ac_c_werror_flag" ||
16531- test ! -s conftest.err
16532- } && test -s conftest$ac_exeext &&
16533- $as_test_x conftest$ac_exeext; then
16534+ (exit $ac_status); } &&
16535+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16536+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16537+ (eval $ac_try) 2>&5
16538+ ac_status=$?
16539+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16540+ (exit $ac_status); }; } &&
16541+ { ac_try='test -s conftest$ac_exeext'
16542+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16543+ (eval $ac_try) 2>&5
16544+ ac_status=$?
16545+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16546+ (exit $ac_status); }; }; then
16547 ac_cv_var_tzname=yes
16548 else
16549 echo "$as_me: failed program was:" >&5
16550 sed 's/^/| /' conftest.$ac_ext >&5
16551
16552- ac_cv_var_tzname=no
16553+ac_cv_var_tzname=no
16554 fi
16555-
16556-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16557+rm -f conftest.err conftest.$ac_objext \
16558 conftest$ac_exeext conftest.$ac_ext
16559 fi
16560-{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
16561-echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
16562+echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
16563+echo "${ECHO_T}$ac_cv_var_tzname" >&6
16564 if test $ac_cv_var_tzname = yes; then
16565
16566 cat >>confdefs.h <<\_ACEOF
16567@@ -13796,8 +13143,8 @@
16568 fi
16569 fi
16570
16571-{ echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
16572-echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6; }
16573+echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
16574+echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6
16575 if test "${rb_cv_member_struct_tm_tm_gmtoff+set}" = set; then
16576 echo $ECHO_N "(cached) $ECHO_C" >&6
16577 else
16578@@ -13817,42 +13164,45 @@
16579 }
16580 _ACEOF
16581 rm -f conftest.$ac_objext
16582-if { (ac_try="$ac_compile"
16583-case "(($ac_try" in
16584- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16585- *) ac_try_echo=$ac_try;;
16586-esac
16587-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16588- (eval "$ac_compile") 2>conftest.er1
16589+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16590+ (eval $ac_compile) 2>conftest.er1
16591 ac_status=$?
16592 grep -v '^ *+' conftest.er1 >conftest.err
16593 rm -f conftest.er1
16594 cat conftest.err >&5
16595 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16596- (exit $ac_status); } && {
16597- test -z "$ac_c_werror_flag" ||
16598- test ! -s conftest.err
16599- } && test -s conftest.$ac_objext; then
16600+ (exit $ac_status); } &&
16601+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16602+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16603+ (eval $ac_try) 2>&5
16604+ ac_status=$?
16605+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16606+ (exit $ac_status); }; } &&
16607+ { ac_try='test -s conftest.$ac_objext'
16608+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16609+ (eval $ac_try) 2>&5
16610+ ac_status=$?
16611+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16612+ (exit $ac_status); }; }; then
16613 rb_cv_member_struct_tm_tm_gmtoff=yes
16614 else
16615 echo "$as_me: failed program was:" >&5
16616 sed 's/^/| /' conftest.$ac_ext >&5
16617
16618- rb_cv_member_struct_tm_tm_gmtoff=no
16619+rb_cv_member_struct_tm_tm_gmtoff=no
16620 fi
16621-
16622-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16623+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16624 fi
16625-{ echo "$as_me:$LINENO: result: $rb_cv_member_struct_tm_tm_gmtoff" >&5
16626-echo "${ECHO_T}$rb_cv_member_struct_tm_tm_gmtoff" >&6; }
16627+echo "$as_me:$LINENO: result: $rb_cv_member_struct_tm_tm_gmtoff" >&5
16628+echo "${ECHO_T}$rb_cv_member_struct_tm_tm_gmtoff" >&6
16629 if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
16630 cat >>confdefs.h <<\_ACEOF
16631 #define HAVE_STRUCT_TM_TM_GMTOFF 1
16632 _ACEOF
16633
16634 fi
16635-{ echo "$as_me:$LINENO: checking for external int daylight" >&5
16636-echo $ECHO_N "checking for external int daylight... $ECHO_C" >&6; }
16637+echo "$as_me:$LINENO: checking for external int daylight" >&5
16638+echo $ECHO_N "checking for external int daylight... $ECHO_C" >&6
16639 if test "${rb_cv_have_daylight+set}" = set; then
16640 echo $ECHO_N "(cached) $ECHO_C" >&6
16641 else
16642@@ -13873,44 +13223,46 @@
16643 }
16644 _ACEOF
16645 rm -f conftest.$ac_objext conftest$ac_exeext
16646-if { (ac_try="$ac_link"
16647-case "(($ac_try" in
16648- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16649- *) ac_try_echo=$ac_try;;
16650-esac
16651-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16652- (eval "$ac_link") 2>conftest.er1
16653+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16654+ (eval $ac_link) 2>conftest.er1
16655 ac_status=$?
16656 grep -v '^ *+' conftest.er1 >conftest.err
16657 rm -f conftest.er1
16658 cat conftest.err >&5
16659 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16660- (exit $ac_status); } && {
16661- test -z "$ac_c_werror_flag" ||
16662- test ! -s conftest.err
16663- } && test -s conftest$ac_exeext &&
16664- $as_test_x conftest$ac_exeext; then
16665+ (exit $ac_status); } &&
16666+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16667+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16668+ (eval $ac_try) 2>&5
16669+ ac_status=$?
16670+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16671+ (exit $ac_status); }; } &&
16672+ { ac_try='test -s conftest$ac_exeext'
16673+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16674+ (eval $ac_try) 2>&5
16675+ ac_status=$?
16676+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16677+ (exit $ac_status); }; }; then
16678 rb_cv_have_daylight=yes
16679 else
16680 echo "$as_me: failed program was:" >&5
16681 sed 's/^/| /' conftest.$ac_ext >&5
16682
16683- rb_cv_have_daylight=no
16684+rb_cv_have_daylight=no
16685 fi
16686-
16687-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16688+rm -f conftest.err conftest.$ac_objext \
16689 conftest$ac_exeext conftest.$ac_ext
16690 fi
16691-{ echo "$as_me:$LINENO: result: $rb_cv_have_daylight" >&5
16692-echo "${ECHO_T}$rb_cv_have_daylight" >&6; }
16693+echo "$as_me:$LINENO: result: $rb_cv_have_daylight" >&5
16694+echo "${ECHO_T}$rb_cv_have_daylight" >&6
16695 if test "$rb_cv_have_daylight" = yes; then
16696 cat >>confdefs.h <<\_ACEOF
16697 #define HAVE_DAYLIGHT 1
16698 _ACEOF
16699
16700 fi
16701-{ echo "$as_me:$LINENO: checking for negative time_t for gmtime(3)" >&5
16702-echo $ECHO_N "checking for negative time_t for gmtime(3)... $ECHO_C" >&6; }
16703+echo "$as_me:$LINENO: checking for negative time_t for gmtime(3)" >&5
16704+echo $ECHO_N "checking for negative time_t for gmtime(3)... $ECHO_C" >&6
16705 if test "${rb_cv_negative_time_t+set}" = set; then
16706 echo $ECHO_N "(cached) $ECHO_C" >&6
16707 else
16708@@ -13955,22 +13307,13 @@
16709
16710 _ACEOF
16711 rm -f conftest$ac_exeext
16712-if { (ac_try="$ac_link"
16713-case "(($ac_try" in
16714- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16715- *) ac_try_echo=$ac_try;;
16716-esac
16717-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16718- (eval "$ac_link") 2>&5
16719+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16720+ (eval $ac_link) 2>&5
16721 ac_status=$?
16722 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16723 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16724- { (case "(($ac_try" in
16725- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16726- *) ac_try_echo=$ac_try;;
16727-esac
16728-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16729- (eval "$ac_try") 2>&5
16730+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16731+ (eval $ac_try) 2>&5
16732 ac_status=$?
16733 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16734 (exit $ac_status); }; }; then
16735@@ -13983,13 +13326,11 @@
16736 ( exit $ac_status )
16737 rb_cv_negative_time_t=no
16738 fi
16739-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16740+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16741 fi
16742-
16743-
16744 fi
16745-{ echo "$as_me:$LINENO: result: $rb_cv_negative_time_t" >&5
16746-echo "${ECHO_T}$rb_cv_negative_time_t" >&6; }
16747+echo "$as_me:$LINENO: result: $rb_cv_negative_time_t" >&5
16748+echo "${ECHO_T}$rb_cv_negative_time_t" >&6
16749 if test "$rb_cv_negative_time_t" = yes; then
16750 cat >>confdefs.h <<\_ACEOF
16751 #define NEGATIVE_TIME_T 1
16752@@ -14003,8 +13344,8 @@
16753 _ACEOF
16754
16755 else
16756- { echo "$as_me:$LINENO: checking for BSD signal semantics" >&5
16757-echo $ECHO_N "checking for BSD signal semantics... $ECHO_C" >&6; }
16758+ echo "$as_me:$LINENO: checking for BSD signal semantics" >&5
16759+echo $ECHO_N "checking for BSD signal semantics... $ECHO_C" >&6
16760 if test "${rb_cv_bsd_signal+set}" = set; then
16761 echo $ECHO_N "(cached) $ECHO_C" >&6
16762 else
16763@@ -14038,22 +13379,13 @@
16764
16765 _ACEOF
16766 rm -f conftest$ac_exeext
16767-if { (ac_try="$ac_link"
16768-case "(($ac_try" in
16769- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16770- *) ac_try_echo=$ac_try;;
16771-esac
16772-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16773- (eval "$ac_link") 2>&5
16774+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16775+ (eval $ac_link) 2>&5
16776 ac_status=$?
16777 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16778 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16779- { (case "(($ac_try" in
16780- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16781- *) ac_try_echo=$ac_try;;
16782-esac
16783-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16784- (eval "$ac_try") 2>&5
16785+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16786+ (eval $ac_try) 2>&5
16787 ac_status=$?
16788 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16789 (exit $ac_status); }; }; then
16790@@ -14066,13 +13398,11 @@
16791 ( exit $ac_status )
16792 rb_cv_bsd_signal=no
16793 fi
16794-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16795+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16796 fi
16797-
16798-
16799 fi
16800-{ echo "$as_me:$LINENO: result: $rb_cv_bsd_signal" >&5
16801-echo "${ECHO_T}$rb_cv_bsd_signal" >&6; }
16802+echo "$as_me:$LINENO: result: $rb_cv_bsd_signal" >&5
16803+echo "${ECHO_T}$rb_cv_bsd_signal" >&6
16804 if test "$rb_cv_bsd_signal" = yes; then
16805 cat >>confdefs.h <<\_ACEOF
16806 #define BSD_SIGNAL 1
16807@@ -14081,8 +13411,8 @@
16808 fi
16809 fi
16810
16811-{ echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
16812-echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6; }
16813+echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
16814+echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6
16815 if test "${ac_cv_func_getpgrp_void+set}" = set; then
16816 echo $ECHO_N "(cached) $ECHO_C" >&6
16817 else
16818@@ -14103,35 +13433,38 @@
16819 }
16820 _ACEOF
16821 rm -f conftest.$ac_objext
16822-if { (ac_try="$ac_compile"
16823-case "(($ac_try" in
16824- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16825- *) ac_try_echo=$ac_try;;
16826-esac
16827-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16828- (eval "$ac_compile") 2>conftest.er1
16829+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16830+ (eval $ac_compile) 2>conftest.er1
16831 ac_status=$?
16832 grep -v '^ *+' conftest.er1 >conftest.err
16833 rm -f conftest.er1
16834 cat conftest.err >&5
16835 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16836- (exit $ac_status); } && {
16837- test -z "$ac_c_werror_flag" ||
16838- test ! -s conftest.err
16839- } && test -s conftest.$ac_objext; then
16840+ (exit $ac_status); } &&
16841+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16842+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16843+ (eval $ac_try) 2>&5
16844+ ac_status=$?
16845+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16846+ (exit $ac_status); }; } &&
16847+ { ac_try='test -s conftest.$ac_objext'
16848+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16849+ (eval $ac_try) 2>&5
16850+ ac_status=$?
16851+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16852+ (exit $ac_status); }; }; then
16853 ac_cv_func_getpgrp_void=no
16854 else
16855 echo "$as_me: failed program was:" >&5
16856 sed 's/^/| /' conftest.$ac_ext >&5
16857
16858- ac_cv_func_getpgrp_void=yes
16859+ac_cv_func_getpgrp_void=yes
16860 fi
16861-
16862-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16863+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
16864
16865 fi
16866-{ echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
16867-echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6; }
16868+echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
16869+echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
16870 if test $ac_cv_func_getpgrp_void = yes; then
16871
16872 cat >>confdefs.h <<\_ACEOF
16873@@ -14140,8 +13473,8 @@
16874
16875 fi
16876
16877-{ echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
16878-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
16879+echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
16880+echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
16881 if test "${ac_cv_func_setpgrp_void+set}" = set; then
16882 echo $ECHO_N "(cached) $ECHO_C" >&6
16883 else
16884@@ -14156,35 +13489,29 @@
16885 cat confdefs.h >>conftest.$ac_ext
16886 cat >>conftest.$ac_ext <<_ACEOF
16887 /* end confdefs.h. */
16888-$ac_includes_default
16889+#if HAVE_UNISTD_H
16890+# include <unistd.h>
16891+#endif
16892+
16893 int
16894 main ()
16895 {
16896 /* If this system has a BSD-style setpgrp which takes arguments,
16897 setpgrp(1, 1) will fail with ESRCH and return -1, in that case
16898 exit successfully. */
16899- return setpgrp (1,1) != -1;
16900+ exit (setpgrp (1,1) == -1 ? 0 : 1);
16901 ;
16902 return 0;
16903 }
16904 _ACEOF
16905 rm -f conftest$ac_exeext
16906-if { (ac_try="$ac_link"
16907-case "(($ac_try" in
16908- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16909- *) ac_try_echo=$ac_try;;
16910-esac
16911-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16912- (eval "$ac_link") 2>&5
16913+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16914+ (eval $ac_link) 2>&5
16915 ac_status=$?
16916 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16917 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16918- { (case "(($ac_try" in
16919- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16920- *) ac_try_echo=$ac_try;;
16921-esac
16922-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16923- (eval "$ac_try") 2>&5
16924+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16925+ (eval $ac_try) 2>&5
16926 ac_status=$?
16927 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16928 (exit $ac_status); }; }; then
16929@@ -14197,13 +13524,11 @@
16930 ( exit $ac_status )
16931 ac_cv_func_setpgrp_void=yes
16932 fi
16933-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16934+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16935 fi
16936-
16937-
16938 fi
16939-{ echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
16940-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
16941+echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
16942+echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
16943 if test $ac_cv_func_setpgrp_void = yes; then
16944
16945 cat >>confdefs.h <<\_ACEOF
16946@@ -14213,8 +13538,8 @@
16947 fi
16948
16949
16950-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
16951-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
16952+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
16953+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
16954 if test "${ac_cv_c_bigendian+set}" = set; then
16955 echo $ECHO_N "(cached) $ECHO_C" >&6
16956 else
16957@@ -14231,8 +13556,7 @@
16958 int
16959 main ()
16960 {
16961-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
16962- && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
16963+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
16964 bogus endian macros
16965 #endif
16966
16967@@ -14241,22 +13565,26 @@
16968 }
16969 _ACEOF
16970 rm -f conftest.$ac_objext
16971-if { (ac_try="$ac_compile"
16972-case "(($ac_try" in
16973- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16974- *) ac_try_echo=$ac_try;;
16975-esac
16976-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16977- (eval "$ac_compile") 2>conftest.er1
16978+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16979+ (eval $ac_compile) 2>conftest.er1
16980 ac_status=$?
16981 grep -v '^ *+' conftest.er1 >conftest.err
16982 rm -f conftest.er1
16983 cat conftest.err >&5
16984 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16985- (exit $ac_status); } && {
16986- test -z "$ac_c_werror_flag" ||
16987- test ! -s conftest.err
16988- } && test -s conftest.$ac_objext; then
16989+ (exit $ac_status); } &&
16990+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16991+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16992+ (eval $ac_try) 2>&5
16993+ ac_status=$?
16994+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
16995+ (exit $ac_status); }; } &&
16996+ { ac_try='test -s conftest.$ac_objext'
16997+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16998+ (eval $ac_try) 2>&5
16999+ ac_status=$?
17000+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17001+ (exit $ac_status); }; }; then
17002 # It does; now see whether it defined to BIG_ENDIAN or not.
17003 cat >conftest.$ac_ext <<_ACEOF
17004 /* confdefs.h. */
17005@@ -14279,36 +13607,39 @@
17006 }
17007 _ACEOF
17008 rm -f conftest.$ac_objext
17009-if { (ac_try="$ac_compile"
17010-case "(($ac_try" in
17011- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17012- *) ac_try_echo=$ac_try;;
17013-esac
17014-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17015- (eval "$ac_compile") 2>conftest.er1
17016+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17017+ (eval $ac_compile) 2>conftest.er1
17018 ac_status=$?
17019 grep -v '^ *+' conftest.er1 >conftest.err
17020 rm -f conftest.er1
17021 cat conftest.err >&5
17022 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17023- (exit $ac_status); } && {
17024- test -z "$ac_c_werror_flag" ||
17025- test ! -s conftest.err
17026- } && test -s conftest.$ac_objext; then
17027+ (exit $ac_status); } &&
17028+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17029+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17030+ (eval $ac_try) 2>&5
17031+ ac_status=$?
17032+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17033+ (exit $ac_status); }; } &&
17034+ { ac_try='test -s conftest.$ac_objext'
17035+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17036+ (eval $ac_try) 2>&5
17037+ ac_status=$?
17038+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17039+ (exit $ac_status); }; }; then
17040 ac_cv_c_bigendian=yes
17041 else
17042 echo "$as_me: failed program was:" >&5
17043 sed 's/^/| /' conftest.$ac_ext >&5
17044
17045- ac_cv_c_bigendian=no
17046+ac_cv_c_bigendian=no
17047 fi
17048-
17049-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17050+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17051 else
17052 echo "$as_me: failed program was:" >&5
17053 sed 's/^/| /' conftest.$ac_ext >&5
17054
17055- # It does not; compile a test program.
17056+# It does not; compile a test program.
17057 if test "$cross_compiling" = yes; then
17058 # try to guess the endianness by grepping values into an object file
17059 ac_cv_c_bigendian=unknown
17060@@ -14318,11 +13649,11 @@
17061 cat confdefs.h >>conftest.$ac_ext
17062 cat >>conftest.$ac_ext <<_ACEOF
17063 /* end confdefs.h. */
17064-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
17065-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
17066+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
17067+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
17068 void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
17069-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
17070-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
17071+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
17072+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
17073 void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
17074 int
17075 main ()
17076@@ -14333,22 +13664,26 @@
17077 }
17078 _ACEOF
17079 rm -f conftest.$ac_objext
17080-if { (ac_try="$ac_compile"
17081-case "(($ac_try" in
17082- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17083- *) ac_try_echo=$ac_try;;
17084-esac
17085-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17086- (eval "$ac_compile") 2>conftest.er1
17087+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17088+ (eval $ac_compile) 2>conftest.er1
17089 ac_status=$?
17090 grep -v '^ *+' conftest.er1 >conftest.err
17091 rm -f conftest.er1
17092 cat conftest.err >&5
17093 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17094- (exit $ac_status); } && {
17095- test -z "$ac_c_werror_flag" ||
17096- test ! -s conftest.err
17097- } && test -s conftest.$ac_objext; then
17098+ (exit $ac_status); } &&
17099+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17100+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17101+ (eval $ac_try) 2>&5
17102+ ac_status=$?
17103+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17104+ (exit $ac_status); }; } &&
17105+ { ac_try='test -s conftest.$ac_objext'
17106+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17107+ (eval $ac_try) 2>&5
17108+ ac_status=$?
17109+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17110+ (exit $ac_status); }; }; then
17111 if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
17112 ac_cv_c_bigendian=yes
17113 fi
17114@@ -14364,10 +13699,8 @@
17115 echo "$as_me: failed program was:" >&5
17116 sed 's/^/| /' conftest.$ac_ext >&5
17117
17118-
17119 fi
17120-
17121-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17122+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17123 else
17124 cat >conftest.$ac_ext <<_ACEOF
17125 /* confdefs.h. */
17126@@ -14375,41 +13708,27 @@
17127 cat confdefs.h >>conftest.$ac_ext
17128 cat >>conftest.$ac_ext <<_ACEOF
17129 /* end confdefs.h. */
17130-$ac_includes_default
17131 int
17132 main ()
17133 {
17134-
17135 /* Are we little or big endian? From Harbison&Steele. */
17136 union
17137 {
17138- long int l;
17139- char c[sizeof (long int)];
17140+ long l;
17141+ char c[sizeof (long)];
17142 } u;
17143 u.l = 1;
17144- return u.c[sizeof (long int) - 1] == 1;
17145-
17146- ;
17147- return 0;
17148+ exit (u.c[sizeof (long) - 1] == 1);
17149 }
17150 _ACEOF
17151 rm -f conftest$ac_exeext
17152-if { (ac_try="$ac_link"
17153-case "(($ac_try" in
17154- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17155- *) ac_try_echo=$ac_try;;
17156-esac
17157-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17158- (eval "$ac_link") 2>&5
17159+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17160+ (eval $ac_link) 2>&5
17161 ac_status=$?
17162 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17163 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17164- { (case "(($ac_try" in
17165- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17166- *) ac_try_echo=$ac_try;;
17167-esac
17168-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17169- (eval "$ac_try") 2>&5
17170+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17171+ (eval $ac_try) 2>&5
17172 ac_status=$?
17173 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17174 (exit $ac_status); }; }; then
17175@@ -14422,16 +13741,13 @@
17176 ( exit $ac_status )
17177 ac_cv_c_bigendian=yes
17178 fi
17179-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17180+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17181 fi
17182-
17183-
17184 fi
17185-
17186-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17187+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17188 fi
17189-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
17190-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
17191+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
17192+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
17193 case $ac_cv_c_bigendian in
17194 yes)
17195
17196@@ -14449,8 +13765,8 @@
17197 { (exit 1); exit 1; }; } ;;
17198 esac
17199
17200-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
17201-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
17202+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
17203+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
17204 if test "${ac_cv_c_const+set}" = set; then
17205 echo $ECHO_N "(cached) $ECHO_C" >&6
17206 else
17207@@ -14468,10 +13784,10 @@
17208 #ifndef __cplusplus
17209 /* Ultrix mips cc rejects this. */
17210 typedef int charset[2];
17211- const charset cs;
17212+ const charset x;
17213 /* SunOS 4.1.1 cc rejects this. */
17214- char const *const *pcpcc;
17215- char **ppc;
17216+ char const *const *ccp;
17217+ char **p;
17218 /* NEC SVR4.0.2 mips cc rejects this. */
17219 struct point {int x, y;};
17220 static struct point const zero = {0,0};
17221@@ -14480,17 +13796,16 @@
17222 an arm of an if-expression whose if-part is not a constant
17223 expression */
17224 const char *g = "string";
17225- pcpcc = &g + (g ? g-g : 0);
17226+ ccp = &g + (g ? g-g : 0);
17227 /* HPUX 7.0 cc rejects these. */
17228- ++pcpcc;
17229- ppc = (char**) pcpcc;
17230- pcpcc = (char const *const *) ppc;
17231+ ++ccp;
17232+ p = (char**) ccp;
17233+ ccp = (char const *const *) p;
17234 { /* SCO 3.2v4 cc rejects this. */
17235 char *t;
17236 char const *s = 0 ? (char *) 0 : (char const *) 0;
17237
17238 *t++ = 0;
17239- if (s) return 0;
17240 }
17241 { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
17242 int x[] = {25, 17};
17243@@ -14509,9 +13824,7 @@
17244 }
17245 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
17246 const int foo = 10;
17247- if (!foo) return 0;
17248 }
17249- return !cs[0] && !zero.x;
17250 #endif
17251
17252 ;
17253@@ -14519,34 +13832,37 @@
17254 }
17255 _ACEOF
17256 rm -f conftest.$ac_objext
17257-if { (ac_try="$ac_compile"
17258-case "(($ac_try" in
17259- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17260- *) ac_try_echo=$ac_try;;
17261-esac
17262-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17263- (eval "$ac_compile") 2>conftest.er1
17264+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17265+ (eval $ac_compile) 2>conftest.er1
17266 ac_status=$?
17267 grep -v '^ *+' conftest.er1 >conftest.err
17268 rm -f conftest.er1
17269 cat conftest.err >&5
17270 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17271- (exit $ac_status); } && {
17272- test -z "$ac_c_werror_flag" ||
17273- test ! -s conftest.err
17274- } && test -s conftest.$ac_objext; then
17275+ (exit $ac_status); } &&
17276+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17277+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17278+ (eval $ac_try) 2>&5
17279+ ac_status=$?
17280+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17281+ (exit $ac_status); }; } &&
17282+ { ac_try='test -s conftest.$ac_objext'
17283+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17284+ (eval $ac_try) 2>&5
17285+ ac_status=$?
17286+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17287+ (exit $ac_status); }; }; then
17288 ac_cv_c_const=yes
17289 else
17290 echo "$as_me: failed program was:" >&5
17291 sed 's/^/| /' conftest.$ac_ext >&5
17292
17293- ac_cv_c_const=no
17294+ac_cv_c_const=no
17295 fi
17296-
17297-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17298+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17299 fi
17300-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
17301-echo "${ECHO_T}$ac_cv_c_const" >&6; }
17302+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
17303+echo "${ECHO_T}$ac_cv_c_const" >&6
17304 if test $ac_cv_c_const = no; then
17305
17306 cat >>confdefs.h <<\_ACEOF
17307@@ -14556,8 +13872,8 @@
17308 fi
17309
17310
17311-{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
17312-echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
17313+echo "$as_me:$LINENO: checking whether char is unsigned" >&5
17314+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
17315 if test "${ac_cv_c_char_unsigned+set}" = set; then
17316 echo $ECHO_N "(cached) $ECHO_C" >&6
17317 else
17318@@ -14579,34 +13895,37 @@
17319 }
17320 _ACEOF
17321 rm -f conftest.$ac_objext
17322-if { (ac_try="$ac_compile"
17323-case "(($ac_try" in
17324- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17325- *) ac_try_echo=$ac_try;;
17326-esac
17327-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17328- (eval "$ac_compile") 2>conftest.er1
17329+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17330+ (eval $ac_compile) 2>conftest.er1
17331 ac_status=$?
17332 grep -v '^ *+' conftest.er1 >conftest.err
17333 rm -f conftest.er1
17334 cat conftest.err >&5
17335 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17336- (exit $ac_status); } && {
17337- test -z "$ac_c_werror_flag" ||
17338- test ! -s conftest.err
17339- } && test -s conftest.$ac_objext; then
17340+ (exit $ac_status); } &&
17341+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17342+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17343+ (eval $ac_try) 2>&5
17344+ ac_status=$?
17345+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17346+ (exit $ac_status); }; } &&
17347+ { ac_try='test -s conftest.$ac_objext'
17348+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17349+ (eval $ac_try) 2>&5
17350+ ac_status=$?
17351+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17352+ (exit $ac_status); }; }; then
17353 ac_cv_c_char_unsigned=no
17354 else
17355 echo "$as_me: failed program was:" >&5
17356 sed 's/^/| /' conftest.$ac_ext >&5
17357
17358- ac_cv_c_char_unsigned=yes
17359+ac_cv_c_char_unsigned=yes
17360 fi
17361-
17362-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17363+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17364 fi
17365-{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
17366-echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
17367+echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
17368+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
17369 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
17370 cat >>confdefs.h <<\_ACEOF
17371 #define __CHAR_UNSIGNED__ 1
17372@@ -14614,8 +13933,8 @@
17373
17374 fi
17375
17376-{ echo "$as_me:$LINENO: checking for inline" >&5
17377-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
17378+echo "$as_me:$LINENO: checking for inline" >&5
17379+echo $ECHO_N "checking for inline... $ECHO_C" >&6
17380 if test "${ac_cv_c_inline+set}" = set; then
17381 echo $ECHO_N "(cached) $ECHO_C" >&6
17382 else
17383@@ -14635,37 +13954,38 @@
17384
17385 _ACEOF
17386 rm -f conftest.$ac_objext
17387-if { (ac_try="$ac_compile"
17388-case "(($ac_try" in
17389- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17390- *) ac_try_echo=$ac_try;;
17391-esac
17392-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17393- (eval "$ac_compile") 2>conftest.er1
17394+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17395+ (eval $ac_compile) 2>conftest.er1
17396 ac_status=$?
17397 grep -v '^ *+' conftest.er1 >conftest.err
17398 rm -f conftest.er1
17399 cat conftest.err >&5
17400 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17401- (exit $ac_status); } && {
17402- test -z "$ac_c_werror_flag" ||
17403- test ! -s conftest.err
17404- } && test -s conftest.$ac_objext; then
17405- ac_cv_c_inline=$ac_kw
17406+ (exit $ac_status); } &&
17407+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17408+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17409+ (eval $ac_try) 2>&5
17410+ ac_status=$?
17411+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17412+ (exit $ac_status); }; } &&
17413+ { ac_try='test -s conftest.$ac_objext'
17414+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17415+ (eval $ac_try) 2>&5
17416+ ac_status=$?
17417+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17418+ (exit $ac_status); }; }; then
17419+ ac_cv_c_inline=$ac_kw; break
17420 else
17421 echo "$as_me: failed program was:" >&5
17422 sed 's/^/| /' conftest.$ac_ext >&5
17423
17424-
17425 fi
17426-
17427-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17428- test "$ac_cv_c_inline" != no && break
17429+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17430 done
17431
17432 fi
17433-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
17434-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
17435+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
17436+echo "${ECHO_T}$ac_cv_c_inline" >&6
17437
17438
17439 case $ac_cv_c_inline in
17440@@ -14683,8 +14003,8 @@
17441 ;;
17442 esac
17443
17444-{ echo "$as_me:$LINENO: checking for working volatile" >&5
17445-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
17446+echo "$as_me:$LINENO: checking for working volatile" >&5
17447+echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
17448 if test "${ac_cv_c_volatile+set}" = set; then
17449 echo $ECHO_N "(cached) $ECHO_C" >&6
17450 else
17451@@ -14700,41 +14020,43 @@
17452 {
17453
17454 volatile int x;
17455-int * volatile y = (int *) 0;
17456-return !x && !y;
17457+int * volatile y;
17458 ;
17459 return 0;
17460 }
17461 _ACEOF
17462 rm -f conftest.$ac_objext
17463-if { (ac_try="$ac_compile"
17464-case "(($ac_try" in
17465- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17466- *) ac_try_echo=$ac_try;;
17467-esac
17468-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17469- (eval "$ac_compile") 2>conftest.er1
17470+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17471+ (eval $ac_compile) 2>conftest.er1
17472 ac_status=$?
17473 grep -v '^ *+' conftest.er1 >conftest.err
17474 rm -f conftest.er1
17475 cat conftest.err >&5
17476 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17477- (exit $ac_status); } && {
17478- test -z "$ac_c_werror_flag" ||
17479- test ! -s conftest.err
17480- } && test -s conftest.$ac_objext; then
17481+ (exit $ac_status); } &&
17482+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17483+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17484+ (eval $ac_try) 2>&5
17485+ ac_status=$?
17486+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17487+ (exit $ac_status); }; } &&
17488+ { ac_try='test -s conftest.$ac_objext'
17489+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17490+ (eval $ac_try) 2>&5
17491+ ac_status=$?
17492+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17493+ (exit $ac_status); }; }; then
17494 ac_cv_c_volatile=yes
17495 else
17496 echo "$as_me: failed program was:" >&5
17497 sed 's/^/| /' conftest.$ac_ext >&5
17498
17499- ac_cv_c_volatile=no
17500+ac_cv_c_volatile=no
17501 fi
17502-
17503-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17504+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17505 fi
17506-{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
17507-echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
17508+echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
17509+echo "${ECHO_T}$ac_cv_c_volatile" >&6
17510 if test $ac_cv_c_volatile = no; then
17511
17512 cat >>confdefs.h <<\_ACEOF
17513@@ -14745,14 +14067,16 @@
17514
17515
17516 if test x"$target_cpu" = xia64; then
17517- case " $LIBOBJS " in
17518+ case $LIBOBJS in
17519+ "ia64.$ac_objext" | \
17520+ *" ia64.$ac_objext" | \
17521+ "ia64.$ac_objext "* | \
17522 *" ia64.$ac_objext "* ) ;;
17523- *) LIBOBJS="$LIBOBJS ia64.$ac_objext"
17524- ;;
17525+ *) LIBOBJS="$LIBOBJS ia64.$ac_objext" ;;
17526 esac
17527
17528- { echo "$as_me:$LINENO: checking for __libc_ia64_register_backing_store_base" >&5
17529-echo $ECHO_N "checking for __libc_ia64_register_backing_store_base... $ECHO_C" >&6; }
17530+ echo "$as_me:$LINENO: checking for __libc_ia64_register_backing_store_base" >&5
17531+echo $ECHO_N "checking for __libc_ia64_register_backing_store_base... $ECHO_C" >&6
17532 if test "${rb_cv___libc_ia64_register_backing_store_base+set}" = set; then
17533 echo $ECHO_N "(cached) $ECHO_C" >&6
17534 else
17535@@ -14774,36 +14098,37 @@
17536 }
17537 _ACEOF
17538 rm -f conftest.$ac_objext conftest$ac_exeext
17539-if { (ac_try="$ac_link"
17540-case "(($ac_try" in
17541- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17542- *) ac_try_echo=$ac_try;;
17543-esac
17544-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17545- (eval "$ac_link") 2>conftest.er1
17546+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17547+ (eval $ac_link) 2>conftest.er1
17548 ac_status=$?
17549 grep -v '^ *+' conftest.er1 >conftest.err
17550 rm -f conftest.er1
17551 cat conftest.err >&5
17552 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17553- (exit $ac_status); } && {
17554- test -z "$ac_c_werror_flag" ||
17555- test ! -s conftest.err
17556- } && test -s conftest$ac_exeext &&
17557- $as_test_x conftest$ac_exeext; then
17558+ (exit $ac_status); } &&
17559+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17560+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17561+ (eval $ac_try) 2>&5
17562+ ac_status=$?
17563+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17564+ (exit $ac_status); }; } &&
17565+ { ac_try='test -s conftest$ac_exeext'
17566+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17567+ (eval $ac_try) 2>&5
17568+ ac_status=$?
17569+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17570+ (exit $ac_status); }; }; then
17571 rb_cv___libc_ia64_register_backing_store_base=yes
17572 else
17573 echo "$as_me: failed program was:" >&5
17574 sed 's/^/| /' conftest.$ac_ext >&5
17575
17576-
17577 fi
17578-
17579-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17580+rm -f conftest.err conftest.$ac_objext \
17581 conftest$ac_exeext conftest.$ac_ext
17582 fi
17583-{ echo "$as_me:$LINENO: result: $rb_cv___libc_ia64_register_backing_store_base" >&5
17584-echo "${ECHO_T}$rb_cv___libc_ia64_register_backing_store_base" >&6; }
17585+echo "$as_me:$LINENO: result: $rb_cv___libc_ia64_register_backing_store_base" >&5
17586+echo "${ECHO_T}$rb_cv___libc_ia64_register_backing_store_base" >&6
17587 if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
17588 cat >>confdefs.h <<\_ACEOF
17589 #define HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE 1
17590@@ -14812,8 +14137,8 @@
17591 fi
17592 fi
17593
17594-{ echo "$as_me:$LINENO: checking whether right shift preserve sign bit" >&5
17595-echo $ECHO_N "checking whether right shift preserve sign bit... $ECHO_C" >&6; }
17596+echo "$as_me:$LINENO: checking whether right shift preserve sign bit" >&5
17597+echo $ECHO_N "checking whether right shift preserve sign bit... $ECHO_C" >&6
17598 if test "${rb_cv_rshift_sign+set}" = set; then
17599 echo $ECHO_N "(cached) $ECHO_C" >&6
17600 else
17601@@ -14837,22 +14162,13 @@
17602
17603 _ACEOF
17604 rm -f conftest$ac_exeext
17605-if { (ac_try="$ac_link"
17606-case "(($ac_try" in
17607- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17608- *) ac_try_echo=$ac_try;;
17609-esac
17610-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17611- (eval "$ac_link") 2>&5
17612+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17613+ (eval $ac_link) 2>&5
17614 ac_status=$?
17615 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17616 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17617- { (case "(($ac_try" in
17618- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17619- *) ac_try_echo=$ac_try;;
17620-esac
17621-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17622- (eval "$ac_try") 2>&5
17623+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17624+ (eval $ac_try) 2>&5
17625 ac_status=$?
17626 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17627 (exit $ac_status); }; }; then
17628@@ -14865,13 +14181,11 @@
17629 ( exit $ac_status )
17630 rb_cv_rshift_sign=no
17631 fi
17632-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17633+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17634 fi
17635-
17636-
17637 fi
17638-{ echo "$as_me:$LINENO: result: $rb_cv_rshift_sign" >&5
17639-echo "${ECHO_T}$rb_cv_rshift_sign" >&6; }
17640+echo "$as_me:$LINENO: result: $rb_cv_rshift_sign" >&5
17641+echo "${ECHO_T}$rb_cv_rshift_sign" >&6
17642 if test "$rb_cv_rshift_sign" = yes; then
17643 cat >>confdefs.h <<\_ACEOF
17644 #define RSHIFT(x,y) ((x)>>(int)y)
17645@@ -14884,8 +14198,8 @@
17646
17647 fi
17648
17649-{ echo "$as_me:$LINENO: checking read count field in FILE structures" >&5
17650-echo $ECHO_N "checking read count field in FILE structures... $ECHO_C" >&6; }
17651+echo "$as_me:$LINENO: checking read count field in FILE structures" >&5
17652+echo $ECHO_N "checking read count field in FILE structures... $ECHO_C" >&6
17653 if test "${rb_cv_fcnt+set}" = set; then
17654 echo $ECHO_N "(cached) $ECHO_C" >&6
17655 else
17656@@ -14907,48 +14221,51 @@
17657 }
17658 _ACEOF
17659 rm -f conftest.$ac_objext
17660-if { (ac_try="$ac_compile"
17661-case "(($ac_try" in
17662- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17663- *) ac_try_echo=$ac_try;;
17664-esac
17665-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17666- (eval "$ac_compile") 2>conftest.er1
17667+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17668+ (eval $ac_compile) 2>conftest.er1
17669 ac_status=$?
17670 grep -v '^ *+' conftest.er1 >conftest.err
17671 rm -f conftest.er1
17672 cat conftest.err >&5
17673 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17674- (exit $ac_status); } && {
17675- test -z "$ac_c_werror_flag" ||
17676- test ! -s conftest.err
17677- } && test -s conftest.$ac_objext; then
17678+ (exit $ac_status); } &&
17679+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17680+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17681+ (eval $ac_try) 2>&5
17682+ ac_status=$?
17683+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17684+ (exit $ac_status); }; } &&
17685+ { ac_try='test -s conftest.$ac_objext'
17686+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17687+ (eval $ac_try) 2>&5
17688+ ac_status=$?
17689+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17690+ (exit $ac_status); }; }; then
17691 rb_cv_fcnt="$fcnt"; break
17692 else
17693 echo "$as_me: failed program was:" >&5
17694 sed 's/^/| /' conftest.$ac_ext >&5
17695
17696- rb_cv_fcnt="not found"
17697+rb_cv_fcnt="not found"
17698 fi
17699-
17700-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17701+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17702 done
17703 fi
17704
17705 if test "$rb_cv_fcnt" = "not found"; then
17706- { echo "$as_me:$LINENO: result: not found(OK if using GNU libc)" >&5
17707-echo "${ECHO_T}not found(OK if using GNU libc)" >&6; }
17708+ echo "$as_me:$LINENO: result: not found(OK if using GNU libc)" >&5
17709+echo "${ECHO_T}not found(OK if using GNU libc)" >&6
17710 else
17711- { echo "$as_me:$LINENO: result: $rb_cv_fcnt" >&5
17712-echo "${ECHO_T}$rb_cv_fcnt" >&6; }
17713+ echo "$as_me:$LINENO: result: $rb_cv_fcnt" >&5
17714+echo "${ECHO_T}$rb_cv_fcnt" >&6
17715 cat >>confdefs.h <<_ACEOF
17716 #define FILE_COUNT $rb_cv_fcnt
17717 _ACEOF
17718
17719 fi
17720
17721-{ echo "$as_me:$LINENO: checking read buffer ptr field in FILE structures" >&5
17722-echo $ECHO_N "checking read buffer ptr field in FILE structures... $ECHO_C" >&6; }
17723+echo "$as_me:$LINENO: checking read buffer ptr field in FILE structures" >&5
17724+echo $ECHO_N "checking read buffer ptr field in FILE structures... $ECHO_C" >&6
17725 if test "${rb_cv_frptr+set}" = set; then
17726 echo $ECHO_N "(cached) $ECHO_C" >&6
17727 else
17728@@ -14970,48 +14287,51 @@
17729 }
17730 _ACEOF
17731 rm -f conftest.$ac_objext
17732-if { (ac_try="$ac_compile"
17733-case "(($ac_try" in
17734- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17735- *) ac_try_echo=$ac_try;;
17736-esac
17737-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17738- (eval "$ac_compile") 2>conftest.er1
17739+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17740+ (eval $ac_compile) 2>conftest.er1
17741 ac_status=$?
17742 grep -v '^ *+' conftest.er1 >conftest.err
17743 rm -f conftest.er1
17744 cat conftest.err >&5
17745 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17746- (exit $ac_status); } && {
17747- test -z "$ac_c_werror_flag" ||
17748- test ! -s conftest.err
17749- } && test -s conftest.$ac_objext; then
17750+ (exit $ac_status); } &&
17751+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17752+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17753+ (eval $ac_try) 2>&5
17754+ ac_status=$?
17755+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17756+ (exit $ac_status); }; } &&
17757+ { ac_try='test -s conftest.$ac_objext'
17758+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17759+ (eval $ac_try) 2>&5
17760+ ac_status=$?
17761+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17762+ (exit $ac_status); }; }; then
17763 rb_cv_frptr="$frptr"; break
17764 else
17765 echo "$as_me: failed program was:" >&5
17766 sed 's/^/| /' conftest.$ac_ext >&5
17767
17768- rb_cv_frptr="not found"
17769+rb_cv_frptr="not found"
17770 fi
17771-
17772-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17773+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17774 done
17775 fi
17776
17777 if test "$rb_cv_frptr" = "not found"; then
17778- { echo "$as_me:$LINENO: result: not found" >&5
17779-echo "${ECHO_T}not found" >&6; }
17780+ echo "$as_me:$LINENO: result: not found" >&5
17781+echo "${ECHO_T}not found" >&6
17782 else
17783- { echo "$as_me:$LINENO: result: $rb_cv_frptr" >&5
17784-echo "${ECHO_T}$rb_cv_frptr" >&6; }
17785+ echo "$as_me:$LINENO: result: $rb_cv_frptr" >&5
17786+echo "${ECHO_T}$rb_cv_frptr" >&6
17787 cat >>confdefs.h <<_ACEOF
17788 #define FILE_READPTR $rb_cv_frptr
17789 _ACEOF
17790
17791
17792 if test "$rb_cv_fcnt" = "not found"; then
17793- { echo "$as_me:$LINENO: checking read buffer end field in FILE structures" >&5
17794-echo $ECHO_N "checking read buffer end field in FILE structures... $ECHO_C" >&6; }
17795+ echo "$as_me:$LINENO: checking read buffer end field in FILE structures" >&5
17796+echo $ECHO_N "checking read buffer end field in FILE structures... $ECHO_C" >&6
17797 if test "${rb_cv_frend+set}" = set; then
17798 echo $ECHO_N "(cached) $ECHO_C" >&6
17799 else
17800@@ -15033,40 +14353,43 @@
17801 }
17802 _ACEOF
17803 rm -f conftest.$ac_objext
17804-if { (ac_try="$ac_compile"
17805-case "(($ac_try" in
17806- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17807- *) ac_try_echo=$ac_try;;
17808-esac
17809-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17810- (eval "$ac_compile") 2>conftest.er1
17811+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17812+ (eval $ac_compile) 2>conftest.er1
17813 ac_status=$?
17814 grep -v '^ *+' conftest.er1 >conftest.err
17815 rm -f conftest.er1
17816 cat conftest.err >&5
17817 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17818- (exit $ac_status); } && {
17819- test -z "$ac_c_werror_flag" ||
17820- test ! -s conftest.err
17821- } && test -s conftest.$ac_objext; then
17822+ (exit $ac_status); } &&
17823+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17824+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17825+ (eval $ac_try) 2>&5
17826+ ac_status=$?
17827+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17828+ (exit $ac_status); }; } &&
17829+ { ac_try='test -s conftest.$ac_objext'
17830+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17831+ (eval $ac_try) 2>&5
17832+ ac_status=$?
17833+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17834+ (exit $ac_status); }; }; then
17835 rb_cv_frend="$frend"; break
17836 else
17837 echo "$as_me: failed program was:" >&5
17838 sed 's/^/| /' conftest.$ac_ext >&5
17839
17840- rb_cv_frend="not found"
17841+rb_cv_frend="not found"
17842 fi
17843-
17844-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17845+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17846 done
17847 fi
17848
17849 if test "$rb_cv_frend" = "not found"; then
17850- { echo "$as_me:$LINENO: result: not found" >&5
17851-echo "${ECHO_T}not found" >&6; }
17852+ echo "$as_me:$LINENO: result: not found" >&5
17853+echo "${ECHO_T}not found" >&6
17854 else
17855- { echo "$as_me:$LINENO: result: $rb_cv_frend" >&5
17856-echo "${ECHO_T}$rb_cv_frend" >&6; }
17857+ echo "$as_me:$LINENO: result: $rb_cv_frend" >&5
17858+echo "${ECHO_T}$rb_cv_frend" >&6
17859 cat >>confdefs.h <<_ACEOF
17860 #define FILE_READEND $rb_cv_frend
17861 _ACEOF
17862@@ -15076,8 +14399,8 @@
17863 fi
17864
17865
17866-{ echo "$as_me:$LINENO: checking whether need to seek between R/W" >&5
17867-echo $ECHO_N "checking whether need to seek between R/W... $ECHO_C" >&6; }
17868+echo "$as_me:$LINENO: checking whether need to seek between R/W" >&5
17869+echo $ECHO_N "checking whether need to seek between R/W... $ECHO_C" >&6
17870 if test "${rb_cv_need_io_seek_between_rw+set}" = set; then
17871 echo $ECHO_N "(cached) $ECHO_C" >&6
17872 else
17873@@ -15144,22 +14467,13 @@
17874
17875 _ACEOF
17876 rm -f conftest$ac_exeext
17877-if { (ac_try="$ac_link"
17878-case "(($ac_try" in
17879- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17880- *) ac_try_echo=$ac_try;;
17881-esac
17882-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17883- (eval "$ac_link") 2>&5
17884+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17885+ (eval $ac_link) 2>&5
17886 ac_status=$?
17887 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17888 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17889- { (case "(($ac_try" in
17890- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17891- *) ac_try_echo=$ac_try;;
17892-esac
17893-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17894- (eval "$ac_try") 2>&5
17895+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17896+ (eval $ac_try) 2>&5
17897 ac_status=$?
17898 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17899 (exit $ac_status); }; }; then
17900@@ -15172,13 +14486,11 @@
17901 ( exit $ac_status )
17902 rb_cv_need_io_seek_between_rw=yes
17903 fi
17904-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17905+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17906 fi
17907-
17908-
17909 fi
17910-{ echo "$as_me:$LINENO: result: $rb_cv_need_io_seek_between_rw" >&5
17911-echo "${ECHO_T}$rb_cv_need_io_seek_between_rw" >&6; }
17912+echo "$as_me:$LINENO: result: $rb_cv_need_io_seek_between_rw" >&5
17913+echo "${ECHO_T}$rb_cv_need_io_seek_between_rw" >&6
17914 if test "$rb_cv_need_io_seek_between_rw" = yes; then
17915 cat >>confdefs.h <<\_ACEOF
17916 #define NEED_IO_SEEK_BETWEEN_RW 1
17917@@ -15186,8 +14498,8 @@
17918
17919 fi
17920
17921-{ echo "$as_me:$LINENO: checking whether st_ino is huge" >&5
17922-echo $ECHO_N "checking whether st_ino is huge... $ECHO_C" >&6; }
17923+echo "$as_me:$LINENO: checking whether st_ino is huge" >&5
17924+echo $ECHO_N "checking whether st_ino is huge... $ECHO_C" >&6
17925 if test "${rb_cv_huge_st_ino+set}" = set; then
17926 echo $ECHO_N "(cached) $ECHO_C" >&6
17927 else
17928@@ -15212,35 +14524,38 @@
17929 }
17930 _ACEOF
17931 rm -f conftest.$ac_objext
17932-if { (ac_try="$ac_compile"
17933-case "(($ac_try" in
17934- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17935- *) ac_try_echo=$ac_try;;
17936-esac
17937-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17938- (eval "$ac_compile") 2>conftest.er1
17939+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17940+ (eval $ac_compile) 2>conftest.er1
17941 ac_status=$?
17942 grep -v '^ *+' conftest.er1 >conftest.err
17943 rm -f conftest.er1
17944 cat conftest.err >&5
17945 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17946- (exit $ac_status); } && {
17947- test -z "$ac_c_werror_flag" ||
17948- test ! -s conftest.err
17949- } && test -s conftest.$ac_objext; then
17950+ (exit $ac_status); } &&
17951+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17952+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17953+ (eval $ac_try) 2>&5
17954+ ac_status=$?
17955+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17956+ (exit $ac_status); }; } &&
17957+ { ac_try='test -s conftest.$ac_objext'
17958+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17959+ (eval $ac_try) 2>&5
17960+ ac_status=$?
17961+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
17962+ (exit $ac_status); }; }; then
17963 rb_cv_huge_st_ino=yes
17964 else
17965 echo "$as_me: failed program was:" >&5
17966 sed 's/^/| /' conftest.$ac_ext >&5
17967
17968- rb_cv_huge_st_ino=no
17969+rb_cv_huge_st_ino=no
17970 fi
17971-
17972-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17973+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
17974
17975 fi
17976-{ echo "$as_me:$LINENO: result: $rb_cv_huge_st_ino" >&5
17977-echo "${ECHO_T}$rb_cv_huge_st_ino" >&6; }
17978+echo "$as_me:$LINENO: result: $rb_cv_huge_st_ino" >&5
17979+echo "${ECHO_T}$rb_cv_huge_st_ino" >&6
17980 if test $rb_cv_huge_st_ino = yes; then
17981 cat >>confdefs.h <<\_ACEOF
17982 #define HUGE_ST_INO 1
17983@@ -15250,8 +14565,8 @@
17984
17985 if test "$ac_cv_func_sysconf" = yes; then
17986
17987- { echo "$as_me:$LINENO: checking whether _SC_CLK_TCK is supported" >&5
17988-echo $ECHO_N "checking whether _SC_CLK_TCK is supported... $ECHO_C" >&6; }
17989+ echo "$as_me:$LINENO: checking whether _SC_CLK_TCK is supported" >&5
17990+echo $ECHO_N "checking whether _SC_CLK_TCK is supported... $ECHO_C" >&6
17991 if test "${rb_cv_have_sc_clk_tck+set}" = set; then
17992 echo $ECHO_N "(cached) $ECHO_C" >&6
17993 else
17994@@ -15272,35 +14587,38 @@
17995 }
17996 _ACEOF
17997 rm -f conftest.$ac_objext
17998-if { (ac_try="$ac_compile"
17999-case "(($ac_try" in
18000- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18001- *) ac_try_echo=$ac_try;;
18002-esac
18003-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18004- (eval "$ac_compile") 2>conftest.er1
18005+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18006+ (eval $ac_compile) 2>conftest.er1
18007 ac_status=$?
18008 grep -v '^ *+' conftest.er1 >conftest.err
18009 rm -f conftest.er1
18010 cat conftest.err >&5
18011 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18012- (exit $ac_status); } && {
18013- test -z "$ac_c_werror_flag" ||
18014- test ! -s conftest.err
18015- } && test -s conftest.$ac_objext; then
18016+ (exit $ac_status); } &&
18017+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18018+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18019+ (eval $ac_try) 2>&5
18020+ ac_status=$?
18021+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18022+ (exit $ac_status); }; } &&
18023+ { ac_try='test -s conftest.$ac_objext'
18024+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18025+ (eval $ac_try) 2>&5
18026+ ac_status=$?
18027+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18028+ (exit $ac_status); }; }; then
18029 rb_cv_have_sc_clk_tck=yes
18030 else
18031 echo "$as_me: failed program was:" >&5
18032 sed 's/^/| /' conftest.$ac_ext >&5
18033
18034- rb_cv_have_sc_clk_tck=no
18035+rb_cv_have_sc_clk_tck=no
18036 fi
18037-
18038-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
18039+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18040
18041 fi
18042-{ echo "$as_me:$LINENO: result: $rb_cv_have_sc_clk_tck" >&5
18043-echo "${ECHO_T}$rb_cv_have_sc_clk_tck" >&6; }
18044+echo "$as_me:$LINENO: result: $rb_cv_have_sc_clk_tck" >&5
18045+echo "${ECHO_T}$rb_cv_have_sc_clk_tck" >&6
18046 if test "$rb_cv_have_sc_clk_tck" = yes; then
18047 cat >>confdefs.h <<\_ACEOF
18048 #define HAVE__SC_CLK_TCK 1
18049@@ -15314,8 +14632,8 @@
18050 m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
18051 hppa*) rb_cv_stack_grow_dir=+1;;
18052 esac
18053-{ echo "$as_me:$LINENO: checking stack growing direction" >&5
18054-echo $ECHO_N "checking stack growing direction... $ECHO_C" >&6; }
18055+echo "$as_me:$LINENO: checking stack growing direction" >&5
18056+echo $ECHO_N "checking stack growing direction... $ECHO_C" >&6
18057 if test "${rb_cv_stack_grow_dir+set}" = set; then
18058 echo $ECHO_N "(cached) $ECHO_C" >&6
18059 else
18060@@ -15348,22 +14666,13 @@
18061
18062 _ACEOF
18063 rm -f conftest$ac_exeext
18064-if { (ac_try="$ac_link"
18065-case "(($ac_try" in
18066- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18067- *) ac_try_echo=$ac_try;;
18068-esac
18069-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18070- (eval "$ac_link") 2>&5
18071+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18072+ (eval $ac_link) 2>&5
18073 ac_status=$?
18074 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18075 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
18076- { (case "(($ac_try" in
18077- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18078- *) ac_try_echo=$ac_try;;
18079-esac
18080-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18081- (eval "$ac_try") 2>&5
18082+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18083+ (eval $ac_try) 2>&5
18084 ac_status=$?
18085 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18086 (exit $ac_status); }; }; then
18087@@ -15376,13 +14685,11 @@
18088 ( exit $ac_status )
18089 rb_cv_stack_grow_dir=+1
18090 fi
18091-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
18092+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
18093 fi
18094-
18095-
18096 fi
18097-{ echo "$as_me:$LINENO: result: $rb_cv_stack_grow_dir" >&5
18098-echo "${ECHO_T}$rb_cv_stack_grow_dir" >&6; }
18099+echo "$as_me:$LINENO: result: $rb_cv_stack_grow_dir" >&5
18100+echo "${ECHO_T}$rb_cv_stack_grow_dir" >&6
18101 cat >>confdefs.h <<_ACEOF
18102 #define STACK_GROW_DIRECTION $rb_cv_stack_grow_dir
18103 _ACEOF
18104@@ -15391,9 +14698,9 @@
18105 if test x"$enable_pthread" = xyes; then
18106 for pthread_lib in pthread pthreads c c_r; do
18107 as_ac_Lib=`echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
18108-{ echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
18109-echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6; }
18110-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
18111+echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
18112+echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6
18113+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
18114 echo $ECHO_N "(cached) $ECHO_C" >&6
18115 else
18116 ac_check_lib_save_LIBS=$LIBS
18117@@ -15405,54 +14712,55 @@
18118 cat >>conftest.$ac_ext <<_ACEOF
18119 /* end confdefs.h. */
18120
18121-/* Override any GCC internal prototype to avoid an error.
18122- Use char because int might match the return type of a GCC
18123- builtin and then its argument prototype would still apply. */
18124+/* Override any gcc2 internal prototype to avoid an error. */
18125 #ifdef __cplusplus
18126 extern "C"
18127 #endif
18128+/* We use char because int might match the return type of a gcc2
18129+ builtin and then its argument prototype would still apply. */
18130 char pthread_kill ();
18131 int
18132 main ()
18133 {
18134-return pthread_kill ();
18135+pthread_kill ();
18136 ;
18137 return 0;
18138 }
18139 _ACEOF
18140 rm -f conftest.$ac_objext conftest$ac_exeext
18141-if { (ac_try="$ac_link"
18142-case "(($ac_try" in
18143- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18144- *) ac_try_echo=$ac_try;;
18145-esac
18146-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18147- (eval "$ac_link") 2>conftest.er1
18148+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18149+ (eval $ac_link) 2>conftest.er1
18150 ac_status=$?
18151 grep -v '^ *+' conftest.er1 >conftest.err
18152 rm -f conftest.er1
18153 cat conftest.err >&5
18154 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18155- (exit $ac_status); } && {
18156- test -z "$ac_c_werror_flag" ||
18157- test ! -s conftest.err
18158- } && test -s conftest$ac_exeext &&
18159- $as_test_x conftest$ac_exeext; then
18160+ (exit $ac_status); } &&
18161+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18162+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18163+ (eval $ac_try) 2>&5
18164+ ac_status=$?
18165+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18166+ (exit $ac_status); }; } &&
18167+ { ac_try='test -s conftest$ac_exeext'
18168+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18169+ (eval $ac_try) 2>&5
18170+ ac_status=$?
18171+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18172+ (exit $ac_status); }; }; then
18173 eval "$as_ac_Lib=yes"
18174 else
18175 echo "$as_me: failed program was:" >&5
18176 sed 's/^/| /' conftest.$ac_ext >&5
18177
18178- eval "$as_ac_Lib=no"
18179+eval "$as_ac_Lib=no"
18180 fi
18181-
18182-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18183+rm -f conftest.err conftest.$ac_objext \
18184 conftest$ac_exeext conftest.$ac_ext
18185 LIBS=$ac_check_lib_save_LIBS
18186 fi
18187-ac_res=`eval echo '${'$as_ac_Lib'}'`
18188- { echo "$as_me:$LINENO: result: $ac_res" >&5
18189-echo "${ECHO_T}$ac_res" >&6; }
18190+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
18191+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
18192 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
18193 rb_with_pthread=yes
18194 else
18195@@ -15492,9 +14800,9 @@
18196 for ac_func in nanosleep
18197 do
18198 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
18199-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
18200-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
18201-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
18202+echo "$as_me:$LINENO: checking for $ac_func" >&5
18203+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
18204+if eval "test \"\${$as_ac_var+set}\" = set"; then
18205 echo $ECHO_N "(cached) $ECHO_C" >&6
18206 else
18207 cat >conftest.$ac_ext <<_ACEOF
18208@@ -15520,60 +14828,67 @@
18209
18210 #undef $ac_func
18211
18212-/* Override any GCC internal prototype to avoid an error.
18213- Use char because int might match the return type of a GCC
18214- builtin and then its argument prototype would still apply. */
18215+/* Override any gcc2 internal prototype to avoid an error. */
18216 #ifdef __cplusplus
18217 extern "C"
18218+{
18219 #endif
18220+/* We use char because int might match the return type of a gcc2
18221+ builtin and then its argument prototype would still apply. */
18222 char $ac_func ();
18223 /* The GNU C library defines this for functions which it implements
18224 to always fail with ENOSYS. Some functions are actually named
18225 something starting with __ and the normal name is an alias. */
18226-#if defined __stub_$ac_func || defined __stub___$ac_func
18227+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
18228 choke me
18229+#else
18230+char (*f) () = $ac_func;
18231+#endif
18232+#ifdef __cplusplus
18233+}
18234 #endif
18235
18236 int
18237 main ()
18238 {
18239-return $ac_func ();
18240+return f != $ac_func;
18241 ;
18242 return 0;
18243 }
18244 _ACEOF
18245 rm -f conftest.$ac_objext conftest$ac_exeext
18246-if { (ac_try="$ac_link"
18247-case "(($ac_try" in
18248- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18249- *) ac_try_echo=$ac_try;;
18250-esac
18251-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18252- (eval "$ac_link") 2>conftest.er1
18253+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18254+ (eval $ac_link) 2>conftest.er1
18255 ac_status=$?
18256 grep -v '^ *+' conftest.er1 >conftest.err
18257 rm -f conftest.er1
18258 cat conftest.err >&5
18259 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18260- (exit $ac_status); } && {
18261- test -z "$ac_c_werror_flag" ||
18262- test ! -s conftest.err
18263- } && test -s conftest$ac_exeext &&
18264- $as_test_x conftest$ac_exeext; then
18265+ (exit $ac_status); } &&
18266+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18267+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18268+ (eval $ac_try) 2>&5
18269+ ac_status=$?
18270+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18271+ (exit $ac_status); }; } &&
18272+ { ac_try='test -s conftest$ac_exeext'
18273+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18274+ (eval $ac_try) 2>&5
18275+ ac_status=$?
18276+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18277+ (exit $ac_status); }; }; then
18278 eval "$as_ac_var=yes"
18279 else
18280 echo "$as_me: failed program was:" >&5
18281 sed 's/^/| /' conftest.$ac_ext >&5
18282
18283- eval "$as_ac_var=no"
18284+eval "$as_ac_var=no"
18285 fi
18286-
18287-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18288+rm -f conftest.err conftest.$ac_objext \
18289 conftest$ac_exeext conftest.$ac_ext
18290 fi
18291-ac_res=`eval echo '${'$as_ac_var'}'`
18292- { echo "$as_me:$LINENO: result: $ac_res" >&5
18293-echo "${ECHO_T}$ac_res" >&6; }
18294+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
18295+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
18296 if test `eval echo '${'$as_ac_var'}'` = yes; then
18297 cat >>confdefs.h <<_ACEOF
18298 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
18299@@ -15584,8 +14899,8 @@
18300
18301 if test x"$ac_cv_func_nanosleep" = xno; then
18302
18303-{ echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
18304-echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6; }
18305+echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
18306+echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6
18307 if test "${ac_cv_lib_rt_nanosleep+set}" = set; then
18308 echo $ECHO_N "(cached) $ECHO_C" >&6
18309 else
18310@@ -15598,53 +14913,55 @@
18311 cat >>conftest.$ac_ext <<_ACEOF
18312 /* end confdefs.h. */
18313
18314-/* Override any GCC internal prototype to avoid an error.
18315- Use char because int might match the return type of a GCC
18316- builtin and then its argument prototype would still apply. */
18317+/* Override any gcc2 internal prototype to avoid an error. */
18318 #ifdef __cplusplus
18319 extern "C"
18320 #endif
18321+/* We use char because int might match the return type of a gcc2
18322+ builtin and then its argument prototype would still apply. */
18323 char nanosleep ();
18324 int
18325 main ()
18326 {
18327-return nanosleep ();
18328+nanosleep ();
18329 ;
18330 return 0;
18331 }
18332 _ACEOF
18333 rm -f conftest.$ac_objext conftest$ac_exeext
18334-if { (ac_try="$ac_link"
18335-case "(($ac_try" in
18336- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18337- *) ac_try_echo=$ac_try;;
18338-esac
18339-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18340- (eval "$ac_link") 2>conftest.er1
18341+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18342+ (eval $ac_link) 2>conftest.er1
18343 ac_status=$?
18344 grep -v '^ *+' conftest.er1 >conftest.err
18345 rm -f conftest.er1
18346 cat conftest.err >&5
18347 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18348- (exit $ac_status); } && {
18349- test -z "$ac_c_werror_flag" ||
18350- test ! -s conftest.err
18351- } && test -s conftest$ac_exeext &&
18352- $as_test_x conftest$ac_exeext; then
18353+ (exit $ac_status); } &&
18354+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18355+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18356+ (eval $ac_try) 2>&5
18357+ ac_status=$?
18358+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18359+ (exit $ac_status); }; } &&
18360+ { ac_try='test -s conftest$ac_exeext'
18361+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18362+ (eval $ac_try) 2>&5
18363+ ac_status=$?
18364+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18365+ (exit $ac_status); }; }; then
18366 ac_cv_lib_rt_nanosleep=yes
18367 else
18368 echo "$as_me: failed program was:" >&5
18369 sed 's/^/| /' conftest.$ac_ext >&5
18370
18371- ac_cv_lib_rt_nanosleep=no
18372+ac_cv_lib_rt_nanosleep=no
18373 fi
18374-
18375-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18376+rm -f conftest.err conftest.$ac_objext \
18377 conftest$ac_exeext conftest.$ac_ext
18378 LIBS=$ac_check_lib_save_LIBS
18379 fi
18380-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
18381-echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6; }
18382+echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
18383+echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6
18384 if test $ac_cv_lib_rt_nanosleep = yes; then
18385 cat >>confdefs.h <<_ACEOF
18386 #define HAVE_LIBRT 1
18387@@ -15669,9 +14986,9 @@
18388 for ac_func in getcontext setcontext
18389 do
18390 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
18391-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
18392-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
18393-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
18394+echo "$as_me:$LINENO: checking for $ac_func" >&5
18395+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
18396+if eval "test \"\${$as_ac_var+set}\" = set"; then
18397 echo $ECHO_N "(cached) $ECHO_C" >&6
18398 else
18399 cat >conftest.$ac_ext <<_ACEOF
18400@@ -15697,60 +15014,67 @@
18401
18402 #undef $ac_func
18403
18404-/* Override any GCC internal prototype to avoid an error.
18405- Use char because int might match the return type of a GCC
18406- builtin and then its argument prototype would still apply. */
18407+/* Override any gcc2 internal prototype to avoid an error. */
18408 #ifdef __cplusplus
18409 extern "C"
18410+{
18411 #endif
18412+/* We use char because int might match the return type of a gcc2
18413+ builtin and then its argument prototype would still apply. */
18414 char $ac_func ();
18415 /* The GNU C library defines this for functions which it implements
18416 to always fail with ENOSYS. Some functions are actually named
18417 something starting with __ and the normal name is an alias. */
18418-#if defined __stub_$ac_func || defined __stub___$ac_func
18419+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
18420 choke me
18421+#else
18422+char (*f) () = $ac_func;
18423+#endif
18424+#ifdef __cplusplus
18425+}
18426 #endif
18427
18428 int
18429 main ()
18430 {
18431-return $ac_func ();
18432+return f != $ac_func;
18433 ;
18434 return 0;
18435 }
18436 _ACEOF
18437 rm -f conftest.$ac_objext conftest$ac_exeext
18438-if { (ac_try="$ac_link"
18439-case "(($ac_try" in
18440- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18441- *) ac_try_echo=$ac_try;;
18442-esac
18443-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18444- (eval "$ac_link") 2>conftest.er1
18445+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18446+ (eval $ac_link) 2>conftest.er1
18447 ac_status=$?
18448 grep -v '^ *+' conftest.er1 >conftest.err
18449 rm -f conftest.er1
18450 cat conftest.err >&5
18451 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18452- (exit $ac_status); } && {
18453- test -z "$ac_c_werror_flag" ||
18454- test ! -s conftest.err
18455- } && test -s conftest$ac_exeext &&
18456- $as_test_x conftest$ac_exeext; then
18457+ (exit $ac_status); } &&
18458+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18459+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18460+ (eval $ac_try) 2>&5
18461+ ac_status=$?
18462+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18463+ (exit $ac_status); }; } &&
18464+ { ac_try='test -s conftest$ac_exeext'
18465+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18466+ (eval $ac_try) 2>&5
18467+ ac_status=$?
18468+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18469+ (exit $ac_status); }; }; then
18470 eval "$as_ac_var=yes"
18471 else
18472 echo "$as_me: failed program was:" >&5
18473 sed 's/^/| /' conftest.$ac_ext >&5
18474
18475- eval "$as_ac_var=no"
18476+eval "$as_ac_var=no"
18477 fi
18478-
18479-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18480+rm -f conftest.err conftest.$ac_objext \
18481 conftest$ac_exeext conftest.$ac_ext
18482 fi
18483-ac_res=`eval echo '${'$as_ac_var'}'`
18484- { echo "$as_me:$LINENO: result: $ac_res" >&5
18485-echo "${ECHO_T}$ac_res" >&6; }
18486+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
18487+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
18488 if test `eval echo '${'$as_ac_var'}'` = yes; then
18489 cat >>confdefs.h <<_ACEOF
18490 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
18491@@ -15765,9 +15089,10 @@
18492 DEFAULT_KCODE="KCODE_NONE"
18493
18494
18495-# Check whether --with-default-kcode was given.
18496+# Check whether --with-default-kcode or --without-default-kcode was given.
18497 if test "${with_default_kcode+set}" = set; then
18498- withval=$with_default_kcode; case $withval in
18499+ withval="$with_default_kcode"
18500+ case $withval in
18501 utf8) DEFAULT_KCODE="KCODE_UTF8";;
18502 euc) DEFAULT_KCODE="KCODE_EUC";;
18503 sjis) DEFAULT_KCODE="KCODE_SJIS";;
18504@@ -15775,28 +15100,27 @@
18505 *) { echo "$as_me:$LINENO: WARNING: $withval is not valid kcode; ignored" >&5
18506 echo "$as_me: WARNING: $withval is not valid kcode; ignored" >&2;};;
18507 esac
18508-fi
18509-
18510+fi;
18511 cat >>confdefs.h <<_ACEOF
18512 #define DEFAULT_KCODE $DEFAULT_KCODE
18513 _ACEOF
18514
18515
18516
18517-# Check whether --with-dln-a-out was given.
18518+# Check whether --with-dln-a-out or --without-dln-a-out was given.
18519 if test "${with_dln_a_out+set}" = set; then
18520- withval=$with_dln_a_out;
18521+ withval="$with_dln_a_out"
18522+
18523 case $withval in
18524 yes) with_dln_a_out=yes;;
18525 *) with_dln_a_out=no;;
18526 esac
18527 else
18528 with_dln_a_out=no
18529-fi
18530+fi;
18531
18532-
18533-{ echo "$as_me:$LINENO: checking whether ELF binaries are produced" >&5
18534-echo $ECHO_N "checking whether ELF binaries are produced... $ECHO_C" >&6; }
18535+echo "$as_me:$LINENO: checking whether ELF binaries are produced" >&5
18536+echo $ECHO_N "checking whether ELF binaries are produced... $ECHO_C" >&6
18537 if test "${rb_cv_binary_elf+set}" = set; then
18538 echo $ECHO_N "(cached) $ECHO_C" >&6
18539 else
18540@@ -15828,22 +15152,13 @@
18541
18542 _ACEOF
18543 rm -f conftest$ac_exeext
18544-if { (ac_try="$ac_link"
18545-case "(($ac_try" in
18546- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18547- *) ac_try_echo=$ac_try;;
18548-esac
18549-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18550- (eval "$ac_link") 2>&5
18551+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18552+ (eval $ac_link) 2>&5
18553 ac_status=$?
18554 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18555 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
18556- { (case "(($ac_try" in
18557- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18558- *) ac_try_echo=$ac_try;;
18559-esac
18560-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18561- (eval "$ac_try") 2>&5
18562+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18563+ (eval $ac_try) 2>&5
18564 ac_status=$?
18565 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18566 (exit $ac_status); }; }; then
18567@@ -15856,13 +15171,11 @@
18568 ( exit $ac_status )
18569 rb_cv_binary_elf=no
18570 fi
18571-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
18572+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
18573 fi
18574-
18575-
18576 fi
18577-{ echo "$as_me:$LINENO: result: $rb_cv_binary_elf" >&5
18578-echo "${ECHO_T}$rb_cv_binary_elf" >&6; }
18579+echo "$as_me:$LINENO: result: $rb_cv_binary_elf" >&5
18580+echo "${ECHO_T}$rb_cv_binary_elf" >&6
18581
18582 if test "$rb_cv_binary_elf" = yes; then
18583 cat >>confdefs.h <<\_ACEOF
18584@@ -15884,13 +15197,13 @@
18585
18586
18587 STATIC=
18588-: ${LIBPATHFLAG=' -L"%s"'}
18589+: ${LIBPATHFLAG=' -L%s'}
18590 : ${PATHFLAG=''}
18591
18592 if test "$with_dln_a_out" != yes; then
18593 rb_cv_dlopen=unknown
18594- { echo "$as_me:$LINENO: checking whether OS depend dynamic link works" >&5
18595-echo $ECHO_N "checking whether OS depend dynamic link works... $ECHO_C" >&6; }
18596+ echo "$as_me:$LINENO: checking whether OS depend dynamic link works" >&5
18597+echo $ECHO_N "checking whether OS depend dynamic link works... $ECHO_C" >&6
18598 if test "$GCC" = yes; then
18599 case "$target_os" in
18600 nextstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
18601@@ -15949,7 +15262,7 @@
18602 rb_cv_dlopen=yes ;;
18603 interix*) : ${LDSHARED="$CC -shared"}
18604 XLDFLAGS="$XLDFLAGS -Wl,-E"
18605- LIBPATHFLAG=" -L'%1\$-s'"
18606+ LIBPATHFLAG=" -L%1\$-s"
18607 rb_cv_dlopen=yes ;;
18608 freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
18609 if test "$rb_cv_binary_elf" = yes; then
18610@@ -15979,15 +15292,12 @@
18611 rb_cv_dlopen=yes ;;
18612 aix*) if test "$GCC" = yes; then
18613 : ${LDSHARED='$(CC) -shared'}
18614- DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
18615- LDFLAGS='-Wl,-brtl'
18616- XLDFLAGS='-Wl,-bE:ruby.imp'
18617 else
18618 : ${LDSHARED='/usr/ccs/bin/ld'}
18619- DLDFLAGS='-G -eInit_$(TARGET)'
18620- LDFLAGS='-brtl'
18621- XLDFLAGS='-bE:ruby.imp'
18622- fi
18623+ fi
18624+ DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
18625+ LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
18626+ XLDFLAGS="${linker_flag}-bE:ruby.imp"
18627 : ${ARCHFILE="ruby.imp"}
18628 TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
18629 TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
18630@@ -16026,23 +15336,19 @@
18631 ;;
18632 *) : ${LDSHARED='ld'} ;;
18633 esac
18634- { echo "$as_me:$LINENO: result: $rb_cv_dlopen" >&5
18635-echo "${ECHO_T}$rb_cv_dlopen" >&6; }
18636+ echo "$as_me:$LINENO: result: $rb_cv_dlopen" >&5
18637+echo "${ECHO_T}$rb_cv_dlopen" >&6
18638
18639- # Check whether --enable-rpath was given.
18640+ # Check whether --enable-rpath or --disable-rpath was given.
18641 if test "${enable_rpath+set}" = set; then
18642- enableval=$enable_rpath; enable_rpath=$enableval
18643+ enableval="$enable_rpath"
18644+ enable_rpath=$enableval
18645 else
18646 enable_rpath="$rb_cv_binary_elf"
18647-fi
18648-
18649+fi;
18650 if test "$enable_rpath" = yes; then
18651- LIBPATHFLAG=" -L'%1\$-s'"
18652- if test "$GCC" = yes; then
18653- RPATHFLAG=" -Wl,-R'%1\$-s'"
18654- else
18655- RPATHFLAG=" -R'%1\$-s'"
18656- fi
18657+ LIBPATHFLAG=" -L%1\$-s"
18658+ RPATHFLAG=" ${linker_flag}-R%1\$-s"
18659 fi
18660 fi
18661
18662@@ -16056,8 +15362,8 @@
18663 if test "$ac_cv_header_a_out_h" = yes; then
18664 if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
18665 cat confdefs.h > config.h
18666- { echo "$as_me:$LINENO: checking whether matz's dln works" >&5
18667-echo $ECHO_N "checking whether matz's dln works... $ECHO_C" >&6; }
18668+ echo "$as_me:$LINENO: checking whether matz's dln works" >&5
18669+echo $ECHO_N "checking whether matz's dln works... $ECHO_C" >&6
18670 if test "${rb_cv_dln_a_out+set}" = set; then
18671 echo $ECHO_N "(cached) $ECHO_C" >&6
18672 else
18673@@ -16080,34 +15386,37 @@
18674 }
18675 _ACEOF
18676 rm -f conftest.$ac_objext
18677-if { (ac_try="$ac_compile"
18678-case "(($ac_try" in
18679- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18680- *) ac_try_echo=$ac_try;;
18681-esac
18682-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18683- (eval "$ac_compile") 2>conftest.er1
18684+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18685+ (eval $ac_compile) 2>conftest.er1
18686 ac_status=$?
18687 grep -v '^ *+' conftest.er1 >conftest.err
18688 rm -f conftest.er1
18689 cat conftest.err >&5
18690 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18691- (exit $ac_status); } && {
18692- test -z "$ac_c_werror_flag" ||
18693- test ! -s conftest.err
18694- } && test -s conftest.$ac_objext; then
18695+ (exit $ac_status); } &&
18696+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18697+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18698+ (eval $ac_try) 2>&5
18699+ ac_status=$?
18700+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18701+ (exit $ac_status); }; } &&
18702+ { ac_try='test -s conftest.$ac_objext'
18703+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18704+ (eval $ac_try) 2>&5
18705+ ac_status=$?
18706+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18707+ (exit $ac_status); }; }; then
18708 rb_cv_dln_a_out=yes
18709 else
18710 echo "$as_me: failed program was:" >&5
18711 sed 's/^/| /' conftest.$ac_ext >&5
18712
18713- rb_cv_dln_a_out=no
18714+rb_cv_dln_a_out=no
18715 fi
18716-
18717-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
18718+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
18719 fi
18720-{ echo "$as_me:$LINENO: result: $rb_cv_dln_a_out" >&5
18721-echo "${ECHO_T}$rb_cv_dln_a_out" >&6; }
18722+echo "$as_me:$LINENO: result: $rb_cv_dln_a_out" >&5
18723+echo "${ECHO_T}$rb_cv_dln_a_out" >&6
18724 if test "$rb_cv_dln_a_out" = yes; then
18725 dln_a_out_works=yes
18726 cat >>confdefs.h <<\_ACEOF
18727@@ -16174,21 +15483,21 @@
18728
18729 EXTSTATIC=
18730
18731-# Check whether --with-static-linked-ext was given.
18732+# Check whether --with-static-linked-ext or --without-static-linked-ext was given.
18733 if test "${with_static_linked_ext+set}" = set; then
18734- withval=$with_static_linked_ext; case $withval in
18735+ withval="$with_static_linked_ext"
18736+ case $withval in
18737 yes) STATIC=
18738 EXTSTATIC=static;;
18739 *) ;;
18740 esac
18741-fi
18742-
18743+fi;
18744
18745 case "$target_os" in
18746 human*)
18747
18748-{ echo "$as_me:$LINENO: checking for _harderr in -lsignal" >&5
18749-echo $ECHO_N "checking for _harderr in -lsignal... $ECHO_C" >&6; }
18750+echo "$as_me:$LINENO: checking for _harderr in -lsignal" >&5
18751+echo $ECHO_N "checking for _harderr in -lsignal... $ECHO_C" >&6
18752 if test "${ac_cv_lib_signal__harderr+set}" = set; then
18753 echo $ECHO_N "(cached) $ECHO_C" >&6
18754 else
18755@@ -16201,53 +15510,55 @@
18756 cat >>conftest.$ac_ext <<_ACEOF
18757 /* end confdefs.h. */
18758
18759-/* Override any GCC internal prototype to avoid an error.
18760- Use char because int might match the return type of a GCC
18761- builtin and then its argument prototype would still apply. */
18762+/* Override any gcc2 internal prototype to avoid an error. */
18763 #ifdef __cplusplus
18764 extern "C"
18765 #endif
18766+/* We use char because int might match the return type of a gcc2
18767+ builtin and then its argument prototype would still apply. */
18768 char _harderr ();
18769 int
18770 main ()
18771 {
18772-return _harderr ();
18773+_harderr ();
18774 ;
18775 return 0;
18776 }
18777 _ACEOF
18778 rm -f conftest.$ac_objext conftest$ac_exeext
18779-if { (ac_try="$ac_link"
18780-case "(($ac_try" in
18781- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18782- *) ac_try_echo=$ac_try;;
18783-esac
18784-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18785- (eval "$ac_link") 2>conftest.er1
18786+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18787+ (eval $ac_link) 2>conftest.er1
18788 ac_status=$?
18789 grep -v '^ *+' conftest.er1 >conftest.err
18790 rm -f conftest.er1
18791 cat conftest.err >&5
18792 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18793- (exit $ac_status); } && {
18794- test -z "$ac_c_werror_flag" ||
18795- test ! -s conftest.err
18796- } && test -s conftest$ac_exeext &&
18797- $as_test_x conftest$ac_exeext; then
18798+ (exit $ac_status); } &&
18799+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18800+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18801+ (eval $ac_try) 2>&5
18802+ ac_status=$?
18803+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18804+ (exit $ac_status); }; } &&
18805+ { ac_try='test -s conftest$ac_exeext'
18806+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18807+ (eval $ac_try) 2>&5
18808+ ac_status=$?
18809+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18810+ (exit $ac_status); }; }; then
18811 ac_cv_lib_signal__harderr=yes
18812 else
18813 echo "$as_me: failed program was:" >&5
18814 sed 's/^/| /' conftest.$ac_ext >&5
18815
18816- ac_cv_lib_signal__harderr=no
18817+ac_cv_lib_signal__harderr=no
18818 fi
18819-
18820-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18821+rm -f conftest.err conftest.$ac_objext \
18822 conftest$ac_exeext conftest.$ac_ext
18823 LIBS=$ac_check_lib_save_LIBS
18824 fi
18825-{ echo "$as_me:$LINENO: result: $ac_cv_lib_signal__harderr" >&5
18826-echo "${ECHO_T}$ac_cv_lib_signal__harderr" >&6; }
18827+echo "$as_me:$LINENO: result: $ac_cv_lib_signal__harderr" >&5
18828+echo "${ECHO_T}$ac_cv_lib_signal__harderr" >&6
18829 if test $ac_cv_lib_signal__harderr = yes; then
18830 cat >>confdefs.h <<_ACEOF
18831 #define HAVE_LIBSIGNAL 1
18832@@ -16258,8 +15569,8 @@
18833 fi
18834
18835
18836-{ echo "$as_me:$LINENO: checking for hmemset in -lhmem" >&5
18837-echo $ECHO_N "checking for hmemset in -lhmem... $ECHO_C" >&6; }
18838+echo "$as_me:$LINENO: checking for hmemset in -lhmem" >&5
18839+echo $ECHO_N "checking for hmemset in -lhmem... $ECHO_C" >&6
18840 if test "${ac_cv_lib_hmem_hmemset+set}" = set; then
18841 echo $ECHO_N "(cached) $ECHO_C" >&6
18842 else
18843@@ -16272,53 +15583,55 @@
18844 cat >>conftest.$ac_ext <<_ACEOF
18845 /* end confdefs.h. */
18846
18847-/* Override any GCC internal prototype to avoid an error.
18848- Use char because int might match the return type of a GCC
18849- builtin and then its argument prototype would still apply. */
18850+/* Override any gcc2 internal prototype to avoid an error. */
18851 #ifdef __cplusplus
18852 extern "C"
18853 #endif
18854+/* We use char because int might match the return type of a gcc2
18855+ builtin and then its argument prototype would still apply. */
18856 char hmemset ();
18857 int
18858 main ()
18859 {
18860-return hmemset ();
18861+hmemset ();
18862 ;
18863 return 0;
18864 }
18865 _ACEOF
18866 rm -f conftest.$ac_objext conftest$ac_exeext
18867-if { (ac_try="$ac_link"
18868-case "(($ac_try" in
18869- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18870- *) ac_try_echo=$ac_try;;
18871-esac
18872-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18873- (eval "$ac_link") 2>conftest.er1
18874+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18875+ (eval $ac_link) 2>conftest.er1
18876 ac_status=$?
18877 grep -v '^ *+' conftest.er1 >conftest.err
18878 rm -f conftest.er1
18879 cat conftest.err >&5
18880 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18881- (exit $ac_status); } && {
18882- test -z "$ac_c_werror_flag" ||
18883- test ! -s conftest.err
18884- } && test -s conftest$ac_exeext &&
18885- $as_test_x conftest$ac_exeext; then
18886+ (exit $ac_status); } &&
18887+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18888+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18889+ (eval $ac_try) 2>&5
18890+ ac_status=$?
18891+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18892+ (exit $ac_status); }; } &&
18893+ { ac_try='test -s conftest$ac_exeext'
18894+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18895+ (eval $ac_try) 2>&5
18896+ ac_status=$?
18897+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18898+ (exit $ac_status); }; }; then
18899 ac_cv_lib_hmem_hmemset=yes
18900 else
18901 echo "$as_me: failed program was:" >&5
18902 sed 's/^/| /' conftest.$ac_ext >&5
18903
18904- ac_cv_lib_hmem_hmemset=no
18905+ac_cv_lib_hmem_hmemset=no
18906 fi
18907-
18908-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18909+rm -f conftest.err conftest.$ac_objext \
18910 conftest$ac_exeext conftest.$ac_ext
18911 LIBS=$ac_check_lib_save_LIBS
18912 fi
18913-{ echo "$as_me:$LINENO: result: $ac_cv_lib_hmem_hmemset" >&5
18914-echo "${ECHO_T}$ac_cv_lib_hmem_hmemset" >&6; }
18915+echo "$as_me:$LINENO: result: $ac_cv_lib_hmem_hmemset" >&5
18916+echo "${ECHO_T}$ac_cv_lib_hmem_hmemset" >&6
18917 if test $ac_cv_lib_hmem_hmemset = yes; then
18918 cat >>confdefs.h <<_ACEOF
18919 #define HAVE_LIBHMEM 1
18920@@ -16333,9 +15646,9 @@
18921 for ac_func in select gettimeofday
18922 do
18923 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
18924-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
18925-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
18926-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
18927+echo "$as_me:$LINENO: checking for $ac_func" >&5
18928+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
18929+if eval "test \"\${$as_ac_var+set}\" = set"; then
18930 echo $ECHO_N "(cached) $ECHO_C" >&6
18931 else
18932 cat >conftest.$ac_ext <<_ACEOF
18933@@ -16361,60 +15674,67 @@
18934
18935 #undef $ac_func
18936
18937-/* Override any GCC internal prototype to avoid an error.
18938- Use char because int might match the return type of a GCC
18939- builtin and then its argument prototype would still apply. */
18940+/* Override any gcc2 internal prototype to avoid an error. */
18941 #ifdef __cplusplus
18942 extern "C"
18943+{
18944 #endif
18945+/* We use char because int might match the return type of a gcc2
18946+ builtin and then its argument prototype would still apply. */
18947 char $ac_func ();
18948 /* The GNU C library defines this for functions which it implements
18949 to always fail with ENOSYS. Some functions are actually named
18950 something starting with __ and the normal name is an alias. */
18951-#if defined __stub_$ac_func || defined __stub___$ac_func
18952+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
18953 choke me
18954+#else
18955+char (*f) () = $ac_func;
18956+#endif
18957+#ifdef __cplusplus
18958+}
18959 #endif
18960
18961 int
18962 main ()
18963 {
18964-return $ac_func ();
18965+return f != $ac_func;
18966 ;
18967 return 0;
18968 }
18969 _ACEOF
18970 rm -f conftest.$ac_objext conftest$ac_exeext
18971-if { (ac_try="$ac_link"
18972-case "(($ac_try" in
18973- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18974- *) ac_try_echo=$ac_try;;
18975-esac
18976-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18977- (eval "$ac_link") 2>conftest.er1
18978+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
18979+ (eval $ac_link) 2>conftest.er1
18980 ac_status=$?
18981 grep -v '^ *+' conftest.er1 >conftest.err
18982 rm -f conftest.er1
18983 cat conftest.err >&5
18984 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18985- (exit $ac_status); } && {
18986- test -z "$ac_c_werror_flag" ||
18987- test ! -s conftest.err
18988- } && test -s conftest$ac_exeext &&
18989- $as_test_x conftest$ac_exeext; then
18990+ (exit $ac_status); } &&
18991+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18992+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18993+ (eval $ac_try) 2>&5
18994+ ac_status=$?
18995+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
18996+ (exit $ac_status); }; } &&
18997+ { ac_try='test -s conftest$ac_exeext'
18998+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18999+ (eval $ac_try) 2>&5
19000+ ac_status=$?
19001+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
19002+ (exit $ac_status); }; }; then
19003 eval "$as_ac_var=yes"
19004 else
19005 echo "$as_me: failed program was:" >&5
19006 sed 's/^/| /' conftest.$ac_ext >&5
19007
19008- eval "$as_ac_var=no"
19009+eval "$as_ac_var=no"
19010 fi
19011-
19012-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19013+rm -f conftest.err conftest.$ac_objext \
19014 conftest$ac_exeext conftest.$ac_ext
19015 fi
19016-ac_res=`eval echo '${'$as_ac_var'}'`
19017- { echo "$as_me:$LINENO: result: $ac_res" >&5
19018-echo "${ECHO_T}$ac_res" >&6; }
19019+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
19020+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
19021 if test `eval echo '${'$as_ac_var'}'` = yes; then
19022 cat >>confdefs.h <<_ACEOF
19023 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
19024@@ -16423,8 +15743,8 @@
19025 fi
19026 done
19027
19028- { echo "$as_me:$LINENO: checking whether PD libc _dtos18 fail to convert big number" >&5
19029-echo $ECHO_N "checking whether PD libc _dtos18 fail to convert big number... $ECHO_C" >&6; }
19030+ echo "$as_me:$LINENO: checking whether PD libc _dtos18 fail to convert big number" >&5
19031+echo $ECHO_N "checking whether PD libc _dtos18 fail to convert big number... $ECHO_C" >&6
19032 if test "${rb_cv_missing__dtos18+set}" = set; then
19033 echo $ECHO_N "(cached) $ECHO_C" >&6
19034 else
19035@@ -16448,22 +15768,13 @@
19036
19037 _ACEOF
19038 rm -f conftest$ac_exeext
19039-if { (ac_try="$ac_link"
19040-case "(($ac_try" in
19041- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19042- *) ac_try_echo=$ac_try;;
19043-esac
19044-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19045- (eval "$ac_link") 2>&5
19046+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19047+ (eval $ac_link) 2>&5
19048 ac_status=$?
19049 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19050 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
19051- { (case "(($ac_try" in
19052- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19053- *) ac_try_echo=$ac_try;;
19054-esac
19055-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19056- (eval "$ac_try") 2>&5
19057+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19058+ (eval $ac_try) 2>&5
19059 ac_status=$?
19060 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19061 (exit $ac_status); }; }; then
19062@@ -16476,21 +15787,19 @@
19063 ( exit $ac_status )
19064 rb_cv_missing__dtos18=no
19065 fi
19066-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
19067+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
19068 fi
19069-
19070-
19071 fi
19072-{ echo "$as_me:$LINENO: result: $rb_cv_missing__dtos18" >&5
19073-echo "${ECHO_T}$rb_cv_missing__dtos18" >&6; }
19074+echo "$as_me:$LINENO: result: $rb_cv_missing__dtos18" >&5
19075+echo "${ECHO_T}$rb_cv_missing__dtos18" >&6
19076 if test "$rb_cv_missing__dtos18" = yes; then
19077 cat >>confdefs.h <<\_ACEOF
19078 #define MISSING__DTOS18 1
19079 _ACEOF
19080
19081 fi
19082- { echo "$as_me:$LINENO: checking whether PD libc fconvert fail to round" >&5
19083-echo $ECHO_N "checking whether PD libc fconvert fail to round... $ECHO_C" >&6; }
19084+ echo "$as_me:$LINENO: checking whether PD libc fconvert fail to round" >&5
19085+echo $ECHO_N "checking whether PD libc fconvert fail to round... $ECHO_C" >&6
19086 if test "${rb_cv_missing_fconvert+set}" = set; then
19087 echo $ECHO_N "(cached) $ECHO_C" >&6
19088 else
19089@@ -16515,22 +15824,13 @@
19090
19091 _ACEOF
19092 rm -f conftest$ac_exeext
19093-if { (ac_try="$ac_link"
19094-case "(($ac_try" in
19095- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19096- *) ac_try_echo=$ac_try;;
19097-esac
19098-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19099- (eval "$ac_link") 2>&5
19100+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19101+ (eval $ac_link) 2>&5
19102 ac_status=$?
19103 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19104 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
19105- { (case "(($ac_try" in
19106- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19107- *) ac_try_echo=$ac_try;;
19108-esac
19109-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19110- (eval "$ac_try") 2>&5
19111+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19112+ (eval $ac_try) 2>&5
19113 ac_status=$?
19114 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19115 (exit $ac_status); }; }; then
19116@@ -16543,23 +15843,23 @@
19117 ( exit $ac_status )
19118 rb_cv_missing_fconvert=no
19119 fi
19120-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
19121+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
19122 fi
19123-
19124-
19125 fi
19126-{ echo "$as_me:$LINENO: result: $rb_cv_missing_fconvert" >&5
19127-echo "${ECHO_T}$rb_cv_missing_fconvert" >&6; }
19128+echo "$as_me:$LINENO: result: $rb_cv_missing_fconvert" >&5
19129+echo "${ECHO_T}$rb_cv_missing_fconvert" >&6
19130 if test "$rb_cv_missing_fconvert" = yes; then
19131 cat >>confdefs.h <<\_ACEOF
19132 #define MISSING_FCONVERT 1
19133 _ACEOF
19134
19135 fi
19136- case " $LIBOBJS " in
19137+ case $LIBOBJS in
19138+ "x68.o.$ac_objext" | \
19139+ *" x68.o.$ac_objext" | \
19140+ "x68.o.$ac_objext "* | \
19141 *" x68.o.$ac_objext "* ) ;;
19142- *) LIBOBJS="$LIBOBJS x68.o.$ac_objext"
19143- ;;
19144+ *) LIBOBJS="$LIBOBJS x68.o.$ac_objext" ;;
19145 esac
19146
19147 CFLAGS="$CFLAGS -fansi-only"
19148@@ -16569,10 +15869,12 @@
19149 setup=Setup.x68
19150 ;;
19151 os2-emx)
19152- case " $LIBOBJS " in
19153+ case $LIBOBJS in
19154+ "os2.$ac_objext" | \
19155+ *" os2.$ac_objext" | \
19156+ "os2.$ac_objext "* | \
19157 *" os2.$ac_objext "* ) ;;
19158- *) LIBOBJS="$LIBOBJS os2.$ac_objext"
19159- ;;
19160+ *) LIBOBJS="$LIBOBJS os2.$ac_objext" ;;
19161 esac
19162
19163 setup=Setup.emx
19164@@ -16633,11 +15935,11 @@
19165 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
19166 ENABLE_SHARED=no
19167
19168-# Check whether --enable-shared was given.
19169+# Check whether --enable-shared or --disable-shared was given.
19170 if test "${enable_shared+set}" = set; then
19171- enableval=$enable_shared; enable_shared=$enableval
19172-fi
19173-
19174+ enableval="$enable_shared"
19175+ enable_shared=$enableval
19176+fi;
19177 if test "$enable_shared" = 'yes'; then
19178 LIBRUBY='$(LIBRUBY_SO)'
19179 LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
19180@@ -16692,12 +15994,7 @@
19181 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
19182 ;;
19183 aix*)
19184- if test "$GCC" = yes; then
19185- LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
19186- else
19187- LIBRUBY_DLDFLAGS='-G -bnoentry'
19188- fi
19189- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
19190+ LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
19191 LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
19192 SOLIBS='-lm -lc'
19193 ;;
19194@@ -16715,31 +16012,27 @@
19195 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
19196 ;;
19197 interix*)
19198- LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
19199+ LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
19200 ;;
19201 *)
19202 ;;
19203 esac
19204 fi
19205 if test "$enable_rpath" = yes; then
19206- if test "$GCC" = yes; then
19207- LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
19208- else
19209- LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
19210- fi
19211+ LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
19212 fi
19213
19214-XLDFLAGS="$XLDFLAGS -L."
19215+LDFLAGS="-L. $LDFLAGS"
19216
19217
19218 RDOCTARGET=""
19219-# Check whether --enable-install-doc was given.
19220+# Check whether --enable-install-doc or --disable-install-doc was given.
19221 if test "${enable_install_doc+set}" = set; then
19222- enableval=$enable_install_doc; install_doc=$enableval
19223+ enableval="$enable_install_doc"
19224+ install_doc=$enableval
19225 else
19226 install_doc=no
19227-fi
19228-
19229+fi;
19230 if test "$install_doc" != no; then
19231 RDOCTARGET="install-doc"
19232 fi
19233@@ -16802,10 +16095,12 @@
19234 LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
19235 LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
19236 fi
19237- case " $LIBOBJS " in
19238+ case $LIBOBJS in
19239+ "strftime.$ac_objext" | \
19240+ *" strftime.$ac_objext" | \
19241+ "strftime.$ac_objext "* | \
19242 *" strftime.$ac_objext "* ) ;;
19243- *) LIBOBJS="$LIBOBJS strftime.$ac_objext"
19244- ;;
19245+ *) LIBOBJS="$LIBOBJS strftime.$ac_objext" ;;
19246 esac
19247
19248 ;;
19249@@ -16815,10 +16110,12 @@
19250 LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
19251 LIBRUBY='lib$(LIBRUBY_SO).a'
19252 fi
19253- case " $LIBOBJS " in
19254+ case $LIBOBJS in
19255+ "win32.$ac_objext" | \
19256+ *" win32.$ac_objext" | \
19257+ "win32.$ac_objext "* | \
19258 *" win32.$ac_objext "* ) ;;
19259- *) LIBOBJS="$LIBOBJS win32.$ac_objext"
19260- ;;
19261+ *) LIBOBJS="$LIBOBJS win32.$ac_objext" ;;
19262 esac
19263
19264 COMMON_LIBS=m
19265@@ -16907,13 +16204,13 @@
19266 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
19267
19268
19269-# Check whether --with-sitedir was given.
19270+# Check whether --with-sitedir or --without-sitedir was given.
19271 if test "${with_sitedir+set}" = set; then
19272- withval=$with_sitedir; sitedir=$withval
19273+ withval="$with_sitedir"
19274+ sitedir=$withval
19275 else
19276 sitedir='${prefix}/lib/ruby/site_ruby'
19277-fi
19278-
19279+fi;
19280 SITE_DIR=`eval echo \\"${sitedir}\\"`
19281 case "$target_os" in
19282 cygwin*|mingw*|*djgpp*|os2-emx*)
19283@@ -16979,11 +16276,11 @@
19284
19285
19286
19287-# Check whether --with-search-path was given.
19288+# Check whether --with-search-path or --without-search-path was given.
19289 if test "${with_search_path+set}" = set; then
19290- withval=$with_search_path; search_path=$withval
19291-fi
19292-
19293+ withval="$with_search_path"
19294+ search_path=$withval
19295+fi;
19296 if test "$search_path" != ""; then
19297 cat >>confdefs.h <<_ACEOF
19298 #define RUBY_SEARCH_PATH "$search_path"
19299@@ -16992,9 +16289,10 @@
19300 fi
19301
19302
19303-# Check whether --with-mantype was given.
19304+# Check whether --with-mantype or --without-mantype was given.
19305 if test "${with_mantype+set}" = set; then
19306- withval=$with_mantype;
19307+ withval="$with_mantype"
19308+
19309 case "$withval" in
19310 man|doc)
19311 MANTYPE=$withval
19312@@ -17006,15 +16304,14 @@
19313 ;;
19314 esac
19315
19316-fi
19317-
19318+fi;
19319 if test -z "$MANTYPE"; then
19320 for ac_prog in nroff awf
19321 do
19322 # Extract the first word of "$ac_prog", so it can be a program name with args.
19323 set dummy $ac_prog; ac_word=$2
19324-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
19325-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
19326+echo "$as_me:$LINENO: checking for $ac_word" >&5
19327+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
19328 if test "${ac_cv_path_NROFF+set}" = set; then
19329 echo $ECHO_N "(cached) $ECHO_C" >&6
19330 else
19331@@ -17030,28 +16327,27 @@
19332 IFS=$as_save_IFS
19333 test -z "$as_dir" && as_dir=.
19334 for ac_exec_ext in '' $ac_executable_extensions; do
19335- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19336+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19337 ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext"
19338 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
19339 break 2
19340 fi
19341 done
19342 done
19343-IFS=$as_save_IFS
19344
19345 ;;
19346 esac
19347 fi
19348 NROFF=$ac_cv_path_NROFF
19349+
19350 if test -n "$NROFF"; then
19351- { echo "$as_me:$LINENO: result: $NROFF" >&5
19352-echo "${ECHO_T}$NROFF" >&6; }
19353+ echo "$as_me:$LINENO: result: $NROFF" >&5
19354+echo "${ECHO_T}$NROFF" >&6
19355 else
19356- { echo "$as_me:$LINENO: result: no" >&5
19357-echo "${ECHO_T}no" >&6; }
19358+ echo "$as_me:$LINENO: result: no" >&5
19359+echo "${ECHO_T}no" >&6
19360 fi
19361
19362-
19363 test -n "$NROFF" && break
19364 done
19365 test -n "$NROFF" || NROFF="/bin/false"
19366@@ -17072,9 +16368,9 @@
19367 fi
19368 : > confdefs.h
19369
19370-ac_config_files="$ac_config_files $FIRSTMAKEFILE"
19371+ ac_config_files="$ac_config_files $FIRSTMAKEFILE"
19372
19373-ac_config_files="$ac_config_files Makefile"
19374+ ac_config_files="$ac_config_files Makefile"
19375
19376 cat >confcache <<\_ACEOF
19377 # This file is a shell script that caches the results of configure
19378@@ -17094,58 +16390,39 @@
19379
19380 # The following way of writing the cache mishandles newlines in values,
19381 # but we know of no workaround that is simple, portable, and efficient.
19382-# So, we kill variables containing newlines.
19383+# So, don't put newlines in cache variables' values.
19384 # Ultrix sh set writes to stderr and can't be redirected directly,
19385 # and sets the high bit in the cache file unless we assign to the vars.
19386-(
19387- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
19388- eval ac_val=\$$ac_var
19389- case $ac_val in #(
19390- *${as_nl}*)
19391- case $ac_var in #(
19392- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
19393-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
19394- esac
19395- case $ac_var in #(
19396- _ | IFS | as_nl) ;; #(
19397- *) $as_unset $ac_var ;;
19398- esac ;;
19399- esac
19400- done
19401-
19402+{
19403 (set) 2>&1 |
19404- case $as_nl`(ac_space=' '; set) 2>&1` in #(
19405- *${as_nl}ac_space=\ *)
19406+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
19407+ *ac_space=\ *)
19408 # `set' does not quote correctly, so add quotes (double-quote
19409 # substitution turns \\\\ into \\, and sed turns \\ into \).
19410 sed -n \
19411 "s/'/'\\\\''/g;
19412 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
19413- ;; #(
19414+ ;;
19415 *)
19416 # `set' quotes correctly as required by POSIX, so do not add quotes.
19417- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
19418+ sed -n \
19419+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
19420 ;;
19421- esac |
19422- sort
19423-) |
19424+ esac;
19425+} |
19426 sed '
19427- /^ac_cv_env_/b end
19428 t clear
19429- :clear
19430+ : clear
19431 s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
19432 t end
19433- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
19434- :end' >>confcache
19435-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
19436- if test -w "$cache_file"; then
19437- test "x$cache_file" != "x/dev/null" &&
19438- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
19439-echo "$as_me: updating cache $cache_file" >&6;}
19440+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
19441+ : end' >>confcache
19442+if diff $cache_file confcache >/dev/null 2>&1; then :; else
19443+ if test -w $cache_file; then
19444+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
19445 cat confcache >$cache_file
19446 else
19447- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
19448-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
19449+ echo "not updating unwritable cache $cache_file"
19450 fi
19451 fi
19452 rm -f confcache
19453@@ -17154,48 +16431,63 @@
19454 # Let make expand exec_prefix.
19455 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
19456
19457+# VPATH may cause trouble with some makes, so we remove $(srcdir),
19458+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
19459+# trailing colons and then remove the whole line if VPATH becomes empty
19460+# (actually we leave an empty line to preserve line numbers).
19461+if test "x$srcdir" = x.; then
19462+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
19463+s/:*\$(srcdir):*/:/;
19464+s/:*\${srcdir}:*/:/;
19465+s/:*@srcdir@:*/:/;
19466+s/^\([^=]*=[ ]*\):*/\1/;
19467+s/:*$//;
19468+s/^[^=]*=[ ]*$//;
19469+}'
19470+fi
19471+
19472 # Transform confdefs.h into DEFS.
19473 # Protect against shell expansion while executing Makefile rules.
19474 # Protect against Makefile macro expansion.
19475 #
19476 # If the first sed substitution is executed (which looks for macros that
19477-# take arguments), then branch to the quote section. Otherwise,
19478+# take arguments), then we branch to the quote section. Otherwise,
19479 # look for a macro that doesn't take arguments.
19480-ac_script='
19481+cat >confdef2opt.sed <<\_ACEOF
19482 t clear
19483-:clear
19484-s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
19485+: clear
19486+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
19487 t quote
19488-s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
19489+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
19490 t quote
19491-b any
19492-:quote
19493-s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
19494-s/\[/\\&/g
19495-s/\]/\\&/g
19496-s/\$/$$/g
19497-H
19498-:any
19499-${
19500- g
19501- s/^\n//
19502- s/\n/ /g
19503- p
19504-}
19505-'
19506-DEFS=`sed -n "$ac_script" confdefs.h`
19507+d
19508+: quote
19509+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
19510+s,\[,\\&,g
19511+s,\],\\&,g
19512+s,\$,$$,g
19513+p
19514+_ACEOF
19515+# We use echo to avoid assuming a particular line-breaking character.
19516+# The extra dot is to prevent the shell from consuming trailing
19517+# line-breaks from the sub-command output. A line-break within
19518+# single-quotes doesn't work because, if this script is created in a
19519+# platform that uses two characters for line-breaks (e.g., DOS), tr
19520+# would break.
19521+ac_LF_and_DOT=`echo; echo .`
19522+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
19523+rm -f confdef2opt.sed
19524
19525
19526 ac_libobjs=
19527 ac_ltlibobjs=
19528 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
19529 # 1. Remove the extension, and $U if already installed.
19530- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
19531- ac_i=`echo "$ac_i" | sed "$ac_script"`
19532- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
19533- # will be set to the directory where LIBOBJS objects are built.
19534- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
19535- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
19536+ ac_i=`echo "$ac_i" |
19537+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
19538+ # 2. Add them.
19539+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
19540+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
19541 done
19542 LIBOBJS=$ac_libobjs
19543
19544@@ -17226,45 +16518,17 @@
19545 ## M4sh Initialization. ##
19546 ## --------------------- ##
19547
19548-# Be more Bourne compatible
19549-DUALCASE=1; export DUALCASE # for MKS sh
19550+# Be Bourne compatible
19551 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
19552 emulate sh
19553 NULLCMD=:
19554 # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
19555 # is contrary to our usage. Disable this feature.
19556 alias -g '${1+"$@"}'='"$@"'
19557- setopt NO_GLOB_SUBST
19558-else
19559- case `(set -o) 2>/dev/null` in
19560- *posix*) set -o posix ;;
19561-esac
19562-
19563-fi
19564-
19565-
19566-
19567-
19568-# PATH needs CR
19569-# Avoid depending upon Character Ranges.
19570-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
19571-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
19572-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
19573-as_cr_digits='0123456789'
19574-as_cr_alnum=$as_cr_Letters$as_cr_digits
19575-
19576-# The user is always right.
19577-if test "${PATH_SEPARATOR+set}" != set; then
19578- echo "#! /bin/sh" >conf$$.sh
19579- echo "exit 0" >>conf$$.sh
19580- chmod +x conf$$.sh
19581- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
19582- PATH_SEPARATOR=';'
19583- else
19584- PATH_SEPARATOR=:
19585- fi
19586- rm -f conf$$.sh
19587+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
19588+ set -o posix
19589 fi
19590+DUALCASE=1; export DUALCASE # for MKS sh
19591
19592 # Support unset when possible.
19593 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
19594@@ -17274,43 +16538,8 @@
19595 fi
19596
19597
19598-# IFS
19599-# We need space, tab and new line, in precisely that order. Quoting is
19600-# there to prevent editors from complaining about space-tab.
19601-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
19602-# splitting by setting IFS to empty value.)
19603-as_nl='
19604-'
19605-IFS=" "" $as_nl"
19606-
19607-# Find who we are. Look in the path if we contain no directory separator.
19608-case $0 in
19609- *[\\/]* ) as_myself=$0 ;;
19610- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19611-for as_dir in $PATH
19612-do
19613- IFS=$as_save_IFS
19614- test -z "$as_dir" && as_dir=.
19615- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
19616-done
19617-IFS=$as_save_IFS
19618-
19619- ;;
19620-esac
19621-# We did not find ourselves, most probably we were run as `sh COMMAND'
19622-# in which case we are not to be found in the path.
19623-if test "x$as_myself" = x; then
19624- as_myself=$0
19625-fi
19626-if test ! -f "$as_myself"; then
19627- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
19628- { (exit 1); exit 1; }
19629-fi
19630-
19631 # Work around bugs in pre-3.0 UWIN ksh.
19632-for as_var in ENV MAIL MAILPATH
19633-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
19634-done
19635+$as_unset ENV MAIL MAILPATH
19636 PS1='$ '
19637 PS2='> '
19638 PS4='+ '
19639@@ -17324,19 +16553,18 @@
19640 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
19641 eval $as_var=C; export $as_var
19642 else
19643- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
19644+ $as_unset $as_var
19645 fi
19646 done
19647
19648 # Required to use basename.
19649-if expr a : '\(a\)' >/dev/null 2>&1 &&
19650- test "X`expr 00001 : '.*\(...\)'`" = X001; then
19651+if expr a : '\(a\)' >/dev/null 2>&1; then
19652 as_expr=expr
19653 else
19654 as_expr=false
19655 fi
19656
19657-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
19658+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
19659 as_basename=basename
19660 else
19661 as_basename=false
19662@@ -17344,120 +16572,159 @@
19663
19664
19665 # Name of the executable.
19666-as_me=`$as_basename -- "$0" ||
19667+as_me=`$as_basename "$0" ||
19668 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
19669 X"$0" : 'X\(//\)$' \| \
19670- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
19671+ X"$0" : 'X\(/\)$' \| \
19672+ . : '\(.\)' 2>/dev/null ||
19673 echo X/"$0" |
19674- sed '/^.*\/\([^/][^/]*\)\/*$/{
19675- s//\1/
19676- q
19677- }
19678- /^X\/\(\/\/\)$/{
19679- s//\1/
19680- q
19681- }
19682- /^X\/\(\/\).*/{
19683- s//\1/
19684- q
19685- }
19686- s/.*/./; q'`
19687+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
19688+ /^X\/\(\/\/\)$/{ s//\1/; q; }
19689+ /^X\/\(\/\).*/{ s//\1/; q; }
19690+ s/.*/./; q'`
19691
19692-# CDPATH.
19693-$as_unset CDPATH
19694+
19695+# PATH needs CR, and LINENO needs CR and PATH.
19696+# Avoid depending upon Character Ranges.
19697+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
19698+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
19699+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
19700+as_cr_digits='0123456789'
19701+as_cr_alnum=$as_cr_Letters$as_cr_digits
19702+
19703+# The user is always right.
19704+if test "${PATH_SEPARATOR+set}" != set; then
19705+ echo "#! /bin/sh" >conf$$.sh
19706+ echo "exit 0" >>conf$$.sh
19707+ chmod +x conf$$.sh
19708+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
19709+ PATH_SEPARATOR=';'
19710+ else
19711+ PATH_SEPARATOR=:
19712+ fi
19713+ rm -f conf$$.sh
19714+fi
19715
19716
19717+ as_lineno_1=$LINENO
19718+ as_lineno_2=$LINENO
19719+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
19720+ test "x$as_lineno_1" != "x$as_lineno_2" &&
19721+ test "x$as_lineno_3" = "x$as_lineno_2" || {
19722+ # Find who we are. Look in the path if we contain no path at all
19723+ # relative or not.
19724+ case $0 in
19725+ *[\\/]* ) as_myself=$0 ;;
19726+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19727+for as_dir in $PATH
19728+do
19729+ IFS=$as_save_IFS
19730+ test -z "$as_dir" && as_dir=.
19731+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
19732+done
19733
19734+ ;;
19735+ esac
19736+ # We did not find ourselves, most probably we were run as `sh COMMAND'
19737+ # in which case we are not to be found in the path.
19738+ if test "x$as_myself" = x; then
19739+ as_myself=$0
19740+ fi
19741+ if test ! -f "$as_myself"; then
19742+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
19743+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
19744+ { (exit 1); exit 1; }; }
19745+ fi
19746+ case $CONFIG_SHELL in
19747+ '')
19748+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19749+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
19750+do
19751+ IFS=$as_save_IFS
19752+ test -z "$as_dir" && as_dir=.
19753+ for as_base in sh bash ksh sh5; do
19754+ case $as_dir in
19755+ /*)
19756+ if ("$as_dir/$as_base" -c '
19757 as_lineno_1=$LINENO
19758 as_lineno_2=$LINENO
19759+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
19760 test "x$as_lineno_1" != "x$as_lineno_2" &&
19761- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
19762+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
19763+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
19764+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
19765+ CONFIG_SHELL=$as_dir/$as_base
19766+ export CONFIG_SHELL
19767+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
19768+ fi;;
19769+ esac
19770+ done
19771+done
19772+;;
19773+ esac
19774
19775 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
19776 # uniformly replaced by the line number. The first 'sed' inserts a
19777- # line-number line after each line using $LINENO; the second 'sed'
19778- # does the real work. The second script uses 'N' to pair each
19779- # line-number line with the line containing $LINENO, and appends
19780- # trailing '-' during substitution so that $LINENO is not a special
19781- # case at line end.
19782+ # line-number line before each line; the second 'sed' does the real
19783+ # work. The second script uses 'N' to pair each line-number line
19784+ # with the numbered line, and appends trailing '-' during
19785+ # substitution so that $LINENO is not a special case at line end.
19786 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
19787- # scripts with optimization help from Paolo Bonzini. Blame Lee
19788- # E. McMahon (1931-1989) for sed's syntax. :-)
19789- sed -n '
19790- p
19791- /[$]LINENO/=
19792- ' <$as_myself |
19793+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
19794+ sed '=' <$as_myself |
19795 sed '
19796- s/[$]LINENO.*/&-/
19797- t lineno
19798- b
19799- :lineno
19800 N
19801- :loop
19802- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
19803+ s,$,-,
19804+ : loop
19805+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
19806 t loop
19807- s/-\n.*//
19808+ s,-$,,
19809+ s,^['$as_cr_digits']*\n,,
19810 ' >$as_me.lineno &&
19811- chmod +x "$as_me.lineno" ||
19812- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
19813+ chmod +x $as_me.lineno ||
19814+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
19815+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
19816 { (exit 1); exit 1; }; }
19817
19818 # Don't try to exec as it changes $[0], causing all sort of problems
19819 # (the dirname of $[0] is not the place where we might find the
19820- # original and so on. Autoconf is especially sensitive to this).
19821- . "./$as_me.lineno"
19822+ # original and so on. Autoconf is especially sensible to this).
19823+ . ./$as_me.lineno
19824 # Exit status is that of the last command.
19825 exit
19826 }
19827
19828
19829-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
19830- as_dirname=dirname
19831-else
19832- as_dirname=false
19833-fi
19834-
19835-ECHO_C= ECHO_N= ECHO_T=
19836-case `echo -n x` in
19837--n*)
19838- case `echo 'x\c'` in
19839- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
19840- *) ECHO_C='\c';;
19841- esac;;
19842-*)
19843- ECHO_N='-n';;
19844+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
19845+ *c*,-n*) ECHO_N= ECHO_C='
19846+' ECHO_T=' ' ;;
19847+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
19848+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
19849 esac
19850
19851-if expr a : '\(a\)' >/dev/null 2>&1 &&
19852- test "X`expr 00001 : '.*\(...\)'`" = X001; then
19853+if expr a : '\(a\)' >/dev/null 2>&1; then
19854 as_expr=expr
19855 else
19856 as_expr=false
19857 fi
19858
19859 rm -f conf$$ conf$$.exe conf$$.file
19860-if test -d conf$$.dir; then
19861- rm -f conf$$.dir/conf$$.file
19862-else
19863- rm -f conf$$.dir
19864- mkdir conf$$.dir
19865-fi
19866 echo >conf$$.file
19867 if ln -s conf$$.file conf$$ 2>/dev/null; then
19868- as_ln_s='ln -s'
19869- # ... but there are two gotchas:
19870- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
19871- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
19872- # In both cases, we have to default to `cp -p'.
19873- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
19874+ # We could just check for DJGPP; but this test a) works b) is more generic
19875+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
19876+ if test -f conf$$.exe; then
19877+ # Don't use ln at all; we don't have any links
19878 as_ln_s='cp -p'
19879+ else
19880+ as_ln_s='ln -s'
19881+ fi
19882 elif ln conf$$.file conf$$ 2>/dev/null; then
19883 as_ln_s=ln
19884 else
19885 as_ln_s='cp -p'
19886 fi
19887-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
19888-rmdir conf$$.dir 2>/dev/null
19889+rm -f conf$$ conf$$.exe conf$$.file
19890
19891 if mkdir -p . 2>/dev/null; then
19892 as_mkdir_p=:
19893@@ -17466,28 +16733,7 @@
19894 as_mkdir_p=false
19895 fi
19896
19897-if test -x / >/dev/null 2>&1; then
19898- as_test_x='test -x'
19899-else
19900- if ls -dL / >/dev/null 2>&1; then
19901- as_ls_L_option=L
19902- else
19903- as_ls_L_option=
19904- fi
19905- as_test_x='
19906- eval sh -c '\''
19907- if test -d "$1"; then
19908- test -d "$1/.";
19909- else
19910- case $1 in
19911- -*)set "./$1";;
19912- esac;
19913- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
19914- ???[sx]*):;;*)false;;esac;fi
19915- '\'' sh
19916- '
19917-fi
19918-as_executable_p=$as_test_x
19919+as_executable_p="test -f"
19920
19921 # Sed expression to map a string onto a valid CPP name.
19922 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
19923@@ -17496,14 +16742,31 @@
19924 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
19925
19926
19927+# IFS
19928+# We need space, tab and new line, in precisely that order.
19929+as_nl='
19930+'
19931+IFS=" $as_nl"
19932+
19933+# CDPATH.
19934+$as_unset CDPATH
19935+
19936 exec 6>&1
19937
19938-# Save the log message, to keep $[0] and so on meaningful, and to
19939+# Open the log real soon, to keep \$[0] and so on meaningful, and to
19940 # report actual input values of CONFIG_FILES etc. instead of their
19941-# values after options handling.
19942-ac_log="
19943+# values after options handling. Logging --version etc. is OK.
19944+exec 5>>config.log
19945+{
19946+ echo
19947+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
19948+## Running $as_me. ##
19949+_ASBOX
19950+} >&5
19951+cat >&5 <<_CSEOF
19952+
19953 This file was extended by $as_me, which was
19954-generated by GNU Autoconf 2.61. Invocation command line was
19955+generated by GNU Autoconf 2.59. Invocation command line was
19956
19957 CONFIG_FILES = $CONFIG_FILES
19958 CONFIG_HEADERS = $CONFIG_HEADERS
19959@@ -17511,18 +16774,30 @@
19960 CONFIG_COMMANDS = $CONFIG_COMMANDS
19961 $ $0 $@
19962
19963-on `(hostname || uname -n) 2>/dev/null | sed 1q`
19964-"
19965-
19966+_CSEOF
19967+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
19968+echo >&5
19969 _ACEOF
19970
19971-cat >>$CONFIG_STATUS <<_ACEOF
19972 # Files that config.status was made for.
19973-config_files="$ac_config_files"
19974+if test -n "$ac_config_files"; then
19975+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
19976+fi
19977
19978-_ACEOF
19979+if test -n "$ac_config_headers"; then
19980+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
19981+fi
19982+
19983+if test -n "$ac_config_links"; then
19984+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
19985+fi
19986+
19987+if test -n "$ac_config_commands"; then
19988+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
19989+fi
19990
19991 cat >>$CONFIG_STATUS <<\_ACEOF
19992+
19993 ac_cs_usage="\
19994 \`$as_me' instantiates files from templates according to the
19995 current configuration.
19996@@ -17530,7 +16805,7 @@
19997 Usage: $0 [OPTIONS] [FILE]...
19998
19999 -h, --help print this help, then exit
20000- -V, --version print version number and configuration settings, then exit
20001+ -V, --version print version number, then exit
20002 -q, --quiet do not print progress messages
20003 -d, --debug don't remove temporary files
20004 --recheck update $as_me by reconfiguring in the same conditions
20005@@ -17541,21 +16816,19 @@
20006 $config_files
20007
20008 Report bugs to <bug-autoconf@gnu.org>."
20009-
20010 _ACEOF
20011+
20012 cat >>$CONFIG_STATUS <<_ACEOF
20013 ac_cs_version="\\
20014 config.status
20015-configured by $0, generated by GNU Autoconf 2.61,
20016- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
20017+configured by $0, generated by GNU Autoconf 2.59,
20018+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
20019
20020-Copyright (C) 2006 Free Software Foundation, Inc.
20021+Copyright (C) 2003 Free Software Foundation, Inc.
20022 This config.status script is free software; the Free Software Foundation
20023 gives unlimited permission to copy, distribute and modify it."
20024-
20025-ac_pwd='$ac_pwd'
20026-srcdir='$srcdir'
20027-INSTALL='$INSTALL'
20028+srcdir=$srcdir
20029+INSTALL="$INSTALL"
20030 _ACEOF
20031
20032 cat >>$CONFIG_STATUS <<\_ACEOF
20033@@ -17566,42 +16839,60 @@
20034 do
20035 case $1 in
20036 --*=*)
20037- ac_option=`expr "X$1" : 'X\([^=]*\)='`
20038- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
20039+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
20040+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
20041 ac_shift=:
20042 ;;
20043- *)
20044+ -*)
20045 ac_option=$1
20046 ac_optarg=$2
20047 ac_shift=shift
20048 ;;
20049+ *) # This is not an option, so the user has probably given explicit
20050+ # arguments.
20051+ ac_option=$1
20052+ ac_need_defaults=false;;
20053 esac
20054
20055 case $ac_option in
20056 # Handling of the options.
20057+_ACEOF
20058+cat >>$CONFIG_STATUS <<\_ACEOF
20059 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
20060 ac_cs_recheck=: ;;
20061- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
20062- echo "$ac_cs_version"; exit ;;
20063- --debug | --debu | --deb | --de | --d | -d )
20064+ --version | --vers* | -V )
20065+ echo "$ac_cs_version"; exit 0 ;;
20066+ --he | --h)
20067+ # Conflict between --help and --header
20068+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
20069+Try \`$0 --help' for more information." >&5
20070+echo "$as_me: error: ambiguous option: $1
20071+Try \`$0 --help' for more information." >&2;}
20072+ { (exit 1); exit 1; }; };;
20073+ --help | --hel | -h )
20074+ echo "$ac_cs_usage"; exit 0 ;;
20075+ --debug | --d* | -d )
20076 debug=: ;;
20077 --file | --fil | --fi | --f )
20078 $ac_shift
20079 CONFIG_FILES="$CONFIG_FILES $ac_optarg"
20080 ac_need_defaults=false;;
20081- --he | --h | --help | --hel | -h )
20082- echo "$ac_cs_usage"; exit ;;
20083+ --header | --heade | --head | --hea )
20084+ $ac_shift
20085+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
20086+ ac_need_defaults=false;;
20087 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
20088 | -silent | --silent | --silen | --sile | --sil | --si | --s)
20089 ac_cs_silent=: ;;
20090
20091 # This is an error.
20092- -*) { echo "$as_me: error: unrecognized option: $1
20093-Try \`$0 --help' for more information." >&2
20094+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
20095+Try \`$0 --help' for more information." >&5
20096+echo "$as_me: error: unrecognized option: $1
20097+Try \`$0 --help' for more information." >&2;}
20098 { (exit 1); exit 1; }; } ;;
20099
20100- *) ac_config_targets="$ac_config_targets $1"
20101- ac_need_defaults=false ;;
20102+ *) ac_config_targets="$ac_config_targets $1" ;;
20103
20104 esac
20105 shift
20106@@ -17617,48 +16908,36 @@
20107 _ACEOF
20108 cat >>$CONFIG_STATUS <<_ACEOF
20109 if \$ac_cs_recheck; then
20110- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
20111- CONFIG_SHELL=$SHELL
20112- export CONFIG_SHELL
20113- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
20114+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
20115+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
20116 fi
20117
20118 _ACEOF
20119-cat >>$CONFIG_STATUS <<\_ACEOF
20120-exec 5>>config.log
20121-{
20122- echo
20123- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
20124-## Running $as_me. ##
20125-_ASBOX
20126- echo "$ac_log"
20127-} >&5
20128
20129-_ACEOF
20130 cat >>$CONFIG_STATUS <<_ACEOF
20131 #
20132-# INIT-COMMANDS
20133+# INIT-COMMANDS section.
20134 #
20135+
20136 RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT
20137
20138 _ACEOF
20139
20140-cat >>$CONFIG_STATUS <<\_ACEOF
20141
20142-# Handling of arguments.
20143+
20144+cat >>$CONFIG_STATUS <<\_ACEOF
20145 for ac_config_target in $ac_config_targets
20146 do
20147- case $ac_config_target in
20148- "$FIRSTMAKEFILE") CONFIG_FILES="$CONFIG_FILES $FIRSTMAKEFILE" ;;
20149- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
20150-
20151+ case "$ac_config_target" in
20152+ # Handling of arguments.
20153+ "$FIRSTMAKEFILE" ) CONFIG_FILES="$CONFIG_FILES $FIRSTMAKEFILE" ;;
20154+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
20155 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
20156 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
20157 { (exit 1); exit 1; }; };;
20158 esac
20159 done
20160
20161-
20162 # If the user did not use the arguments to specify the items to instantiate,
20163 # then the envvar interface is used. Set only those that are not.
20164 # We use the long form for the default assignment because of an extremely
20165@@ -17668,494 +16947,392 @@
20166 fi
20167
20168 # Have a temporary directory for convenience. Make it in the build tree
20169-# simply because there is no reason against having it here, and in addition,
20170+# simply because there is no reason to put it here, and in addition,
20171 # creating and moving files from /tmp can sometimes cause problems.
20172-# Hook for its removal unless debugging.
20173-# Note that there is a small window in which the directory will not be cleaned:
20174-# after its creation but before its name has been assigned to `$tmp'.
20175+# Create a temporary directory, and hook for its removal unless debugging.
20176 $debug ||
20177 {
20178- tmp=
20179- trap 'exit_status=$?
20180- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
20181-' 0
20182+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
20183 trap '{ (exit 1); exit 1; }' 1 2 13 15
20184 }
20185+
20186 # Create a (secure) tmp directory for tmp files.
20187
20188 {
20189- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
20190+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
20191 test -n "$tmp" && test -d "$tmp"
20192 } ||
20193 {
20194- tmp=./conf$$-$RANDOM
20195- (umask 077 && mkdir "$tmp")
20196+ tmp=./confstat$$-$RANDOM
20197+ (umask 077 && mkdir $tmp)
20198 } ||
20199 {
20200 echo "$me: cannot create a temporary directory in ." >&2
20201 { (exit 1); exit 1; }
20202 }
20203
20204-#
20205-# Set up the sed scripts for CONFIG_FILES section.
20206-#
20207-
20208-# No need to generate the scripts if there are no CONFIG_FILES.
20209-# This happens for instance when ./config.status config.h
20210-if test -n "$CONFIG_FILES"; then
20211-
20212 _ACEOF
20213
20214-
20215-
20216-ac_delim='%!_!# '
20217-for ac_last_try in false false false false false :; do
20218- cat >conf$$subs.sed <<_ACEOF
20219-SHELL!$SHELL$ac_delim
20220-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
20221-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
20222-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
20223-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
20224-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
20225-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
20226-exec_prefix!$exec_prefix$ac_delim
20227-prefix!$prefix$ac_delim
20228-program_transform_name!$program_transform_name$ac_delim
20229-bindir!$bindir$ac_delim
20230-sbindir!$sbindir$ac_delim
20231-libexecdir!$libexecdir$ac_delim
20232-datarootdir!$datarootdir$ac_delim
20233-datadir!$datadir$ac_delim
20234-sysconfdir!$sysconfdir$ac_delim
20235-sharedstatedir!$sharedstatedir$ac_delim
20236-localstatedir!$localstatedir$ac_delim
20237-includedir!$includedir$ac_delim
20238-oldincludedir!$oldincludedir$ac_delim
20239-docdir!$docdir$ac_delim
20240-infodir!$infodir$ac_delim
20241-htmldir!$htmldir$ac_delim
20242-dvidir!$dvidir$ac_delim
20243-pdfdir!$pdfdir$ac_delim
20244-psdir!$psdir$ac_delim
20245-libdir!$libdir$ac_delim
20246-localedir!$localedir$ac_delim
20247-mandir!$mandir$ac_delim
20248-DEFS!$DEFS$ac_delim
20249-ECHO_C!$ECHO_C$ac_delim
20250-ECHO_N!$ECHO_N$ac_delim
20251-ECHO_T!$ECHO_T$ac_delim
20252-LIBS!$LIBS$ac_delim
20253-build_alias!$build_alias$ac_delim
20254-host_alias!$host_alias$ac_delim
20255-target_alias!$target_alias$ac_delim
20256-MAJOR!$MAJOR$ac_delim
20257-MINOR!$MINOR$ac_delim
20258-TEENY!$TEENY$ac_delim
20259-build!$build$ac_delim
20260-build_cpu!$build_cpu$ac_delim
20261-build_vendor!$build_vendor$ac_delim
20262-build_os!$build_os$ac_delim
20263-host!$host$ac_delim
20264-host_cpu!$host_cpu$ac_delim
20265-host_vendor!$host_vendor$ac_delim
20266-host_os!$host_os$ac_delim
20267-target!$target$ac_delim
20268-target_cpu!$target_cpu$ac_delim
20269-target_vendor!$target_vendor$ac_delim
20270-target_os!$target_os$ac_delim
20271-CC!$CC$ac_delim
20272-CFLAGS!$CFLAGS$ac_delim
20273-LDFLAGS!$LDFLAGS$ac_delim
20274-CPPFLAGS!$CPPFLAGS$ac_delim
20275-ac_ct_CC!$ac_ct_CC$ac_delim
20276-EXEEXT!$EXEEXT$ac_delim
20277-OBJEXT!$OBJEXT$ac_delim
20278-CPP!$CPP$ac_delim
20279-GREP!$GREP$ac_delim
20280-EGREP!$EGREP$ac_delim
20281-GNU_LD!$GNU_LD$ac_delim
20282-CPPOUTFILE!$CPPOUTFILE$ac_delim
20283-OUTFLAG!$OUTFLAG$ac_delim
20284-YACC!$YACC$ac_delim
20285-YFLAGS!$YFLAGS$ac_delim
20286-RANLIB!$RANLIB$ac_delim
20287-AR!$AR$ac_delim
20288-AS!$AS$ac_delim
20289-ASFLAGS!$ASFLAGS$ac_delim
20290-NM!$NM$ac_delim
20291-WINDRES!$WINDRES$ac_delim
20292-DLLWRAP!$DLLWRAP$ac_delim
20293-OBJDUMP!$OBJDUMP$ac_delim
20294-LN_S!$LN_S$ac_delim
20295-SET_MAKE!$SET_MAKE$ac_delim
20296-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
20297-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
20298-INSTALL_DATA!$INSTALL_DATA$ac_delim
20299-RM!$RM$ac_delim
20300-CP!$CP$ac_delim
20301-MAKEDIRS!$MAKEDIRS$ac_delim
20302-LIBOBJS!$LIBOBJS$ac_delim
20303-ALLOCA!$ALLOCA$ac_delim
20304-DLDFLAGS!$DLDFLAGS$ac_delim
20305-ARCH_FLAG!$ARCH_FLAG$ac_delim
20306-STATIC!$STATIC$ac_delim
20307-CCDLFLAGS!$CCDLFLAGS$ac_delim
20308-LDSHARED!$LDSHARED$ac_delim
20309-DLEXT!$DLEXT$ac_delim
20310-DLEXT2!$DLEXT2$ac_delim
20311-LIBEXT!$LIBEXT$ac_delim
20312-LINK_SO!$LINK_SO$ac_delim
20313-LIBPATHFLAG!$LIBPATHFLAG$ac_delim
20314-RPATHFLAG!$RPATHFLAG$ac_delim
20315-LIBPATHENV!$LIBPATHENV$ac_delim
20316-_ACEOF
20317-
20318- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
20319- break
20320- elif $ac_last_try; then
20321- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
20322-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
20323- { (exit 1); exit 1; }; }
20324- else
20325- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
20326- fi
20327-done
20328-
20329-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
20330-if test -n "$ac_eof"; then
20331- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
20332- ac_eof=`expr $ac_eof + 1`
20333-fi
20334-
20335 cat >>$CONFIG_STATUS <<_ACEOF
20336-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
20337-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
20338-_ACEOF
20339-sed '
20340-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
20341-s/^/s,@/; s/!/@,|#_!!_#|/
20342-:n
20343-t n
20344-s/'"$ac_delim"'$/,g/; t
20345-s/$/\\/; p
20346-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
20347-' >>$CONFIG_STATUS <conf$$subs.sed
20348-rm -f conf$$subs.sed
20349-cat >>$CONFIG_STATUS <<_ACEOF
20350-CEOF$ac_eof
20351-_ACEOF
20352-
20353
20354-ac_delim='%!_!# '
20355-for ac_last_try in false false false false false :; do
20356- cat >conf$$subs.sed <<_ACEOF
20357-TRY_LINK!$TRY_LINK$ac_delim
20358-STRIP!$STRIP$ac_delim
20359-EXTSTATIC!$EXTSTATIC$ac_delim
20360-setup!$setup$ac_delim
20361-MINIRUBY!$MINIRUBY$ac_delim
20362-PREP!$PREP$ac_delim
20363-RUNRUBY!$RUNRUBY$ac_delim
20364-EXTOUT!$EXTOUT$ac_delim
20365-ARCHFILE!$ARCHFILE$ac_delim
20366-RDOCTARGET!$RDOCTARGET$ac_delim
20367-XCFLAGS!$XCFLAGS$ac_delim
20368-XLDFLAGS!$XLDFLAGS$ac_delim
20369-LIBRUBY_LDSHARED!$LIBRUBY_LDSHARED$ac_delim
20370-LIBRUBY_DLDFLAGS!$LIBRUBY_DLDFLAGS$ac_delim
20371-RUBY_INSTALL_NAME!$RUBY_INSTALL_NAME$ac_delim
20372-rubyw_install_name!$rubyw_install_name$ac_delim
20373-RUBYW_INSTALL_NAME!$RUBYW_INSTALL_NAME$ac_delim
20374-RUBY_SO_NAME!$RUBY_SO_NAME$ac_delim
20375-LIBRUBY_A!$LIBRUBY_A$ac_delim
20376-LIBRUBY_SO!$LIBRUBY_SO$ac_delim
20377-LIBRUBY_ALIASES!$LIBRUBY_ALIASES$ac_delim
20378-LIBRUBY!$LIBRUBY$ac_delim
20379-LIBRUBYARG!$LIBRUBYARG$ac_delim
20380-LIBRUBYARG_STATIC!$LIBRUBYARG_STATIC$ac_delim
20381-LIBRUBYARG_SHARED!$LIBRUBYARG_SHARED$ac_delim
20382-SOLIBS!$SOLIBS$ac_delim
20383-DLDLIBS!$DLDLIBS$ac_delim
20384-ENABLE_SHARED!$ENABLE_SHARED$ac_delim
20385-MAINLIBS!$MAINLIBS$ac_delim
20386-COMMON_LIBS!$COMMON_LIBS$ac_delim
20387-COMMON_MACROS!$COMMON_MACROS$ac_delim
20388-COMMON_HEADERS!$COMMON_HEADERS$ac_delim
20389-EXPORT_PREFIX!$EXPORT_PREFIX$ac_delim
20390-MINIOBJS!$MINIOBJS$ac_delim
20391-MAKEFILES!$MAKEFILES$ac_delim
20392-arch!$arch$ac_delim
20393-sitearch!$sitearch$ac_delim
20394-sitedir!$sitedir$ac_delim
20395-configure_args!$configure_args$ac_delim
20396-NROFF!$NROFF$ac_delim
20397-MANTYPE!$MANTYPE$ac_delim
20398-LTLIBOBJS!$LTLIBOBJS$ac_delim
20399-_ACEOF
20400+#
20401+# CONFIG_FILES section.
20402+#
20403
20404- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
20405- break
20406- elif $ac_last_try; then
20407- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
20408-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
20409- { (exit 1); exit 1; }; }
20410- else
20411- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
20412+# No need to generate the scripts if there are no CONFIG_FILES.
20413+# This happens for instance when ./config.status config.h
20414+if test -n "\$CONFIG_FILES"; then
20415+ # Protect against being on the right side of a sed subst in config.status.
20416+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
20417+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
20418+s,@SHELL@,$SHELL,;t t
20419+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
20420+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
20421+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
20422+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
20423+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
20424+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
20425+s,@exec_prefix@,$exec_prefix,;t t
20426+s,@prefix@,$prefix,;t t
20427+s,@program_transform_name@,$program_transform_name,;t t
20428+s,@bindir@,$bindir,;t t
20429+s,@sbindir@,$sbindir,;t t
20430+s,@libexecdir@,$libexecdir,;t t
20431+s,@datadir@,$datadir,;t t
20432+s,@sysconfdir@,$sysconfdir,;t t
20433+s,@sharedstatedir@,$sharedstatedir,;t t
20434+s,@localstatedir@,$localstatedir,;t t
20435+s,@libdir@,$libdir,;t t
20436+s,@includedir@,$includedir,;t t
20437+s,@oldincludedir@,$oldincludedir,;t t
20438+s,@infodir@,$infodir,;t t
20439+s,@mandir@,$mandir,;t t
20440+s,@build_alias@,$build_alias,;t t
20441+s,@host_alias@,$host_alias,;t t
20442+s,@target_alias@,$target_alias,;t t
20443+s,@DEFS@,$DEFS,;t t
20444+s,@ECHO_C@,$ECHO_C,;t t
20445+s,@ECHO_N@,$ECHO_N,;t t
20446+s,@ECHO_T@,$ECHO_T,;t t
20447+s,@LIBS@,$LIBS,;t t
20448+s,@MAJOR@,$MAJOR,;t t
20449+s,@MINOR@,$MINOR,;t t
20450+s,@TEENY@,$TEENY,;t t
20451+s,@build@,$build,;t t
20452+s,@build_cpu@,$build_cpu,;t t
20453+s,@build_vendor@,$build_vendor,;t t
20454+s,@build_os@,$build_os,;t t
20455+s,@host@,$host,;t t
20456+s,@host_cpu@,$host_cpu,;t t
20457+s,@host_vendor@,$host_vendor,;t t
20458+s,@host_os@,$host_os,;t t
20459+s,@target@,$target,;t t
20460+s,@target_cpu@,$target_cpu,;t t
20461+s,@target_vendor@,$target_vendor,;t t
20462+s,@target_os@,$target_os,;t t
20463+s,@CC@,$CC,;t t
20464+s,@ac_ct_CC@,$ac_ct_CC,;t t
20465+s,@CFLAGS@,$CFLAGS,;t t
20466+s,@LDFLAGS@,$LDFLAGS,;t t
20467+s,@CPPFLAGS@,$CPPFLAGS,;t t
20468+s,@EXEEXT@,$EXEEXT,;t t
20469+s,@OBJEXT@,$OBJEXT,;t t
20470+s,@CPP@,$CPP,;t t
20471+s,@EGREP@,$EGREP,;t t
20472+s,@GNU_LD@,$GNU_LD,;t t
20473+s,@CPPOUTFILE@,$CPPOUTFILE,;t t
20474+s,@OUTFLAG@,$OUTFLAG,;t t
20475+s,@YACC@,$YACC,;t t
20476+s,@RANLIB@,$RANLIB,;t t
20477+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
20478+s,@AR@,$AR,;t t
20479+s,@ac_ct_AR@,$ac_ct_AR,;t t
20480+s,@AS@,$AS,;t t
20481+s,@ac_ct_AS@,$ac_ct_AS,;t t
20482+s,@ASFLAGS@,$ASFLAGS,;t t
20483+s,@NM@,$NM,;t t
20484+s,@ac_ct_NM@,$ac_ct_NM,;t t
20485+s,@WINDRES@,$WINDRES,;t t
20486+s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
20487+s,@DLLWRAP@,$DLLWRAP,;t t
20488+s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t
20489+s,@OBJDUMP@,$OBJDUMP,;t t
20490+s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
20491+s,@LN_S@,$LN_S,;t t
20492+s,@SET_MAKE@,$SET_MAKE,;t t
20493+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
20494+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
20495+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
20496+s,@RM@,$RM,;t t
20497+s,@CP@,$CP,;t t
20498+s,@MAKEDIRS@,$MAKEDIRS,;t t
20499+s,@LIBOBJS@,$LIBOBJS,;t t
20500+s,@ALLOCA@,$ALLOCA,;t t
20501+s,@DLDFLAGS@,$DLDFLAGS,;t t
20502+s,@ARCH_FLAG@,$ARCH_FLAG,;t t
20503+s,@STATIC@,$STATIC,;t t
20504+s,@CCDLFLAGS@,$CCDLFLAGS,;t t
20505+s,@LDSHARED@,$LDSHARED,;t t
20506+s,@DLEXT@,$DLEXT,;t t
20507+s,@DLEXT2@,$DLEXT2,;t t
20508+s,@LIBEXT@,$LIBEXT,;t t
20509+s,@LINK_SO@,$LINK_SO,;t t
20510+s,@LIBPATHFLAG@,$LIBPATHFLAG,;t t
20511+s,@RPATHFLAG@,$RPATHFLAG,;t t
20512+s,@LIBPATHENV@,$LIBPATHENV,;t t
20513+s,@TRY_LINK@,$TRY_LINK,;t t
20514+s,@STRIP@,$STRIP,;t t
20515+s,@EXTSTATIC@,$EXTSTATIC,;t t
20516+s,@setup@,$setup,;t t
20517+s,@MINIRUBY@,$MINIRUBY,;t t
20518+s,@PREP@,$PREP,;t t
20519+s,@RUNRUBY@,$RUNRUBY,;t t
20520+s,@EXTOUT@,$EXTOUT,;t t
20521+s,@ARCHFILE@,$ARCHFILE,;t t
20522+s,@RDOCTARGET@,$RDOCTARGET,;t t
20523+s,@XCFLAGS@,$XCFLAGS,;t t
20524+s,@XLDFLAGS@,$XLDFLAGS,;t t
20525+s,@LIBRUBY_LDSHARED@,$LIBRUBY_LDSHARED,;t t
20526+s,@LIBRUBY_DLDFLAGS@,$LIBRUBY_DLDFLAGS,;t t
20527+s,@RUBY_INSTALL_NAME@,$RUBY_INSTALL_NAME,;t t
20528+s,@rubyw_install_name@,$rubyw_install_name,;t t
20529+s,@RUBYW_INSTALL_NAME@,$RUBYW_INSTALL_NAME,;t t
20530+s,@RUBY_SO_NAME@,$RUBY_SO_NAME,;t t
20531+s,@LIBRUBY_A@,$LIBRUBY_A,;t t
20532+s,@LIBRUBY_SO@,$LIBRUBY_SO,;t t
20533+s,@LIBRUBY_ALIASES@,$LIBRUBY_ALIASES,;t t
20534+s,@LIBRUBY@,$LIBRUBY,;t t
20535+s,@LIBRUBYARG@,$LIBRUBYARG,;t t
20536+s,@LIBRUBYARG_STATIC@,$LIBRUBYARG_STATIC,;t t
20537+s,@LIBRUBYARG_SHARED@,$LIBRUBYARG_SHARED,;t t
20538+s,@SOLIBS@,$SOLIBS,;t t
20539+s,@DLDLIBS@,$DLDLIBS,;t t
20540+s,@ENABLE_SHARED@,$ENABLE_SHARED,;t t
20541+s,@MAINLIBS@,$MAINLIBS,;t t
20542+s,@COMMON_LIBS@,$COMMON_LIBS,;t t
20543+s,@COMMON_MACROS@,$COMMON_MACROS,;t t
20544+s,@COMMON_HEADERS@,$COMMON_HEADERS,;t t
20545+s,@EXPORT_PREFIX@,$EXPORT_PREFIX,;t t
20546+s,@MINIOBJS@,$MINIOBJS,;t t
20547+s,@MAKEFILES@,$MAKEFILES,;t t
20548+s,@arch@,$arch,;t t
20549+s,@sitearch@,$sitearch,;t t
20550+s,@sitedir@,$sitedir,;t t
20551+s,@configure_args@,$configure_args,;t t
20552+s,@NROFF@,$NROFF,;t t
20553+s,@MANTYPE@,$MANTYPE,;t t
20554+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
20555+CEOF
20556+
20557+_ACEOF
20558+
20559+ cat >>$CONFIG_STATUS <<\_ACEOF
20560+ # Split the substitutions into bite-sized pieces for seds with
20561+ # small command number limits, like on Digital OSF/1 and HP-UX.
20562+ ac_max_sed_lines=48
20563+ ac_sed_frag=1 # Number of current file.
20564+ ac_beg=1 # First line for current file.
20565+ ac_end=$ac_max_sed_lines # Line after last line for current file.
20566+ ac_more_lines=:
20567+ ac_sed_cmds=
20568+ while $ac_more_lines; do
20569+ if test $ac_beg -gt 1; then
20570+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
20571+ else
20572+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
20573+ fi
20574+ if test ! -s $tmp/subs.frag; then
20575+ ac_more_lines=false
20576+ else
20577+ # The purpose of the label and of the branching condition is to
20578+ # speed up the sed processing (if there are no `@' at all, there
20579+ # is no need to browse any of the substitutions).
20580+ # These are the two extra sed commands mentioned above.
20581+ (echo ':t
20582+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
20583+ if test -z "$ac_sed_cmds"; then
20584+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
20585+ else
20586+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
20587+ fi
20588+ ac_sed_frag=`expr $ac_sed_frag + 1`
20589+ ac_beg=$ac_end
20590+ ac_end=`expr $ac_end + $ac_max_sed_lines`
20591+ fi
20592+ done
20593+ if test -z "$ac_sed_cmds"; then
20594+ ac_sed_cmds=cat
20595 fi
20596-done
20597-
20598-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
20599-if test -n "$ac_eof"; then
20600- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
20601- ac_eof=`expr $ac_eof + 1`
20602-fi
20603+fi # test -n "$CONFIG_FILES"
20604
20605-cat >>$CONFIG_STATUS <<_ACEOF
20606-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
20607-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
20608 _ACEOF
20609-sed '
20610-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
20611-s/^/s,@/; s/!/@,|#_!!_#|/
20612-:n
20613-t n
20614-s/'"$ac_delim"'$/,g/; t
20615-s/$/\\/; p
20616-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
20617-' >>$CONFIG_STATUS <conf$$subs.sed
20618-rm -f conf$$subs.sed
20619-cat >>$CONFIG_STATUS <<_ACEOF
20620-:end
20621-s/|#_!!_#|//g
20622-CEOF$ac_eof
20623-_ACEOF
20624-
20625-
20626-# VPATH may cause trouble with some makes, so we remove $(srcdir),
20627-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
20628-# trailing colons and then remove the whole line if VPATH becomes empty
20629-# (actually we leave an empty line to preserve line numbers).
20630-if test "x$srcdir" = x.; then
20631- ac_vpsub='/^[ ]*VPATH[ ]*=/{
20632-s/:*\$(srcdir):*/:/
20633-s/:*\${srcdir}:*/:/
20634-s/:*@srcdir@:*/:/
20635-s/^\([^=]*=[ ]*\):*/\1/
20636-s/:*$//
20637-s/^[^=]*=[ ]*$//
20638-}'
20639-fi
20640-
20641 cat >>$CONFIG_STATUS <<\_ACEOF
20642-fi # test -n "$CONFIG_FILES"
20643-
20644-
20645-for ac_tag in :F $CONFIG_FILES
20646-do
20647- case $ac_tag in
20648- :[FHLC]) ac_mode=$ac_tag; continue;;
20649- esac
20650- case $ac_mode$ac_tag in
20651- :[FHL]*:*);;
20652- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
20653-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
20654- { (exit 1); exit 1; }; };;
20655- :[FH]-) ac_tag=-:-;;
20656- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
20657- esac
20658- ac_save_IFS=$IFS
20659- IFS=:
20660- set x $ac_tag
20661- IFS=$ac_save_IFS
20662- shift
20663- ac_file=$1
20664- shift
20665-
20666- case $ac_mode in
20667- :L) ac_source=$1;;
20668- :[FH])
20669- ac_file_inputs=
20670- for ac_f
20671- do
20672- case $ac_f in
20673- -) ac_f="$tmp/stdin";;
20674- *) # Look for the file first in the build tree, then in the source tree
20675- # (if the path is not absolute). The absolute path cannot be DOS-style,
20676- # because $ac_f cannot contain `:'.
20677- test -f "$ac_f" ||
20678- case $ac_f in
20679- [\\/$]*) false;;
20680- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
20681- esac ||
20682- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
20683-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
20684- { (exit 1); exit 1; }; };;
20685- esac
20686- ac_file_inputs="$ac_file_inputs $ac_f"
20687- done
20688-
20689- # Let's still pretend it is `configure' which instantiates (i.e., don't
20690- # use $as_me), people would be surprised to read:
20691- # /* config.h. Generated by config.status. */
20692- configure_input="Generated from "`IFS=:
20693- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
20694- if test x"$ac_file" != x-; then
20695- configure_input="$ac_file. $configure_input"
20696- { echo "$as_me:$LINENO: creating $ac_file" >&5
20697-echo "$as_me: creating $ac_file" >&6;}
20698- fi
20699-
20700- case $ac_tag in
20701- *:-:* | *:-) cat >"$tmp/stdin";;
20702- esac
20703- ;;
20704+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
20705+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
20706+ case $ac_file in
20707+ - | *:- | *:-:* ) # input from stdin
20708+ cat >$tmp/stdin
20709+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
20710+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
20711+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
20712+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
20713+ * ) ac_file_in=$ac_file.in ;;
20714 esac
20715
20716- ac_dir=`$as_dirname -- "$ac_file" ||
20717+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
20718+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
20719 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20720 X"$ac_file" : 'X\(//\)[^/]' \| \
20721 X"$ac_file" : 'X\(//\)$' \| \
20722- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
20723+ X"$ac_file" : 'X\(/\)' \| \
20724+ . : '\(.\)' 2>/dev/null ||
20725 echo X"$ac_file" |
20726- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20727- s//\1/
20728- q
20729- }
20730- /^X\(\/\/\)[^/].*/{
20731- s//\1/
20732- q
20733- }
20734- /^X\(\/\/\)$/{
20735- s//\1/
20736- q
20737- }
20738- /^X\(\/\).*/{
20739- s//\1/
20740- q
20741- }
20742- s/.*/./; q'`
20743- { as_dir="$ac_dir"
20744- case $as_dir in #(
20745- -*) as_dir=./$as_dir;;
20746- esac
20747- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
20748+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
20749+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
20750+ /^X\(\/\/\)$/{ s//\1/; q; }
20751+ /^X\(\/\).*/{ s//\1/; q; }
20752+ s/.*/./; q'`
20753+ { if $as_mkdir_p; then
20754+ mkdir -p "$ac_dir"
20755+ else
20756+ as_dir="$ac_dir"
20757 as_dirs=
20758- while :; do
20759- case $as_dir in #(
20760- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
20761- *) as_qdir=$as_dir;;
20762- esac
20763- as_dirs="'$as_qdir' $as_dirs"
20764- as_dir=`$as_dirname -- "$as_dir" ||
20765+ while test ! -d "$as_dir"; do
20766+ as_dirs="$as_dir $as_dirs"
20767+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
20768 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20769 X"$as_dir" : 'X\(//\)[^/]' \| \
20770 X"$as_dir" : 'X\(//\)$' \| \
20771- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
20772+ X"$as_dir" : 'X\(/\)' \| \
20773+ . : '\(.\)' 2>/dev/null ||
20774 echo X"$as_dir" |
20775- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20776- s//\1/
20777- q
20778- }
20779- /^X\(\/\/\)[^/].*/{
20780- s//\1/
20781- q
20782- }
20783- /^X\(\/\/\)$/{
20784- s//\1/
20785- q
20786- }
20787- /^X\(\/\).*/{
20788- s//\1/
20789- q
20790- }
20791- s/.*/./; q'`
20792- test -d "$as_dir" && break
20793+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
20794+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
20795+ /^X\(\/\/\)$/{ s//\1/; q; }
20796+ /^X\(\/\).*/{ s//\1/; q; }
20797+ s/.*/./; q'`
20798 done
20799- test -z "$as_dirs" || eval "mkdir $as_dirs"
20800- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
20801-echo "$as_me: error: cannot create directory $as_dir" >&2;}
20802+ test ! -n "$as_dirs" || mkdir $as_dirs
20803+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
20804+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
20805 { (exit 1); exit 1; }; }; }
20806+
20807 ac_builddir=.
20808
20809-case "$ac_dir" in
20810-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
20811-*)
20812+if test "$ac_dir" != .; then
20813 ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
20814- # A ".." for each directory in $ac_dir_suffix.
20815- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
20816- case $ac_top_builddir_sub in
20817- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
20818- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
20819- esac ;;
20820-esac
20821-ac_abs_top_builddir=$ac_pwd
20822-ac_abs_builddir=$ac_pwd$ac_dir_suffix
20823-# for backward compatibility:
20824-ac_top_builddir=$ac_top_build_prefix
20825+ # A "../" for each directory in $ac_dir_suffix.
20826+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
20827+else
20828+ ac_dir_suffix= ac_top_builddir=
20829+fi
20830
20831 case $srcdir in
20832- .) # We are building in place.
20833+ .) # No --srcdir option. We are building in place.
20834 ac_srcdir=.
20835- ac_top_srcdir=$ac_top_builddir_sub
20836- ac_abs_top_srcdir=$ac_pwd ;;
20837- [\\/]* | ?:[\\/]* ) # Absolute name.
20838+ if test -z "$ac_top_builddir"; then
20839+ ac_top_srcdir=.
20840+ else
20841+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
20842+ fi ;;
20843+ [\\/]* | ?:[\\/]* ) # Absolute path.
20844 ac_srcdir=$srcdir$ac_dir_suffix;
20845- ac_top_srcdir=$srcdir
20846- ac_abs_top_srcdir=$srcdir ;;
20847- *) # Relative name.
20848- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
20849- ac_top_srcdir=$ac_top_build_prefix$srcdir
20850- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
20851+ ac_top_srcdir=$srcdir ;;
20852+ *) # Relative path.
20853+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
20854+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
20855 esac
20856-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
20857
20858+# Do not use `cd foo && pwd` to compute absolute paths, because
20859+# the directories may not exist.
20860+case `pwd` in
20861+.) ac_abs_builddir="$ac_dir";;
20862+*)
20863+ case "$ac_dir" in
20864+ .) ac_abs_builddir=`pwd`;;
20865+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
20866+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
20867+ esac;;
20868+esac
20869+case $ac_abs_builddir in
20870+.) ac_abs_top_builddir=${ac_top_builddir}.;;
20871+*)
20872+ case ${ac_top_builddir}. in
20873+ .) ac_abs_top_builddir=$ac_abs_builddir;;
20874+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
20875+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
20876+ esac;;
20877+esac
20878+case $ac_abs_builddir in
20879+.) ac_abs_srcdir=$ac_srcdir;;
20880+*)
20881+ case $ac_srcdir in
20882+ .) ac_abs_srcdir=$ac_abs_builddir;;
20883+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
20884+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
20885+ esac;;
20886+esac
20887+case $ac_abs_builddir in
20888+.) ac_abs_top_srcdir=$ac_top_srcdir;;
20889+*)
20890+ case $ac_top_srcdir in
20891+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
20892+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
20893+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
20894+ esac;;
20895+esac
20896
20897- case $ac_mode in
20898- :F)
20899- #
20900- # CONFIG_FILE
20901- #
20902
20903 case $INSTALL in
20904 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
20905- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
20906+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
20907 esac
20908-_ACEOF
20909
20910-cat >>$CONFIG_STATUS <<\_ACEOF
20911-# If the template does not know about datarootdir, expand it.
20912-# FIXME: This hack should be removed a few years after 2.60.
20913-ac_datarootdir_hack=; ac_datarootdir_seen=
20914-
20915-case `sed -n '/datarootdir/ {
20916- p
20917- q
20918-}
20919-/@datadir@/p
20920-/@docdir@/p
20921-/@infodir@/p
20922-/@localedir@/p
20923-/@mandir@/p
20924-' $ac_file_inputs` in
20925-*datarootdir*) ac_datarootdir_seen=yes;;
20926-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
20927- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
20928-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
20929-_ACEOF
20930-cat >>$CONFIG_STATUS <<_ACEOF
20931- ac_datarootdir_hack='
20932- s&@datadir@&$datadir&g
20933- s&@docdir@&$docdir&g
20934- s&@infodir@&$infodir&g
20935- s&@localedir@&$localedir&g
20936- s&@mandir@&$mandir&g
20937- s&\\\${datarootdir}&$datarootdir&g' ;;
20938-esac
20939-_ACEOF
20940+ # Let's still pretend it is `configure' which instantiates (i.e., don't
20941+ # use $as_me), people would be surprised to read:
20942+ # /* config.h. Generated by config.status. */
20943+ if test x"$ac_file" = x-; then
20944+ configure_input=
20945+ else
20946+ configure_input="$ac_file. "
20947+ fi
20948+ configure_input=$configure_input"Generated from `echo $ac_file_in |
20949+ sed 's,.*/,,'` by configure."
20950+
20951+ # First look for the input files in the build tree, otherwise in the
20952+ # src tree.
20953+ ac_file_inputs=`IFS=:
20954+ for f in $ac_file_in; do
20955+ case $f in
20956+ -) echo $tmp/stdin ;;
20957+ [\\/$]*)
20958+ # Absolute (can't be DOS-style, as IFS=:)
20959+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
20960+echo "$as_me: error: cannot find input file: $f" >&2;}
20961+ { (exit 1); exit 1; }; }
20962+ echo "$f";;
20963+ *) # Relative
20964+ if test -f "$f"; then
20965+ # Build tree
20966+ echo "$f"
20967+ elif test -f "$srcdir/$f"; then
20968+ # Source tree
20969+ echo "$srcdir/$f"
20970+ else
20971+ # /dev/null tree
20972+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
20973+echo "$as_me: error: cannot find input file: $f" >&2;}
20974+ { (exit 1); exit 1; }; }
20975+ fi;;
20976+ esac
20977+ done` || { (exit 1); exit 1; }
20978
20979-# Neutralize VPATH when `$srcdir' = `.'.
20980-# Shell code in configure.ac might set extrasub.
20981-# FIXME: do we really want to maintain this feature?
20982+ if test x"$ac_file" != x-; then
20983+ { echo "$as_me:$LINENO: creating $ac_file" >&5
20984+echo "$as_me: creating $ac_file" >&6;}
20985+ rm -f "$ac_file"
20986+ fi
20987+_ACEOF
20988 cat >>$CONFIG_STATUS <<_ACEOF
20989 sed "$ac_vpsub
20990 $extrasub
20991@@ -18163,49 +17340,38 @@
20992 cat >>$CONFIG_STATUS <<\_ACEOF
20993 :t
20994 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
20995-s&@configure_input@&$configure_input&;t t
20996-s&@top_builddir@&$ac_top_builddir_sub&;t t
20997-s&@srcdir@&$ac_srcdir&;t t
20998-s&@abs_srcdir@&$ac_abs_srcdir&;t t
20999-s&@top_srcdir@&$ac_top_srcdir&;t t
21000-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
21001-s&@builddir@&$ac_builddir&;t t
21002-s&@abs_builddir@&$ac_abs_builddir&;t t
21003-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
21004-s&@INSTALL@&$ac_INSTALL&;t t
21005-$ac_datarootdir_hack
21006-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
21007-
21008-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
21009- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
21010- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
21011- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21012-which seems to be undefined. Please make sure it is defined." >&5
21013-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21014-which seems to be undefined. Please make sure it is defined." >&2;}
21015+s,@configure_input@,$configure_input,;t t
21016+s,@srcdir@,$ac_srcdir,;t t
21017+s,@abs_srcdir@,$ac_abs_srcdir,;t t
21018+s,@top_srcdir@,$ac_top_srcdir,;t t
21019+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
21020+s,@builddir@,$ac_builddir,;t t
21021+s,@abs_builddir@,$ac_abs_builddir,;t t
21022+s,@top_builddir@,$ac_top_builddir,;t t
21023+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
21024+s,@INSTALL@,$ac_INSTALL,;t t
21025+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
21026+ rm -f $tmp/stdin
21027+ if test x"$ac_file" != x-; then
21028+ mv $tmp/out $ac_file
21029+ else
21030+ cat $tmp/out
21031+ rm -f $tmp/out
21032+ fi
21033
21034- rm -f "$tmp/stdin"
21035+ # Run the commands associated with the file.
21036 case $ac_file in
21037- -) cat "$tmp/out"; rm -f "$tmp/out";;
21038- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
21039- esac
21040- ;;
21041-
21042-
21043-
21044- esac
21045-
21046-
21047- case $ac_file$ac_mode in
21048- "Makefile":F) {
21049+ Makefile ) {
21050+ sed '/^MISSING/s/\$U\././g' Makefile
21051 echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
21052 test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
21053 sed 's/{\$([^(){}]*)[^{}]*}//g' ${srcdir}/common.mk
21054-} >> Makefile ;;
21055-
21056+ } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile ;;
21057 esac
21058-done # for ac_tag
21059+done
21060+_ACEOF
21061
21062+cat >>$CONFIG_STATUS <<\_ACEOF
21063
21064 { (exit 0); exit 0; }
21065 _ACEOF
21066diff -ur ruby-1.8.6/configure.in ruby/configure.in
21067--- ruby-1.8.6/configure.in 2007-02-28 06:23:42.000000000 -0700
21068+++ ruby/configure.in 2007-04-20 01:04:35.000000000 -0600
21069@@ -149,6 +149,11 @@
21070 fi
21071 AC_PROG_CC
21072 AC_PROG_GCC_TRADITIONAL
21073+if test "$GCC" = yes; then
21074+ linker_flag=-Wl,
21075+else
21076+ linker_flag=
21077+fi
21078
21079 RUBY_PROG_GNU_LD
21080 RUBY_CPPOUTFILE
21081@@ -959,7 +964,7 @@
21082 AC_SUBST(LIBEXT)dnl
21083
21084 STATIC=
21085-: ${LIBPATHFLAG=' -L"%s"'}
21086+: ${LIBPATHFLAG=' -L%s'}
21087 : ${PATHFLAG=''}
21088
21089 if test "$with_dln_a_out" != yes; then
21090@@ -1023,7 +1028,7 @@
21091 rb_cv_dlopen=yes ;;
21092 interix*) : ${LDSHARED="$CC -shared"}
21093 XLDFLAGS="$XLDFLAGS -Wl,-E"
21094- LIBPATHFLAG=" -L'%1\$-s'"
21095+ LIBPATHFLAG=" -L%1\$-s"
21096 rb_cv_dlopen=yes ;;
21097 freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
21098 if test "$rb_cv_binary_elf" = yes; then
21099@@ -1053,15 +1058,12 @@
21100 rb_cv_dlopen=yes ;;
21101 aix*) if test "$GCC" = yes; then
21102 : ${LDSHARED='$(CC) -shared'}
21103- DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
21104- LDFLAGS='-Wl,-brtl'
21105- XLDFLAGS='-Wl,-bE:ruby.imp'
21106 else
21107 : ${LDSHARED='/usr/ccs/bin/ld'}
21108- DLDFLAGS='-G -eInit_$(TARGET)'
21109- LDFLAGS='-brtl'
21110- XLDFLAGS='-bE:ruby.imp'
21111- fi
21112+ fi
21113+ DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
21114+ LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
21115+ XLDFLAGS="${linker_flag}-bE:ruby.imp"
21116 : ${ARCHFILE="ruby.imp"}
21117 TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
21118 TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
21119@@ -1106,12 +1108,8 @@
21120 [ --disable-rpath embed run path into extension libraries.],
21121 [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
21122 if test "$enable_rpath" = yes; then
21123- LIBPATHFLAG=" -L'%1\$-s'"
21124- if test "$GCC" = yes; then
21125- RPATHFLAG=" -Wl,-R'%1\$-s'"
21126- else
21127- RPATHFLAG=" -R'%1\$-s'"
21128- fi
21129+ LIBPATHFLAG=" -L%1\$-s"
21130+ RPATHFLAG=" ${linker_flag}-R%1\$-s"
21131 fi
21132 fi
21133 AC_SUBST(LINK_SO)
21134@@ -1361,12 +1359,7 @@
21135 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
21136 ;;
21137 aix*)
21138- if test "$GCC" = yes; then
21139- LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
21140- else
21141- LIBRUBY_DLDFLAGS='-G -bnoentry'
21142- fi
21143- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
21144+ LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
21145 LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
21146 SOLIBS='-lm -lc'
21147 ;;
21148@@ -1384,21 +1377,17 @@
21149 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
21150 ;;
21151 interix*)
21152- LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
21153+ LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
21154 ;;
21155 *)
21156 ;;
21157 esac
21158 fi
21159 if test "$enable_rpath" = yes; then
21160- if test "$GCC" = yes; then
21161- LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
21162- else
21163- LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
21164- fi
21165+ LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
21166 fi
21167
21168-XLDFLAGS="$XLDFLAGS -L."
21169+LDFLAGS="-L. $LDFLAGS"
21170 AC_SUBST(ARCHFILE)
21171
21172 dnl build rdoc index if requested
21173@@ -1650,8 +1639,10 @@
21174
21175 AC_CONFIG_FILES($FIRSTMAKEFILE)
21176 AC_CONFIG_FILES(Makefile, [{
21177+ sed '/^MISSING/s/\$U\././g' Makefile
21178 echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
21179 test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
21180 sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
21181-} >> Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
21182+ } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
21183+[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
21184 AC_OUTPUT
21185diff -ur ruby-1.8.6/defines.h ruby/defines.h
21186--- ruby-1.8.6/defines.h 2007-02-24 10:52:08.000000000 -0700
21187+++ ruby/defines.h 2007-02-24 10:49:36.000000000 -0700
21188@@ -3,7 +3,7 @@
21189 defines.h -
21190
21191 $Author$
21192- $Date$
21193+ $Date$
21194 created at: Wed May 18 00:21:44 JST 1994
21195
21196 ************************************************/
21197diff -ur ruby-1.8.6/dir.c ruby/dir.c
21198--- ruby-1.8.6/dir.c 2007-02-24 00:55:06.000000000 -0700
21199+++ ruby/dir.c 2007-04-23 18:33:09.000000000 -0600
21200@@ -2,8 +2,8 @@
21201
21202 dir.c -
21203
21204- $Author$
21205- $Date$
21206+ $Author$
21207+ $Date$
21208 created at: Wed Jan 5 09:51:01 JST 1994
21209
21210 Copyright (C) 1993-2003 Yukihiro Matsumoto
21211@@ -958,13 +958,19 @@
21212 #define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
21213 #define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
21214
21215+/*
21216+ * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
21217+ * is not a directory.
21218+ */
21219+#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
21220+
21221 /* System call with warning */
21222 static int
21223 do_stat(const char *path, struct stat *pst, int flags)
21224
21225 {
21226 int ret = stat(path, pst);
21227- if (ret < 0 && errno != ENOENT)
21228+ if (ret < 0 && !to_be_ignored(errno))
21229 sys_warning(path);
21230
21231 return ret;
21232@@ -974,7 +980,7 @@
21233 do_lstat(const char *path, struct stat *pst, int flags)
21234 {
21235 int ret = lstat(path, pst);
21236- if (ret < 0 && errno != ENOENT)
21237+ if (ret < 0 && !to_be_ignored(errno))
21238 sys_warning(path);
21239
21240 return ret;
21241@@ -984,7 +990,7 @@
21242 do_opendir(const char *path, int flags)
21243 {
21244 DIR *dirp = opendir(path);
21245- if (dirp == NULL && errno != ENOENT && errno != ENOTDIR)
21246+ if (dirp == NULL && !to_be_ignored(errno))
21247 sys_warning(path);
21248
21249 return dirp;
21250diff -ur ruby-1.8.6/distruby.rb ruby/distruby.rb
21251--- ruby-1.8.6/distruby.rb 2007-02-28 06:23:42.000000000 -0700
21252+++ ruby/distruby.rb 2007-03-20 01:37:34.000000000 -0600
21253@@ -7,7 +7,9 @@
21254 dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
21255 tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
21256 end
21257-tarname = dirname + '.tar.gz'
21258+tgzname = dirname + '.tar.gz'
21259+tbzname = dirname + '.tar.bz2'
21260+zipname = dirname + '.zip'
21261 repos = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
21262
21263 STDERR.puts 'exporting sources...'
21264@@ -21,16 +23,24 @@
21265 system 'bison', '-y', '-o', 'parse.c', 'parse.y'
21266 end
21267
21268-STDERR.puts 'generating tarball...'
21269-system 'tar', 'chofzp', tarname, dirname
21270-
21271-open tarname, 'rb' do |fp|
21272- require 'digest/md5'
21273- require 'digest/sha1'
21274- str = fp.read
21275- md5 = Digest::MD5.hexdigest str
21276- sha = Digest::SHA1.hexdigest str
21277- printf "MD5(%s)= %s\nSHA1(%s)= %s\n", tarname, md5, tarname, sha
21278+STDERR.puts 'generating tarballs...'
21279+ENV['GZIP'] = '-9'
21280+system 'tar', 'chofzp', tgzname, dirname
21281+system 'tar', 'chojfp', tbzname, dirname
21282+system 'zip', '-q9r', zipname, dirname
21283+
21284+require 'digest/md5'
21285+require 'digest/sha2'
21286+for name in [tgzname, tbzname, zipname] do
21287+ open name, 'rb' do |fp|
21288+ str = fp.read
21289+ md5 = Digest::MD5.hexdigest str
21290+ sha = Digest::SHA256.hexdigest str
21291+ printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
21292+ name, md5,
21293+ name, sha,
21294+ name, str.size
21295+ end
21296 end
21297
21298
21299diff -ur ruby-1.8.6/env.h ruby/env.h
21300--- ruby-1.8.6/env.h 2007-03-03 00:30:46.000000000 -0700
21301+++ ruby/env.h 2007-03-03 00:28:54.000000000 -0700
21302@@ -3,7 +3,7 @@
21303 env.h -
21304
21305 $Author$
21306- $Date$
21307+ $Date$
21308 created at: Mon Jul 11 11:53:03 JST 1994
21309
21310 Copyright (C) 1993-2003 Yukihiro Matsumoto
21311diff -ur ruby-1.8.6/error.c ruby/error.c
21312--- ruby-1.8.6/error.c 2007-02-12 16:01:19.000000000 -0700
21313+++ ruby/error.c 2007-04-04 09:42:16.000000000 -0600
21314@@ -2,8 +2,8 @@
21315
21316 error.c -
21317
21318- $Author$
21319- $Date$
21320+ $Author$
21321+ $Date$
21322 created at: Mon Aug 9 16:11:34 JST 1993
21323
21324 Copyright (C) 1993-2003 Yukihiro Matsumoto
21325@@ -1083,7 +1083,7 @@
21326 rb_notimplement()
21327 {
21328 rb_raise(rb_eNotImpError,
21329- "the %s() function is unimplemented on this machine",
21330+ "%s() function is unimplemented on this machine",
21331 rb_id2name(ruby_frame->last_func));
21332 }
21333
21334diff -ur ruby-1.8.6/eval.c ruby/eval.c
21335--- ruby-1.8.6/eval.c 2007-03-11 01:31:53.000000000 -0700
21336+++ ruby/eval.c 2007-04-19 21:16:21.000000000 -0600
21337@@ -2,8 +2,8 @@
21338
21339 eval.c -
21340
21341- $Author$
21342- $Date$
21343+ $Author$
21344+ $Date$
21345 created at: Thu Jun 10 14:22:17 JST 1993
21346
21347 Copyright (C) 1993-2003 Yukihiro Matsumoto
21348@@ -243,8 +243,8 @@
21349 #define SCOPE_SET(f) (scope_vmode=(f))
21350 #define SCOPE_TEST(f) (scope_vmode&(f))
21351
21352-VALUE (*ruby_sandbox_save)(struct thread *) = NULL;
21353-VALUE (*ruby_sandbox_restore)(struct thread *) = NULL;
21354+VALUE (*ruby_sandbox_save)_((rb_thread_t));
21355+VALUE (*ruby_sandbox_restore)_((rb_thread_t));
21356 NODE* ruby_current_node;
21357 int ruby_safe_level = 0;
21358 /* safe-level:
21359@@ -1073,8 +1073,11 @@
21360 ruby_scope = _scope; \
21361 scope_vmode = SCOPE_PUBLIC
21362
21363-rb_thread_t curr_thread = 0;
21364-rb_thread_t main_thread;
21365+rb_thread_t rb_curr_thread;
21366+rb_thread_t rb_main_thread;
21367+#define main_thread rb_main_thread
21368+#define curr_thread rb_curr_thread
21369+
21370 static void scope_dup _((struct SCOPE *));
21371
21372 #define POP_SCOPE() \
21373@@ -1562,11 +1565,14 @@
21374 int ex;
21375 {
21376 int state;
21377- volatile VALUE err = ruby_errinfo;
21378+ volatile VALUE errs[2];
21379+ int nerr;
21380
21381+ errs[1] = ruby_errinfo;
21382 ruby_safe_level = 0;
21383- Init_stack((void*)&state);
21384+ Init_stack((void *)&state);
21385 ruby_finalize_0();
21386+ errs[0] = ruby_errinfo;
21387 PUSH_TAG(PROT_NONE);
21388 PUSH_ITER(ITER_NOT);
21389 if ((state = EXEC_TAG()) == 0) {
21390@@ -1577,21 +1583,25 @@
21391 ex = state;
21392 }
21393 POP_ITER();
21394- ruby_errinfo = err;
21395+ ruby_errinfo = errs[1];
21396 ex = error_handle(ex);
21397 ruby_finalize_1();
21398 POP_TAG();
21399
21400- if (err) {
21401+ for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
21402+ VALUE err = errs[nerr];
21403+
21404+ if (!RTEST(err)) continue;
21405+
21406 if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
21407- VALUE st = rb_iv_get(err, "status");
21408- return NUM2INT(st);
21409+ return sysexit_status(err);
21410 }
21411 else if (rb_obj_is_kind_of(err, rb_eSignal)) {
21412 VALUE sig = rb_iv_get(err, "signo");
21413 ruby_default_signal(NUM2INT(sig));
21414 }
21415 }
21416+
21417 return ex;
21418 }
21419
21420@@ -4998,8 +5008,10 @@
21421 CHECK_INTS;
21422 goto redo;
21423 case TAG_NEXT:
21424- state = 0;
21425- result = prot_tag->retval;
21426+ if (!lambda) {
21427+ state = 0;
21428+ result = prot_tag->retval;
21429+ }
21430 break;
21431 case TAG_BREAK:
21432 if (TAG_DST()) {
21433@@ -7017,7 +7029,8 @@
21434 return Qfalse;
21435 }
21436 else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
21437- return Qfalse; /* may be overriden by .rb file */
21438+ if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
21439+ return Qfalse;
21440 }
21441 }
21442 if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
21443@@ -8597,6 +8610,7 @@
21444 proc_jump_error(TAG_RETRY, Qnil); /* xxx */
21445 JUMP_TAG(state);
21446 break;
21447+ case TAG_NEXT:
21448 case TAG_BREAK:
21449 if (!pcall && result != Qundef) {
21450 proc_jump_error(state, result);
21451@@ -9827,8 +9841,6 @@
21452 # endif
21453 #endif
21454
21455-/* typedef struct thread * rb_thread_t; */
21456-
21457 #define THREAD_RAISED 0x200 /* temporary flag */
21458 #define THREAD_TERMINATING 0x400 /* persistent flag */
21459 #define THREAD_NO_ENSURE 0x800 /* persistent flag */
21460@@ -9851,7 +9863,7 @@
21461
21462 int safe;
21463
21464- enum thread_status status;
21465+ enum rb_thread_status status;
21466 int wait_for;
21467 int fd;
21468 fd_set readfds;
21469@@ -9953,7 +9965,7 @@
21470
21471 static const char *
21472 thread_status_name(status)
21473- enum thread_status status;
21474+ enum rb_thread_status status;
21475 {
21476 switch (status) {
21477 case THREAD_RUNNABLE:
21478@@ -11011,7 +11023,7 @@
21479 rb_thread_t th;
21480 double limit;
21481 {
21482- enum thread_status last_status = THREAD_RUNNABLE;
21483+ enum rb_thread_status last_status = THREAD_RUNNABLE;
21484
21485 if (rb_thread_critical) rb_thread_deadlock();
21486 if (!rb_thread_dead(th)) {
21487@@ -11394,7 +11406,7 @@
21488 VALUE
21489 rb_thread_stop()
21490 {
21491- enum thread_status last_status = THREAD_RUNNABLE;
21492+ enum rb_thread_status last_status = THREAD_RUNNABLE;
21493
21494 rb_thread_critical = 0;
21495 if (curr_thread == curr_thread->next) {
21496@@ -11658,7 +11670,7 @@
21497 #endif
21498
21499 #define THREAD_ALLOC(th) do {\
21500- th = ALLOC(struct thread);\
21501+ th = ALLOC(struct rb_thread);\
21502 \
21503 th->next = 0;\
21504 th->prev = 0;\
21505@@ -11823,7 +11835,7 @@
21506 volatile rb_thread_t th_save = th;
21507 volatile VALUE thread = th->thread;
21508 struct BLOCK *volatile saved_block = 0;
21509- enum thread_status status;
21510+ enum rb_thread_status status;
21511 int state;
21512
21513 if (OBJ_FROZEN(curr_thread->thgroup)) {
21514diff -ur ruby-1.8.6/ext/bigdecimal/bigdecimal.c ruby/ext/bigdecimal/bigdecimal.c
21515--- ruby-1.8.6/ext/bigdecimal/bigdecimal.c 2007-02-27 04:51:55.000000000 -0700
21516+++ ruby/ext/bigdecimal/bigdecimal.c 2007-03-13 23:35:31.000000000 -0600
21517@@ -3921,7 +3921,7 @@
21518 /* get integer part */
21519 i = 0;
21520 sign = 1;
21521- if(ni > 0) {
21522+ if(ni >= 0) {
21523 if(int_chr[0] == '-') {
21524 sign = -1;
21525 ++i;
21526diff -ur ruby-1.8.6/ext/digest/digest.c ruby/ext/digest/digest.c
21527--- ruby-1.8.6/ext/digest/digest.c 2007-02-28 11:42:47.000000000 -0700
21528+++ ruby/ext/digest/digest.c 2007-02-28 11:30:51.000000000 -0700
21529@@ -9,7 +9,7 @@
21530 Copyright (C) 2001-2006 Akinori MUSHA
21531
21532 $RoughId: digest.c,v 1.16 2001/07/13 15:38:27 knu Exp $
21533- $Id$
21534+ $Id$
21535
21536 ************************************************/
21537
21538diff -ur ruby-1.8.6/ext/digest/lib/md5.rb ruby/ext/digest/lib/md5.rb
21539--- ruby-1.8.6/ext/digest/lib/md5.rb 2007-03-06 03:12:12.000000000 -0700
21540+++ ruby/ext/digest/lib/md5.rb 2007-03-06 03:09:51.000000000 -0700
21541@@ -1,7 +1,7 @@
21542 # just for compatibility; requiring "md5" is obsoleted
21543 #
21544 # $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
21545-# $Id$
21546+# $Id$
21547
21548 require 'digest/md5'
21549
21550diff -ur ruby-1.8.6/ext/digest/lib/sha1.rb ruby/ext/digest/lib/sha1.rb
21551--- ruby-1.8.6/ext/digest/lib/sha1.rb 2007-03-06 03:12:12.000000000 -0700
21552+++ ruby/ext/digest/lib/sha1.rb 2007-03-06 03:09:51.000000000 -0700
21553@@ -1,7 +1,7 @@
21554 # just for compatibility; requiring "sha1" is obsoleted
21555 #
21556 # $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
21557-# $Id$
21558+# $Id$
21559
21560 require 'digest/sha1'
21561
21562diff -ur ruby-1.8.6/ext/digest/rmd160/rmd160ossl.c ruby/ext/digest/rmd160/rmd160ossl.c
21563--- ruby-1.8.6/ext/digest/rmd160/rmd160ossl.c 2007-02-27 04:51:55.000000000 -0700
21564+++ ruby/ext/digest/rmd160/rmd160ossl.c 2007-02-27 03:38:32.000000000 -0700
21565@@ -1,4 +1,4 @@
21566-/* $Id$ */
21567+/* $Id$ */
21568
21569 #include "defs.h"
21570 #include "rmd160ossl.h"
21571diff -ur ruby-1.8.6/ext/digest/sha1/sha1ossl.c ruby/ext/digest/sha1/sha1ossl.c
21572--- ruby-1.8.6/ext/digest/sha1/sha1ossl.c 2007-02-27 04:51:55.000000000 -0700
21573+++ ruby/ext/digest/sha1/sha1ossl.c 2007-02-27 03:38:32.000000000 -0700
21574@@ -1,4 +1,4 @@
21575-/* $Id$ */
21576+/* $Id$ */
21577
21578 #include "defs.h"
21579 #include "sha1ossl.h"
21580diff -ur ruby-1.8.6/ext/dl/dl.c ruby/ext/dl/dl.c
21581--- ruby-1.8.6/ext/dl/dl.c 2007-02-12 16:01:19.000000000 -0700
21582+++ ruby/ext/dl/dl.c 2007-03-16 06:52:07.000000000 -0600
21583@@ -1,5 +1,5 @@
21584 /*
21585- * $Id$
21586+ * $Id$
21587 */
21588
21589 #include <ruby.h>
21590@@ -459,7 +459,7 @@
21591 VALUE val0;
21592
21593 val0 = rb_check_array_type(v);
21594- if(NIL_P(TYPE(val0))) {
21595+ if(NIL_P(val0)) {
21596 rb_raise(rb_eDLTypeError, "an array is expected.");
21597 }
21598 v = val0;
21599diff -ur ruby-1.8.6/ext/dl/ptr.c ruby/ext/dl/ptr.c
21600--- ruby-1.8.6/ext/dl/ptr.c 2007-03-11 10:24:34.000000000 -0600
21601+++ ruby/ext/dl/ptr.c 2007-03-17 00:01:02.000000000 -0600
21602@@ -1,5 +1,5 @@
21603 /* -*- C -*-
21604- * $Id$
21605+ * $Id$
21606 */
21607
21608 #include <ruby.h>
21609@@ -344,7 +344,7 @@
21610 n = data->size / sizeof(void*);
21611 break;
21612 case 'S': case 's':
21613- for (n=0; ((void**)(data->ptr))[n]; n++) {};
21614+ n = data->size / sizeof(char*);
21615 break;
21616 default:
21617 n = 0;
21618diff -ur ruby-1.8.6/ext/dl/sym.c ruby/ext/dl/sym.c
21619--- ruby-1.8.6/ext/dl/sym.c 2007-03-11 10:24:34.000000000 -0600
21620+++ ruby/ext/dl/sym.c 2007-03-11 10:09:50.000000000 -0600
21621@@ -1,5 +1,5 @@
21622 /* -*- C -*-
21623- * $Id$
21624+ * $Id$
21625 */
21626
21627 #include <ruby.h>
21628diff -ur ruby-1.8.6/ext/etc/etc.c ruby/ext/etc/etc.c
21629--- ruby-1.8.6/ext/etc/etc.c 2007-02-12 16:01:19.000000000 -0700
21630+++ ruby/ext/etc/etc.c 2007-03-16 03:35:23.000000000 -0600
21631@@ -2,8 +2,8 @@
21632
21633 etc.c -
21634
21635- $Author$
21636- $Date$
21637+ $Author$
21638+ $Date$
21639 created at: Tue Mar 22 18:39:19 JST 1994
21640
21641 ************************************************/
21642@@ -337,7 +337,7 @@
21643 struct group *grp;
21644
21645 rb_secure(4);
21646- gid = getgid();
21647+ gid = PW_VAL2GID(id);
21648 grp = getgrgid(gid);
21649 if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
21650 return setup_group(grp);
21651diff -ur ruby-1.8.6/ext/extmk.rb ruby/ext/extmk.rb
21652--- ruby-1.8.6/ext/extmk.rb 2007-02-19 02:28:43.000000000 -0700
21653+++ ruby/ext/extmk.rb 2007-04-23 07:13:53.000000000 -0600
21654@@ -324,6 +324,7 @@
21655 $ruby = '$(topdir)/miniruby' + EXEEXT
21656 end
21657 $ruby << " -I'$(topdir)' -I'$(hdrdir)/lib'"
21658+$ruby << " -I'#{$extout}'" if $extout
21659 $config_h = '$(topdir)/config.h'
21660
21661 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
21662diff -ur ruby-1.8.6/ext/nkf/nkf.c ruby/ext/nkf/nkf.c
21663--- ruby-1.8.6/ext/nkf/nkf.c 2007-02-27 04:51:55.000000000 -0700
21664+++ ruby/ext/nkf/nkf.c 2007-02-27 03:38:32.000000000 -0700
21665@@ -3,11 +3,11 @@
21666 *
21667 * original nkf2.x is maintained at http://sourceforge.jp/projects/nkf/
21668 *
21669- * $Id$
21670+ * $Id$
21671 *
21672 */
21673
21674-#define RUBY_NKF_REVISION "$Revision$"
21675+#define RUBY_NKF_REVISION "$Revision$"
21676 #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
21677
21678 #include "ruby.h"
21679diff -ur ruby-1.8.6/ext/nkf/nkf-utf8/nkf.c ruby/ext/nkf/nkf-utf8/nkf.c
21680--- ruby-1.8.6/ext/nkf/nkf-utf8/nkf.c 2007-02-12 16:01:19.000000000 -0700
21681+++ ruby/ext/nkf/nkf-utf8/nkf.c 2007-02-19 01:29:08.000000000 -0700
21682@@ -39,7 +39,7 @@
21683 ** E-Mail: furukawa@tcp-ip.or.jp
21684 ** \e$B$^$G8fO"Mm$r$*4j$$$7$^$9!#\e(B
21685 ***********************************************************************/
21686-/* $Id$ */
21687+/* $Id$ */
21688 #define NKF_VERSION "2.0.8"
21689 #define NKF_RELEASE_DATE "2007-01-28"
21690 #include "config.h"
21691diff -ur ruby-1.8.6/ext/openssl/extconf.rb ruby/ext/openssl/extconf.rb
21692--- ruby-1.8.6/ext/openssl/extconf.rb 2007-02-28 06:23:42.000000000 -0700
21693+++ ruby/ext/openssl/extconf.rb 2007-02-28 02:36:06.000000000 -0700
21694@@ -11,7 +11,7 @@
21695 (See the file 'LICENCE'.)
21696
21697 = Version
21698- $Id$
21699+ $Id$
21700 =end
21701
21702 require "mkmf"
21703diff -ur ruby-1.8.6/ext/openssl/ossl_asn1.c ruby/ext/openssl/ossl_asn1.c
21704--- ruby-1.8.6/ext/openssl/ossl_asn1.c 2007-03-11 22:12:32.000000000 -0600
21705+++ ruby/ext/openssl/ossl_asn1.c 2007-03-11 22:07:08.000000000 -0600
21706@@ -1,5 +1,5 @@
21707 /*
21708- * $Id$
21709+ * $Id$
21710 * 'OpenSSL for Ruby' team members
21711 * Copyright (C) 2003
21712 * All rights reserved.
21713diff -ur ruby-1.8.6/ext/openssl/ossl_bn.c ruby/ext/openssl/ossl_bn.c
21714--- ruby-1.8.6/ext/openssl/ossl_bn.c 2007-03-11 22:12:32.000000000 -0600
21715+++ ruby/ext/openssl/ossl_bn.c 2007-03-11 22:07:08.000000000 -0600
21716@@ -1,5 +1,5 @@
21717 /*
21718- * $Id$
21719+ * $Id$
21720 * 'OpenSSL for Ruby' project
21721 * Copyright (C) 2001-2002 Technorama team <oss-ruby@technorama.net>
21722 * All rights reserved.
21723diff -ur ruby-1.8.6/ext/openssl/ossl_cipher.c ruby/ext/openssl/ossl_cipher.c
21724--- ruby-1.8.6/ext/openssl/ossl_cipher.c 2007-03-11 22:12:32.000000000 -0600
21725+++ ruby/ext/openssl/ossl_cipher.c 2007-03-11 22:07:08.000000000 -0600
21726@@ -1,5 +1,5 @@
21727 /*
21728- * $Id$
21729+ * $Id$
21730 * 'OpenSSL for Ruby' project
21731 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21732 * All rights reserved.
21733diff -ur ruby-1.8.6/ext/openssl/ossl_digest.c ruby/ext/openssl/ossl_digest.c
21734--- ruby-1.8.6/ext/openssl/ossl_digest.c 2007-03-11 22:12:32.000000000 -0600
21735+++ ruby/ext/openssl/ossl_digest.c 2007-03-11 22:07:08.000000000 -0600
21736@@ -1,5 +1,5 @@
21737 /*
21738- * $Id$
21739+ * $Id$
21740 * 'OpenSSL for Ruby' project
21741 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21742 * All rights reserved.
21743diff -ur ruby-1.8.6/ext/openssl/ossl_hmac.c ruby/ext/openssl/ossl_hmac.c
21744--- ruby-1.8.6/ext/openssl/ossl_hmac.c 2007-03-11 22:12:32.000000000 -0600
21745+++ ruby/ext/openssl/ossl_hmac.c 2007-03-11 22:07:08.000000000 -0600
21746@@ -1,5 +1,5 @@
21747 /*
21748- * $Id$
21749+ * $Id$
21750 * 'OpenSSL for Ruby' project
21751 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21752 * All rights reserved.
21753diff -ur ruby-1.8.6/ext/openssl/ossl_pkey.c ruby/ext/openssl/ossl_pkey.c
21754--- ruby-1.8.6/ext/openssl/ossl_pkey.c 2007-03-11 22:12:32.000000000 -0600
21755+++ ruby/ext/openssl/ossl_pkey.c 2007-03-11 22:07:08.000000000 -0600
21756@@ -1,5 +1,5 @@
21757 /*
21758- * $Id$
21759+ * $Id$
21760 * 'OpenSSL for Ruby' project
21761 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21762 * All rights reserved.
21763diff -ur ruby-1.8.6/ext/openssl/ossl_pkey_dh.c ruby/ext/openssl/ossl_pkey_dh.c
21764--- ruby-1.8.6/ext/openssl/ossl_pkey_dh.c 2007-03-11 22:12:32.000000000 -0600
21765+++ ruby/ext/openssl/ossl_pkey_dh.c 2007-03-11 22:07:08.000000000 -0600
21766@@ -1,5 +1,5 @@
21767 /*
21768- * $Id$
21769+ * $Id$
21770 * 'OpenSSL for Ruby' project
21771 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21772 * All rights reserved.
21773diff -ur ruby-1.8.6/ext/openssl/ossl_pkey_dsa.c ruby/ext/openssl/ossl_pkey_dsa.c
21774--- ruby-1.8.6/ext/openssl/ossl_pkey_dsa.c 2007-03-11 22:12:32.000000000 -0600
21775+++ ruby/ext/openssl/ossl_pkey_dsa.c 2007-03-11 22:07:08.000000000 -0600
21776@@ -1,5 +1,5 @@
21777 /*
21778- * $Id$
21779+ * $Id$
21780 * 'OpenSSL for Ruby' project
21781 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21782 * All rights reserved.
21783diff -ur ruby-1.8.6/ext/openssl/ossl_pkey_rsa.c ruby/ext/openssl/ossl_pkey_rsa.c
21784--- ruby-1.8.6/ext/openssl/ossl_pkey_rsa.c 2007-03-11 22:12:32.000000000 -0600
21785+++ ruby/ext/openssl/ossl_pkey_rsa.c 2007-03-11 22:07:08.000000000 -0600
21786@@ -1,5 +1,5 @@
21787 /*
21788- * $Id$
21789+ * $Id$
21790 * 'OpenSSL for Ruby' project
21791 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21792 * All rights reserved.
21793diff -ur ruby-1.8.6/ext/openssl/ossl_rand.c ruby/ext/openssl/ossl_rand.c
21794--- ruby-1.8.6/ext/openssl/ossl_rand.c 2007-03-11 22:12:32.000000000 -0600
21795+++ ruby/ext/openssl/ossl_rand.c 2007-03-11 22:07:08.000000000 -0600
21796@@ -1,5 +1,5 @@
21797 /*
21798- * $Id$
21799+ * $Id$
21800 * 'OpenSSL for Ruby' project
21801 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21802 * All rights reserved.
21803diff -ur ruby-1.8.6/ext/openssl/ossl_ssl.c ruby/ext/openssl/ossl_ssl.c
21804--- ruby-1.8.6/ext/openssl/ossl_ssl.c 2007-03-11 22:12:32.000000000 -0600
21805+++ ruby/ext/openssl/ossl_ssl.c 2007-03-11 22:07:08.000000000 -0600
21806@@ -1,5 +1,5 @@
21807 /*
21808- * $Id$
21809+ * $Id$
21810 * 'OpenSSL for Ruby' project
21811 * Copyright (C) 2000-2002 GOTOU Yuuzou <gotoyuzo@notwork.org>
21812 * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
21813diff -ur ruby-1.8.6/ext/pty/expect_sample.rb ruby/ext/pty/expect_sample.rb
21814--- ruby-1.8.6/ext/pty/expect_sample.rb 2007-02-12 16:01:19.000000000 -0700
21815+++ ruby/ext/pty/expect_sample.rb 2007-04-16 07:57:13.000000000 -0600
21816@@ -37,9 +37,9 @@
21817 w_f.print "dir\n"
21818 end
21819
21820- r_f.expect("> ") do |output|
21821+ r_f.expect(/[^\-]> /) do |output|
21822 for x in output[0].split("\n")
21823- if x =~ /(ruby.*\.tar\.gz)/ then
21824+ if x =~ /(ruby.*?\.tar\.gz)/ then
21825 fnames.push $1
21826 end
21827 end
21828diff -ur ruby-1.8.6/ext/socket/socket.c ruby/ext/socket/socket.c
21829--- ruby-1.8.6/ext/socket/socket.c 2007-02-19 02:34:19.000000000 -0700
21830+++ ruby/ext/socket/socket.c 2007-04-25 07:35:47.000000000 -0600
21831@@ -2,8 +2,8 @@
21832
21833 socket.c -
21834
21835- $Author$
21836- $Date$
21837+ $Author$
21838+ $Date$
21839 created at: Thu Mar 31 12:21:29 JST 1994
21840
21841 Copyright (C) 1993-2001 Yukihiro Matsumoto
21842@@ -625,7 +625,7 @@
21843 rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
21844 }
21845 #endif
21846- if (alen) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
21847+ if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
21848 return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
21849 else
21850 return rb_assoc_new(str, Qnil);
21851@@ -691,7 +691,7 @@
21852 return str;
21853
21854 case RECV_IP:
21855- if (alen) /* connection-oriented socket may not return a from result */
21856+ if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
21857 addr = ipaddr((struct sockaddr*)buf);
21858 break;
21859
21860@@ -1956,7 +1956,7 @@
21861 #if FD_PASSING_BY_MSG_CONTROL
21862 struct {
21863 struct cmsghdr hdr;
21864- int fd;
21865+ char pad[8+sizeof(int)+8];
21866 } cmsg;
21867 #endif
21868
21869@@ -1986,12 +1986,13 @@
21870
21871 #if FD_PASSING_BY_MSG_CONTROL
21872 msg.msg_control = (caddr_t)&cmsg;
21873- msg.msg_controllen = CMSG_SPACE(sizeof(int));
21874+ msg.msg_controllen = CMSG_LEN(sizeof(int));
21875 msg.msg_flags = 0;
21876+ MEMZERO((char*)&cmsg, char, sizeof(cmsg));
21877 cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
21878 cmsg.hdr.cmsg_level = SOL_SOCKET;
21879 cmsg.hdr.cmsg_type = SCM_RIGHTS;
21880- cmsg.fd = fd;
21881+ *(int *)CMSG_DATA(&cmsg.hdr) = fd;
21882 #else
21883 msg.msg_accrights = (caddr_t)&fd;
21884 msg.msg_accrightslen = sizeof(fd);
21885@@ -2037,7 +2038,7 @@
21886 #if FD_PASSING_BY_MSG_CONTROL
21887 struct {
21888 struct cmsghdr hdr;
21889- int fd;
21890+ char pad[8+sizeof(int)+8];
21891 } cmsg;
21892 #endif
21893
21894@@ -2066,7 +2067,7 @@
21895 cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
21896 cmsg.hdr.cmsg_level = SOL_SOCKET;
21897 cmsg.hdr.cmsg_type = SCM_RIGHTS;
21898- cmsg.fd = -1;
21899+ *(int *)CMSG_DATA(&cmsg.hdr) = -1;
21900 #else
21901 msg.msg_accrights = (caddr_t)&fd;
21902 msg.msg_accrightslen = sizeof(fd);
21903@@ -2079,22 +2080,22 @@
21904 #if FD_PASSING_BY_MSG_CONTROL
21905 if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
21906 rb_raise(rb_eSocket,
21907- "file descriptor was not passed (msg_controllen : %d != %d)",
21908+ "file descriptor was not passed (msg_controllen=%d, %d expected)",
21909 msg.msg_controllen, CMSG_SPACE(sizeof(int)));
21910 }
21911- if (cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)) {
21912+ if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
21913 rb_raise(rb_eSocket,
21914- "file descriptor was not passed (cmsg_len : %d != %d)",
21915- cmsg.hdr.cmsg_len, CMSG_SPACE(0) + sizeof(int));
21916+ "file descriptor was not passed (cmsg_len=%d, %d expected)",
21917+ cmsg.hdr.cmsg_len, CMSG_LEN(sizeof(int)));
21918 }
21919 if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
21920 rb_raise(rb_eSocket,
21921- "file descriptor was not passed (cmsg_level : %d != %d)",
21922+ "file descriptor was not passed (cmsg_level=%d, %d expected)",
21923 cmsg.hdr.cmsg_level, SOL_SOCKET);
21924 }
21925 if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
21926 rb_raise(rb_eSocket,
21927- "file descriptor was not passed (cmsg_type : %d != %d)",
21928+ "file descriptor was not passed (cmsg_type=%d, %d expected)",
21929 cmsg.hdr.cmsg_type, SCM_RIGHTS);
21930 }
21931 #else
21932@@ -2106,7 +2107,7 @@
21933 #endif
21934
21935 #if FD_PASSING_BY_MSG_CONTROL
21936- fd = cmsg.fd;
21937+ fd = *(int *)CMSG_DATA(&cmsg.hdr);
21938 #endif
21939
21940 if (klass == Qnil)
21941diff -ur ruby-1.8.6/ext/stringio/stringio.c ruby/ext/stringio/stringio.c
21942--- ruby-1.8.6/ext/stringio/stringio.c 2007-02-12 16:01:19.000000000 -0700
21943+++ ruby/ext/stringio/stringio.c 2007-04-16 01:48:50.000000000 -0600
21944@@ -2,8 +2,8 @@
21945
21946 stringio.c -
21947
21948- $Author$
21949- $Date$
21950+ $Author$
21951+ $Date$
21952 $RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
21953 created at: Tue Feb 19 04:10:38 JST 2002
21954
21955@@ -645,6 +645,9 @@
21956
21957 rb_scan_args(argc, argv, "11", NULL, &whence);
21958 offset = NUM2LONG(argv[0]);
21959+ if (CLOSED(ptr)) {
21960+ rb_raise(rb_eIOError, "closed stream");
21961+ }
21962 switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
21963 case 0:
21964 break;
21965@@ -655,7 +658,7 @@
21966 offset += RSTRING(ptr->string)->len;
21967 break;
21968 default:
21969- rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence));
21970+ error_inval("invalid whence");
21971 }
21972 if (offset < 0) {
21973 error_inval(0);
21974diff -ur ruby-1.8.6/ext/thread/thread.c ruby/ext/thread/thread.c
21975--- ruby-1.8.6/ext/thread/thread.c 2007-03-03 03:08:06.000000000 -0700
21976+++ ruby/ext/thread/thread.c 2007-03-20 16:26:18.000000000 -0600
21977@@ -163,13 +163,18 @@
21978 remove_one(List *list, VALUE value)
21979 {
21980 Entry **ref;
21981+ Entry *prev;
21982 Entry *entry;
21983
21984- for (ref = &list->entries, entry = list->entries;
21985+ for (ref = &list->entries, prev = NULL, entry = list->entries;
21986 entry != NULL;
21987- ref = &entry->next, entry = entry->next) {
21988+ ref = &entry->next, prev = entry, entry = entry->next) {
21989 if (entry->value == value) {
21990 *ref = entry->next;
21991+ list->size--;
21992+ if (!entry->next) {
21993+ list->last_entry = prev;
21994+ }
21995 recycle_entries(list, entry, entry);
21996 break;
21997 }
21998@@ -390,7 +395,7 @@
21999 *
22000 */
22001
22002-static void
22003+static VALUE
22004 lock_mutex(Mutex *mutex)
22005 {
22006 VALUE current;
22007@@ -405,6 +410,7 @@
22008 mutex->owner = current;
22009
22010 rb_thread_critical = 0;
22011+ return Qnil;
22012 }
22013
22014 static VALUE
22015@@ -429,8 +435,13 @@
22016 VALUE waking;
22017
22018 if (!RTEST(mutex->owner)) {
22019- return Qundef;
22020+ rb_raise(rb_eThreadError, "not owner");
22021 }
22022+
22023+ if (mutex->owner != rb_thread_current()) {
22024+ rb_raise(rb_eThreadError, "not owner");
22025+ }
22026+
22027 mutex->owner = Qnil;
22028 waking = wake_one(&mutex->waiting);
22029
22030@@ -623,18 +634,12 @@
22031 wait_condvar(ConditionVariable *condvar, Mutex *mutex)
22032 {
22033 rb_thread_critical = 1;
22034- if (!RTEST(mutex->owner)) {
22035- rb_thread_critical = 0;
22036- return;
22037- }
22038- if (mutex->owner != rb_thread_current()) {
22039+ if (rb_thread_current() != mutex->owner) {
22040 rb_thread_critical = 0;
22041- rb_raise(rb_eThreadError, "Not owner");
22042+ rb_raise(rb_eThreadError, "not owner of the synchronization mutex");
22043 }
22044- mutex->owner = Qnil;
22045- wait_list(&condvar->waiting);
22046-
22047- lock_mutex(mutex);
22048+ unlock_mutex_inner(mutex);
22049+ rb_ensure(wait_list, (VALUE)&condvar->waiting, lock_mutex, (VALUE)mutex);
22050 }
22051
22052 static VALUE
22053diff -ur ruby-1.8.6/ext/win32ole/win32ole.c ruby/ext/win32ole/win32ole.c
22054--- ruby-1.8.6/ext/win32ole/win32ole.c 2007-02-12 16:01:19.000000000 -0700
22055+++ ruby/ext/win32ole/win32ole.c 2007-02-19 01:29:08.000000000 -0700
22056@@ -12,7 +12,7 @@
22057 */
22058
22059 /*
22060- $Date$
22061+ $Date$
22062 modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
22063 */
22064
22065diff -ur ruby-1.8.6/file.c ruby/file.c
22066--- ruby-1.8.6/file.c 2007-03-04 07:51:31.000000000 -0700
22067+++ ruby/file.c 2007-03-24 08:40:08.000000000 -0600
22068@@ -2,8 +2,8 @@
22069
22070 file.c -
22071
22072- $Author$
22073- $Date$
22074+ $Author$
22075+ $Date$
22076 created at: Mon Nov 15 12:24:34 JST 1993
22077
22078 Copyright (C) 1993-2003 Yukihiro Matsumoto
22079@@ -2433,7 +2433,7 @@
22080 return last;
22081 }
22082
22083-char *
22084+static char *
22085 chompdirsep(path)
22086 const char *path;
22087 {
22088diff -ur ruby-1.8.6/gc.c ruby/gc.c
22089--- ruby-1.8.6/gc.c 2007-03-03 00:30:46.000000000 -0700
22090+++ ruby/gc.c 2007-03-03 00:28:54.000000000 -0700
22091@@ -3,7 +3,7 @@
22092 gc.c -
22093
22094 $Author$
22095- $Date$
22096+ $Date$
22097 created at: Tue Oct 5 09:44:46 JST 1993
22098
22099 Copyright (C) 1993-2003 Yukihiro Matsumoto
22100diff -ur ruby-1.8.6/intern.h ruby/intern.h
22101--- ruby-1.8.6/intern.h 2007-03-11 01:31:53.000000000 -0700
22102+++ ruby/intern.h 2007-03-10 20:09:30.000000000 -0700
22103@@ -2,8 +2,8 @@
22104
22105 intern.h -
22106
22107- $Author$
22108- $Date$
22109+ $Author$
22110+ $Date$
22111 created at: Thu Jun 10 14:22:17 JST 1993
22112
22113 Copyright (C) 1993-2003 Yukihiro Matsumoto
22114diff -ur ruby-1.8.6/io.c ruby/io.c
22115--- ruby-1.8.6/io.c 2007-02-12 23:21:47.000000000 -0700
22116+++ ruby/io.c 2007-04-04 09:42:16.000000000 -0600
22117@@ -2,8 +2,8 @@
22118
22119 io.c -
22120
22121- $Author$
22122- $Date$
22123+ $Author$
22124+ $Date$
22125 created at: Fri Oct 15 18:08:59 JST 1993
22126
22127 Copyright (C) 1993-2003 Yukihiro Matsumoto
22128@@ -1052,7 +1052,7 @@
22129 #endif
22130 }
22131
22132-long
22133+static long
22134 io_fread(ptr, len, fptr)
22135 char *ptr;
22136 long len;
22137@@ -3026,11 +3026,29 @@
22138 {
22139 int modef = rb_io_mode_flags(mode);
22140 OpenFile *fptr;
22141-
22142 #if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
22143 FILE *f;
22144+#else
22145+ int pid;
22146+#ifdef _WIN32
22147+ FILE *fpr, *fpw;
22148+#else
22149+ int pr[2], pw[2];
22150+#endif
22151+#endif
22152+ volatile int doexec;
22153
22154 if (!pname) pname = StringValueCStr(pstr);
22155+ doexec = (strcmp("-", pname) != 0);
22156+
22157+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32)
22158+ if (!doexec) {
22159+ rb_raise(rb_eNotImpError,
22160+ "fork() function is unimplemented on this machine");
22161+ }
22162+#endif
22163+
22164+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
22165 f = popen(pname, mode);
22166
22167 if (!f) rb_sys_fail(pname);
22168@@ -3052,10 +3070,6 @@
22169 }
22170 #else
22171 #ifdef _WIN32
22172- int pid;
22173- FILE *fpr, *fpw;
22174-
22175- if (!pname) pname = StringValueCStr(pstr);
22176 retry:
22177 pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
22178 if (pid == -1) { /* exec failed */
22179@@ -3085,16 +3099,10 @@
22180 return (VALUE)port;
22181 }
22182 #else
22183- int pid, pr[2], pw[2];
22184- volatile int doexec;
22185-
22186- if (!pname) pname = StringValueCStr(pstr);
22187-
22188 if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
22189 ((modef & FMODE_WRITABLE) && pipe(pw) == -1))
22190 rb_sys_fail(pname);
22191
22192- doexec = (strcmp("-", pname) != 0);
22193 if (!doexec) {
22194 fflush(stdin); /* is it really needed? */
22195 fflush(stdout);
22196diff -ur ruby-1.8.6/lib/cgi.rb ruby/lib/cgi.rb
22197--- ruby-1.8.6/lib/cgi.rb 2007-03-12 11:55:03.000000000 -0600
22198+++ ruby/lib/cgi.rb 2007-03-12 11:54:39.000000000 -0600
22199@@ -284,7 +284,7 @@
22200 # Standard internet newline sequence
22201 EOL = CR + LF
22202
22203- REVISION = '$Id$' #:nodoc:
22204+ REVISION = '$Id$' #:nodoc:
22205
22206 NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM)
22207
22208diff -ur ruby-1.8.6/lib/date/format.rb ruby/lib/date/format.rb
22209--- ruby-1.8.6/lib/date/format.rb 2007-02-24 01:09:04.000000000 -0700
22210+++ ruby/lib/date/format.rb 2007-04-14 18:20:12.000000000 -0600
22211@@ -1,5 +1,5 @@
22212 # format.rb: Written by Tadayoshi Funaba 1999-2007
22213-# $Id$
22214+# $Id$
22215
22216 require 'rational'
22217
22218@@ -40,16 +40,33 @@
22219 'r' => -5*3600, 's' => -6*3600, 't' => -7*3600, 'u' => -8*3600,
22220 'v' => -9*3600, 'w' =>-10*3600, 'x' =>-11*3600, 'y' =>-12*3600,
22221 'z' => 0*3600,
22222- 'utc' => 0*3600, 'wet' => 0*3600, 'bst' => 1*3600, 'wat' => -1*3600,
22223- 'at' => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
22224- 'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
22225- 'ahst'=>-10*3600, 'nt' =>-11*3600, 'idlw'=>-12*3600, 'cet' => 1*3600,
22226- 'met' => 1*3600, 'mewt'=> 1*3600, 'mest'=> 2*3600, 'mesz'=> 2*3600,
22227- 'swt' => 1*3600, 'sst' => 2*3600, 'fwt' => 1*3600, 'fst' => 2*3600,
22228- 'eet' => 2*3600, 'bt' => 3*3600, 'zp4' => 4*3600, 'zp5' => 5*3600,
22229- 'zp6' => 6*3600, 'wast'=> 7*3600, 'wadt'=> 8*3600, 'cct' => 8*3600,
22230- 'jst' => 9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
22231- 'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600,
22232+
22233+ 'utc' => 0*3600, 'wet' => 0*3600,
22234+ 'at' => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
22235+ 'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
22236+ 'nst' => -(3*3600+1800),
22237+ 'ast' => -4*3600, 'clt' => -4*3600,
22238+ 'akdt'=> -8*3600, 'ydt' => -8*3600,
22239+ 'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
22240+ 'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
22241+ 'nt' =>-11*3600,
22242+ 'idlw'=>-12*3600,
22243+ 'bst' => 1*3600, 'cet' => 1*3600, 'fwt' => 1*3600, 'met' => 1*3600,
22244+ 'mewt'=> 1*3600, 'mez' => 1*3600, 'swt' => 1*3600, 'wat' => 1*3600,
22245+ 'west'=> 1*3600,
22246+ 'cest'=> 2*3600, 'eet' => 2*3600, 'fst' => 2*3600, 'mest'=> 2*3600,
22247+ 'mesz'=> 2*3600, 'sast'=> 2*3600, 'sst' => 2*3600,
22248+ 'bt' => 3*3600, 'eat' => 3*3600, 'eest'=> 3*3600, 'msk' => 3*3600,
22249+ 'msd' => 4*3600, 'zp4' => 4*3600,
22250+ 'zp5' => 5*3600, 'ist' => (5*3600+1800),
22251+ 'zp6' => 6*3600,
22252+ 'wast'=> 7*3600,
22253+ 'cct' => 8*3600, 'sgt' => 8*3600, 'wadt'=> 8*3600,
22254+ 'jst' => 9*3600, 'kst' => 9*3600,
22255+ 'east'=> 10*3600, 'gst' => 10*3600,
22256+ 'eadt'=> 11*3600,
22257+ 'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
22258+ 'nzdt'=> 13*3600,
22259
22260 'afghanistan' => 16200, 'alaskan' => -32400,
22261 'arab' => 10800, 'arabian' => 14400,
22262@@ -842,23 +859,16 @@
22263 end
22264 end
22265
22266- def self._parse_sla_ja(str, e) # :nodoc:
22267- if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
22268- s3e(e, $1, $2, $3)
22269- true
22270- end
22271- end
22272-
22273- def self._parse_sla_eu(str, e) # :nodoc:
22274- if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
22275- s3e(e, $3, $2, $1)
22276+ def self._parse_sla(str, e) # :nodoc:
22277+ if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
22278+ s3e(e, $3, $1, $2)
22279 true
22280 end
22281 end
22282
22283- def self._parse_sla_us(str, e) # :nodoc:
22284- if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
22285- s3e(e, $3, $1, $2)
22286+ def self._parse_dot(str, e) # :nodoc:
22287+ if str.sub!(%r|('?-?\d+)\.\s*('?\d+)[^\d]\s*('?-?\d+)|n, ' ') # '
22288+ s3e(e, $1, $2, $3)
22289 true
22290 end
22291 end
22292@@ -952,7 +962,7 @@
22293 private_class_method :_parse_day, :_parse_time, :_parse_beat,
22294 :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
22295 :_parse_jis, :_parse_vms,
22296- :_parse_sla_ja, :_parse_sla_eu, :_parse_sla_us,
22297+ :_parse_sla, :_parse_dot,
22298 :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
22299
22300 def self._parse(str, comp=false)
22301@@ -972,7 +982,8 @@
22302 _parse_iso(str, e) ||
22303 _parse_jis(str, e) ||
22304 _parse_vms(str, e) ||
22305- _parse_sla_us(str, e) ||
22306+ _parse_sla(str, e) ||
22307+ _parse_dot(str, e) ||
22308 _parse_iso2(str, e) ||
22309 _parse_year(str, e) ||
22310 _parse_mon(str, e) ||
22311diff -ur ruby-1.8.6/lib/matrix.rb ruby/lib/matrix.rb
22312--- ruby-1.8.6/lib/matrix.rb 2007-02-12 16:01:19.000000000 -0700
22313+++ ruby/lib/matrix.rb 2007-03-19 20:29:09.000000000 -0600
22314@@ -590,15 +590,21 @@
22315 a = src.to_a
22316
22317 for k in 0..size
22318- if (akk = a[k][k]) == 0
22319- i = k
22320- begin
22321- Matrix.Raise ErrNotRegular if (i += 1) > size
22322- end while a[i][k] == 0
22323+ i = k
22324+ akk = a[k][k].abs
22325+ for j in (k+1)..size
22326+ v = a[j][k].abs
22327+ if v > akk
22328+ i = j
22329+ akk = v
22330+ end
22331+ end
22332+ Matrix.Raise ErrNotRegular if akk == 0
22333+ if i != k
22334 a[i], a[k] = a[k], a[i]
22335 @rows[i], @rows[k] = @rows[k], @rows[i]
22336- akk = a[k][k]
22337 end
22338+ akk = a[k][k]
22339
22340 for i in 0 .. size
22341 next if i == k
22342diff -ur ruby-1.8.6/lib/mkmf.rb ruby/lib/mkmf.rb
22343--- ruby-1.8.6/lib/mkmf.rb 2007-02-28 06:23:42.000000000 -0700
22344+++ ruby/lib/mkmf.rb 2007-04-23 07:08:29.000000000 -0600
22345@@ -291,7 +291,12 @@
22346
22347 def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
22348 libpath.map{|x|
22349- (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote
22350+ case x
22351+ when "$(topdir)", /\A\./
22352+ LIBPATHFLAG
22353+ else
22354+ LIBPATHFLAG+RPATHFLAG
22355+ end % x.quote
22356 }.join
22357 end
22358
22359@@ -1425,6 +1430,7 @@
22360 $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
22361 $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
22362 $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
22363+ $DEFLIBPATH.unshift(".")
22364 $LIBPATH = []
22365 $INSTALLFILES = nil
22366
22367@@ -1516,8 +1522,8 @@
22368 if CONFIG["DLEXT"] == $OBJEXT
22369 "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
22370 else
22371- "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$@ " \
22372- "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
22373+ "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
22374+ "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
22375 end
22376 LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
22377 RPATHFLAG = config_string('RPATHFLAG') || ''
22378diff -ur ruby-1.8.6/lib/monitor.rb ruby/lib/monitor.rb
22379--- ruby-1.8.6/lib/monitor.rb 2007-02-12 16:01:19.000000000 -0700
22380+++ ruby/lib/monitor.rb 2007-04-18 23:52:49.000000000 -0600
22381@@ -105,14 +105,17 @@
22382 return false
22383 ensure
22384 Thread.critical = true
22385- if timer && timer.alive?
22386- Thread.kill(timer)
22387+ begin
22388+ if timer && timer.alive?
22389+ Thread.kill(timer)
22390+ end
22391+ if @waiters.include?(Thread.current) # interrupted?
22392+ @waiters.delete(Thread.current)
22393+ end
22394+ @monitor.instance_eval {mon_enter_for_cond(count)}
22395+ ensure
22396+ Thread.critical = false
22397 end
22398- if @waiters.include?(Thread.current) # interrupted?
22399- @waiters.delete(Thread.current)
22400- end
22401- @monitor.instance_eval {mon_enter_for_cond(count)}
22402- Thread.critical = false
22403 end
22404 end
22405
22406@@ -210,6 +213,7 @@
22407 Thread.critical = true
22408 mon_acquire(@mon_entering_queue)
22409 @mon_count += 1
22410+ ensure
22411 Thread.critical = false
22412 end
22413
22414@@ -299,8 +303,9 @@
22415 def mon_exit_for_cond
22416 count = @mon_count
22417 @mon_count = 0
22418- mon_release
22419 return count
22420+ ensure
22421+ mon_release
22422 end
22423 end
22424
22425diff -ur ruby-1.8.6/lib/net/imap.rb ruby/lib/net/imap.rb
22426--- ruby-1.8.6/lib/net/imap.rb 2007-02-12 16:01:19.000000000 -0700
22427+++ ruby/lib/net/imap.rb 2007-04-08 18:29:48.000000000 -0600
22428@@ -284,7 +284,11 @@
22429
22430 # Disconnects from the server.
22431 def disconnect
22432- @sock.shutdown unless @usessl
22433+ if SSL::SSLSocket === @sock
22434+ @sock.io.shutdown
22435+ else
22436+ @sock.shutdown
22437+ end
22438 @receiver_thread.join
22439 @sock.close
22440 end
22441diff -ur ruby-1.8.6/lib/net/protocol.rb ruby/lib/net/protocol.rb
22442--- ruby-1.8.6/lib/net/protocol.rb 2007-02-12 16:01:19.000000000 -0700
22443+++ ruby/lib/net/protocol.rb 2007-03-18 20:39:22.000000000 -0600
22444@@ -11,7 +11,7 @@
22445 # modify this program under the same terms as Ruby itself,
22446 # Ruby Distribute License or GNU General Public License.
22447 #
22448-# $Id$
22449+# $Id$
22450 #++
22451 #
22452 # WARNING: This file is going to remove.
22453@@ -128,9 +128,11 @@
22454
22455 private
22456
22457+ BUFSIZE = 1024 * 16
22458+
22459 def rbuf_fill
22460 timeout(@read_timeout) {
22461- @rbuf << @io.sysread(1024)
22462+ @rbuf << @io.sysread(BUFSIZE)
22463 }
22464 end
22465
22466diff -ur ruby-1.8.6/lib/optparse.rb ruby/lib/optparse.rb
22467--- ruby-1.8.6/lib/optparse.rb 2007-02-19 23:53:16.000000000 -0700
22468+++ ruby/lib/optparse.rb 2007-04-19 21:26:19.000000000 -0600
22469@@ -203,7 +203,7 @@
22470 #
22471 class OptionParser
22472 # :stopdoc:
22473- RCSID = %w$Id$[1..-1].each {|s| s.freeze}.freeze
22474+ RCSID = %w$Id$[1..-1].each {|s| s.freeze}.freeze
22475 Version = (RCSID[1].split('.').collect {|s| s.to_i}.extend(Comparable).freeze if RCSID[1])
22476 LastModified = (Time.gm(*RCSID[2, 2].join('-').scan(/\d+/).collect {|s| s.to_i}) if RCSID[2])
22477 Release = RCSID[2]
22478@@ -1077,7 +1077,7 @@
22479 # directly specified pattern(any object possible to match)
22480 if !(String === o) and o.respond_to?(:match)
22481 pattern = notwice(o, pattern, 'pattern')
22482- conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
22483+ conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
22484 next
22485 end
22486
22487@@ -1090,7 +1090,7 @@
22488 when CompletingHash
22489 when nil
22490 pattern = CompletingHash.new
22491- conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
22492+ conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
22493 else
22494 raise ArgumentError, "argument pattern given twice"
22495 end
22496diff -ur ruby-1.8.6/lib/set.rb ruby/lib/set.rb
22497--- ruby-1.8.6/lib/set.rb 2007-03-03 09:06:45.000000000 -0700
22498+++ ruby/lib/set.rb 2007-03-03 09:06:02.000000000 -0700
22499@@ -9,7 +9,7 @@
22500 # All rights reserved. You can redistribute and/or modify it under the same
22501 # terms as Ruby.
22502 #
22503-# $Id$
22504+# $Id$
22505 #
22506 # == Overview
22507 #
22508diff -ur ruby-1.8.6/lib/shell/process-controller.rb ruby/lib/shell/process-controller.rb
22509--- ruby-1.8.6/lib/shell/process-controller.rb 2007-03-06 03:12:12.000000000 -0700
22510+++ ruby/lib/shell/process-controller.rb 2007-03-06 02:59:25.000000000 -0700
22511@@ -1,8 +1,8 @@
22512 #
22513 # shell/process-controller.rb -
22514 # $Release Version: 0.6.0 $
22515-# $Revision$
22516-# $Date$
22517+# $Revision$
22518+# $Date$
22519 # by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
22520 #
22521 # --
22522diff -ur ruby-1.8.6/lib/uri/ftp.rb ruby/lib/uri/ftp.rb
22523--- ruby-1.8.6/lib/uri/ftp.rb 2007-02-15 04:36:28.000000000 -0700
22524+++ ruby/lib/uri/ftp.rb 2007-02-15 04:36:01.000000000 -0700
22525@@ -3,7 +3,7 @@
22526 #
22527 # Author:: Akira Yamada <akira@ruby-lang.org>
22528 # License:: You can redistribute it and/or modify it under the same term as Ruby.
22529-# Revision:: $Id$
22530+# Revision:: $Id$
22531 #
22532
22533 require 'uri/generic'
22534diff -ur ruby-1.8.6/lib/xmlrpc/client.rb ruby/lib/xmlrpc/client.rb
22535--- ruby-1.8.6/lib/xmlrpc/client.rb 2007-02-22 20:47:59.000000000 -0700
22536+++ ruby/lib/xmlrpc/client.rb 2007-02-22 20:45:55.000000000 -0700
22537@@ -268,7 +268,7 @@
22538
22539
22540 = History
22541- $Id$
22542+ $Id$
22543
22544 =end
22545
22546diff -ur ruby-1.8.6/lib/xmlrpc/create.rb ruby/lib/xmlrpc/create.rb
22547--- ruby-1.8.6/lib/xmlrpc/create.rb 2007-02-22 20:47:59.000000000 -0700
22548+++ ruby/lib/xmlrpc/create.rb 2007-02-22 20:45:55.000000000 -0700
22549@@ -3,7 +3,7 @@
22550 #
22551 # Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
22552 #
22553-# $Id$
22554+# $Id$
22555 #
22556
22557 require "date"
22558diff -ur ruby-1.8.6/lib/yaml/tag.rb ruby/lib/yaml/tag.rb
22559--- ruby-1.8.6/lib/yaml/tag.rb 2007-02-12 16:01:19.000000000 -0700
22560+++ ruby/lib/yaml/tag.rb 2007-04-26 11:06:54.000000000 -0600
22561@@ -1,5 +1,5 @@
22562 # -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
22563-# $Id$
22564+# $Id$
22565 #
22566 # = yaml/tag.rb: methods for associating a taguri to a class.
22567 #
22568@@ -51,12 +51,11 @@
22569 end
22570
22571 class Module
22572- # :stopdoc:
22573
22574 # Adds a taguri _tag_ to a class, used when dumping or loading the class
22575 # in YAML. See YAML::tag_class for detailed information on typing and
22576 # taguris.
22577- def yaml_as( tag, sc = true )
22578+ def yaml_as( tag, sc = true ) # :nodoc:
22579 verbose, $VERBOSE = $VERBOSE, nil
22580 class_eval <<-"end;", __FILE__, __LINE__+1
22581 attr_writer :taguri
22582@@ -80,12 +79,12 @@
22583 end
22584 # Transforms the subclass name into a name suitable for display
22585 # in a subclassed tag.
22586- def yaml_tag_class_name
22587+ def yaml_tag_class_name # :nodoc:
22588 self.name
22589 end
22590 # Transforms the subclass name found in the tag into a Ruby
22591 # constant name.
22592- def yaml_tag_read_class( name )
22593+ def yaml_tag_read_class( name ) # :nodoc:
22594 name
22595 end
22596 end
22597diff -ur ruby-1.8.6/marshal.c ruby/marshal.c
22598--- ruby-1.8.6/marshal.c 2007-02-12 16:01:19.000000000 -0700
22599+++ ruby/marshal.c 2007-03-20 08:08:05.000000000 -0600
22600@@ -2,8 +2,8 @@
22601
22602 marshal.c -
22603
22604- $Author$
22605- $Date$
22606+ $Author$
22607+ $Date$
22608 created at: Thu Apr 27 16:30:01 JST 1995
22609
22610 Copyright (C) 1993-2003 Yukihiro Matsumoto
22611@@ -373,8 +373,8 @@
22612 {
22613 char *path;
22614
22615- if (FL_TEST(klass, FL_SINGLETON)) {
22616- if (check && RCLASS(klass)->m_tbl->num_entries ||
22617+ if (check && FL_TEST(klass, FL_SINGLETON)) {
22618+ if (RCLASS(klass)->m_tbl->num_entries ||
22619 (RCLASS(klass)->iv_tbl && RCLASS(klass)->iv_tbl->num_entries > 1)) {
22620 rb_raise(rb_eTypeError, "singleton can't be dumped");
22621 }
22622@@ -652,13 +652,13 @@
22623 {
22624 VALUE v;
22625
22626- w_class(TYPE_DATA, obj, arg, Qtrue);
22627 if (!rb_respond_to(obj, s_dump_data)) {
22628 rb_raise(rb_eTypeError,
22629 "no marshal_dump is defined for class %s",
22630 rb_obj_classname(obj));
22631 }
22632 v = rb_funcall(obj, s_dump_data, 0);
22633+ w_class(TYPE_DATA, obj, arg, Qtrue);
22634 w_object(v, arg, limit);
22635 }
22636 break;
22637diff -ur ruby-1.8.6/misc/inf-ruby.el ruby/misc/inf-ruby.el
22638--- ruby-1.8.6/misc/inf-ruby.el 2007-03-11 04:05:02.000000000 -0600
22639+++ ruby/misc/inf-ruby.el 2007-03-11 04:01:15.000000000 -0600
22640@@ -1,8 +1,8 @@
22641 ;;; -*-Emacs-Lisp-*-
22642 ;;;
22643-;;; $Id$
22644+;;; $Id$
22645 ;;; $Author$
22646-;;; $Date$
22647+;;; $Date$
22648 ;;;
22649 ;;; Inferior Ruby Mode - ruby process in a buffer.
22650 ;;; adapted from cmuscheme.el
22651diff -ur ruby-1.8.6/misc/ruby-mode.el ruby/misc/ruby-mode.el
22652--- ruby-1.8.6/misc/ruby-mode.el 2007-03-11 04:05:02.000000000 -0600
22653+++ ruby/misc/ruby-mode.el 2007-03-11 04:01:15.000000000 -0600
22654@@ -2,11 +2,11 @@
22655 ;;; ruby-mode.el -
22656 ;;;
22657 ;;; $Author$
22658-;;; $Date$
22659+;;; $Date$
22660 ;;; created at: Fri Feb 4 14:49:13 JST 1994
22661 ;;;
22662
22663-(defconst ruby-mode-revision "$Revision$")
22664+(defconst ruby-mode-revision "$Revision$")
22665
22666 (defconst ruby-mode-version
22667 (progn
22668Only in ruby/misc: ruby-style.el
22669diff -ur ruby-1.8.6/NEWS ruby/NEWS
22670--- ruby-1.8.6/NEWS 2007-03-06 03:12:12.000000000 -0700
22671+++ ruby/NEWS 2007-03-17 13:28:37.000000000 -0600
22672@@ -1,7 +1,7 @@
22673 = NEWS
22674
22675 This document is a list of user visible feature changes made between
22676-releases excluding bug fixes.
22677+releases except for bug fixes.
22678
22679 Note that each entry is kept so brief that no reason behind or
22680 reference information is supplied with. For a full list of changes
22681@@ -29,6 +29,11 @@
22682
22683 * Support for autoloading.
22684
22685+ require 'digest'
22686+
22687+ # autoloads digest/md5
22688+ md = Digest::MD5.digest("string")
22689+
22690 * See below for new features and compatibility issues.
22691
22692 * nkf
22693@@ -63,9 +68,8 @@
22694
22695 * New digest class methods: file
22696
22697- * New digest instance methods: clone, reset, new,
22698- inspect, digest_length (alias size or length),
22699- block_length()
22700+ * New digest instance methods: clone, reset, new, inspect,
22701+ digest_length (alias size or length), block_length()
22702
22703 * New library: digest/bubblebabble
22704
22705@@ -77,9 +81,9 @@
22706
22707 * thread
22708
22709- * Replaced with much faster mutex implementation in C.
22710- The former implementation is available with a
22711- configure option `--disable-fastthread'.
22712+ * Replaced with much faster mutex implementation in C. The former
22713+ implementation, which is slow but considered to be stable, is
22714+ available with a configure option `--disable-fastthread'.
22715
22716 * webrick
22717
22718@@ -92,17 +96,17 @@
22719 * String#intern now raises SecurityError when $SAFE level is greater
22720 than zero.
22721
22722-* fileutils
22723+* date
22724
22725- * A minor implementation change breaks Rake <=0.7.1.
22726- Updating Rake to 0.7.2 fixes the problem.
22727+ * Time#to_date and Time#to_datetime are added as private methods.
22728+ They cause name conflict error in ActiveSupport 1.4.1 and prior,
22729+ which comes with Rails 1.2.2 and prior. Updating ActiveSupport
22730+ and/or Rails to the latest versions fixes the problem.
22731
22732 * digest
22733
22734- * The constructor does no longer take an initial
22735- string to feed; digest() and hexdigest() now do,
22736- instead. The following examples show how to
22737- migrate:
22738+ * The constructor does no longer take an initial string to feed.
22739+ The following examples show how to migrate:
22740
22741 # Before
22742 md = Digest::MD5.new("string")
22743@@ -113,3 +117,8 @@
22744 hd = Digest::MD5.new("string").hexdigest
22745 # After (works with any version)
22746 hd = Digest::MD5.hexdigest("string")
22747+
22748+* fileutils
22749+
22750+ * A minor implementation change breaks Rake <=0.7.1.
22751+ Updating Rake to 0.7.2 or higher fixes the problem.
22752diff -ur ruby-1.8.6/node.h ruby/node.h
22753--- ruby-1.8.6/node.h 2007-02-12 16:01:19.000000000 -0700
22754+++ ruby/node.h 2007-03-24 08:40:08.000000000 -0600
22755@@ -2,8 +2,8 @@
22756
22757 node.h -
22758
22759- $Author$
22760- $Date$
22761+ $Author$
22762+ $Date$
22763 created at: Fri May 28 15:14:02 JST 1993
22764
22765 Copyright (C) 1993-2003 Yukihiro Matsumoto
22766@@ -338,8 +338,8 @@
22767 #define NOEX_PUBLIC 0
22768 #define NOEX_NOSUPER 1
22769 #define NOEX_PRIVATE 2
22770-#define NOEX_PROTECTED 4
22771-#define NOEX_MASK 6
22772+#define NOEX_PROTECTED 4
22773+#define NOEX_MASK 6
22774
22775 #define NOEX_UNDEF NOEX_NOSUPER
22776
22777@@ -390,17 +390,17 @@
22778 typedef jmp_buf rb_jmpbuf_t;
22779 #endif
22780
22781-enum thread_status {
22782+enum rb_thread_status {
22783 THREAD_TO_KILL,
22784 THREAD_RUNNABLE,
22785 THREAD_STOPPED,
22786 THREAD_KILLED,
22787 };
22788
22789-typedef struct thread * rb_thread_t;
22790+typedef struct rb_thread *rb_thread_t;
22791
22792-struct thread {
22793- struct thread *next, *prev;
22794+struct rb_thread {
22795+ rb_thread_t next, prev;
22796 rb_jmpbuf_t context;
22797 #if (defined _WIN32 && !defined _WIN32_WCE) || defined __CYGWIN__
22798 unsigned long win32_exception_list;
22799@@ -441,7 +441,7 @@
22800
22801 int safe;
22802
22803- enum thread_status status;
22804+ enum rb_thread_status status;
22805 int wait_for;
22806 int fd;
22807 fd_set readfds;
22808@@ -455,17 +455,17 @@
22809 int priority;
22810 VALUE thgroup;
22811
22812- st_table *locals;
22813+ struct st_table *locals;
22814
22815 VALUE thread;
22816
22817 VALUE sandbox;
22818 };
22819
22820-extern VALUE (*ruby_sandbox_save)(struct thread *);
22821-extern VALUE (*ruby_sandbox_restore)(struct thread *);
22822-extern rb_thread_t curr_thread;
22823-extern rb_thread_t main_thread;
22824+extern VALUE (*ruby_sandbox_save)_((rb_thread_t));
22825+extern VALUE (*ruby_sandbox_restore)_((rb_thread_t));
22826+extern rb_thread_t rb_curr_thread;
22827+extern rb_thread_t rb_main_thread;
22828
22829 #if defined(__cplusplus)
22830 } /* extern "C" { */
22831diff -ur ruby-1.8.6/numeric.c ruby/numeric.c
22832--- ruby-1.8.6/numeric.c 2007-02-22 21:24:16.000000000 -0700
22833+++ ruby/numeric.c 2007-02-22 21:04:14.000000000 -0700
22834@@ -3,7 +3,7 @@
22835 numeric.c -
22836
22837 $Author$
22838- $Date$
22839+ $Date$
22840 created at: Fri Aug 13 18:33:09 JST 1993
22841
22842 Copyright (C) 1993-2003 Yukihiro Matsumoto
22843diff -ur ruby-1.8.6/object.c ruby/object.c
22844--- ruby-1.8.6/object.c 2007-03-03 00:09:24.000000000 -0700
22845+++ ruby/object.c 2007-03-03 00:07:44.000000000 -0700
22846@@ -3,7 +3,7 @@
22847 object.c -
22848
22849 $Author$
22850- $Date$
22851+ $Date$
22852 created at: Thu Jul 15 12:01:24 JST 1993
22853
22854 Copyright (C) 1993-2003 Yukihiro Matsumoto
22855diff -ur ruby-1.8.6/pack.c ruby/pack.c
22856--- ruby-1.8.6/pack.c 2007-02-28 05:05:21.000000000 -0700
22857+++ ruby/pack.c 2007-02-28 05:05:06.000000000 -0700
22858@@ -3,7 +3,7 @@
22859 pack.c -
22860
22861 $Author$
22862- $Date$
22863+ $Date$
22864 created at: Thu Feb 10 15:17:05 JST 1994
22865
22866 Copyright (C) 1993-2003 Yukihiro Matsumoto
22867diff -ur ruby-1.8.6/parse.c ruby/parse.c
22868--- ruby-1.8.6/parse.c 2007-03-12 13:19:06.000000000 -0600
22869+++ ruby/parse.c 2007-04-28 13:00:48.000000000 -0600
22870@@ -1,9 +1,7 @@
22871-/* A Bison parser, made by GNU Bison 2.3. */
22872+/* A Bison parser, made by GNU Bison 1.875d. */
22873
22874-/* Skeleton implementation for Bison's Yacc-like parsers in C
22875-
22876- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
22877- Free Software Foundation, Inc.
22878+/* Skeleton parser for Yacc-like parsing with Bison,
22879+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
22880
22881 This program is free software; you can redistribute it and/or modify
22882 it under the terms of the GNU General Public License as published by
22883@@ -17,24 +15,16 @@
22884
22885 You should have received a copy of the GNU General Public License
22886 along with this program; if not, write to the Free Software
22887- Foundation, Inc., 51 Franklin Street, Fifth Floor,
22888- Boston, MA 02110-1301, USA. */
22889-
22890-/* As a special exception, you may create a larger work that contains
22891- part or all of the Bison parser skeleton and distribute that work
22892- under terms of your choice, so long as that work isn't itself a
22893- parser generator using the skeleton or a modified version thereof
22894- as a parser skeleton. Alternatively, if you modify or redistribute
22895- the parser skeleton itself, you may (at your option) remove this
22896- special exception, which will cause the skeleton and the resulting
22897- Bison output files to be licensed under the GNU General Public
22898- License without this special exception.
22899+ Foundation, Inc., 59 Temple Place - Suite 330,
22900+ Boston, MA 02111-1307, USA. */
22901
22902- This special exception was added by the Free Software Foundation in
22903- version 2.2 of Bison. */
22904+/* As a special exception, when this file is copied by Bison into a
22905+ Bison output file, you may use that output file without restriction.
22906+ This special exception was added by the Free Software Foundation
22907+ in version 1.24 of Bison. */
22908
22909-/* C LALR(1) parser skeleton written by Richard Stallman, by
22910- simplifying the original so-called "semantic" parser. */
22911+/* Written by Richard Stallman by simplifying the original so called
22912+ ``semantic'' parser. */
22913
22914 /* All symbols defined below should begin with yy or YY, to avoid
22915 infringing on user name space. This should be done even for local
22916@@ -46,9 +36,6 @@
22917 /* Identify Bison output. */
22918 #define YYBISON 1
22919
22920-/* Bison version. */
22921-#define YYBISON_VERSION "2.3"
22922-
22923 /* Skeleton name. */
22924 #define YYSKELETON_NAME "yacc.c"
22925
22926@@ -170,7 +157,6 @@
22927 tLAST_TOKEN = 359
22928 };
22929 #endif
22930-/* Tokens. */
22931 #define kCLASS 258
22932 #define kMODULE 259
22933 #define kDEF 260
22934@@ -488,23 +474,16 @@
22935 # define YYERROR_VERBOSE 0
22936 #endif
22937
22938-/* Enabling the token table. */
22939-#ifndef YYTOKEN_TABLE
22940-# define YYTOKEN_TABLE 0
22941-#endif
22942-
22943-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
22944-typedef union YYSTYPE
22945+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
22946 #line 209 "parse.y"
22947-{
22948+typedef union YYSTYPE {
22949 NODE *node;
22950 ID id;
22951 int num;
22952 struct RVarmap *vars;
22953-}
22954-/* Line 187 of yacc.c. */
22955-#line 507 "parse.c"
22956- YYSTYPE;
22957+} YYSTYPE;
22958+/* Line 191 of yacc.c. */
22959+#line 487 "parse.c"
22960 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
22961 # define YYSTYPE_IS_DECLARED 1
22962 # define YYSTYPE_IS_TRIVIAL 1
22963@@ -515,171 +494,56 @@
22964 /* Copy the second part of user declarations. */
22965
22966
22967-/* Line 216 of yacc.c. */
22968-#line 520 "parse.c"
22969+/* Line 214 of yacc.c. */
22970+#line 499 "parse.c"
22971
22972-#ifdef short
22973-# undef short
22974-#endif
22975-
22976-#ifdef YYTYPE_UINT8
22977-typedef YYTYPE_UINT8 yytype_uint8;
22978-#else
22979-typedef unsigned char yytype_uint8;
22980-#endif
22981-
22982-#ifdef YYTYPE_INT8
22983-typedef YYTYPE_INT8 yytype_int8;
22984-#elif (defined __STDC__ || defined __C99__FUNC__ \
22985- || defined __cplusplus || defined _MSC_VER)
22986-typedef signed char yytype_int8;
22987-#else
22988-typedef short int yytype_int8;
22989-#endif
22990-
22991-#ifdef YYTYPE_UINT16
22992-typedef YYTYPE_UINT16 yytype_uint16;
22993-#else
22994-typedef unsigned short int yytype_uint16;
22995-#endif
22996-
22997-#ifdef YYTYPE_INT16
22998-typedef YYTYPE_INT16 yytype_int16;
22999-#else
23000-typedef short int yytype_int16;
23001-#endif
23002+#if ! defined (yyoverflow) || YYERROR_VERBOSE
23003
23004-#ifndef YYSIZE_T
23005-# ifdef __SIZE_TYPE__
23006-# define YYSIZE_T __SIZE_TYPE__
23007-# elif defined size_t
23008-# define YYSIZE_T size_t
23009-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
23010- || defined __cplusplus || defined _MSC_VER)
23011-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
23012-# define YYSIZE_T size_t
23013-# else
23014-# define YYSIZE_T unsigned int
23015-# endif
23016-#endif
23017-
23018-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
23019-
23020-#ifndef YY_
23021-# if YYENABLE_NLS
23022-# if ENABLE_NLS
23023-# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
23024-# define YY_(msgid) dgettext ("bison-runtime", msgid)
23025-# endif
23026+# ifndef YYFREE
23027+# define YYFREE free
23028 # endif
23029-# ifndef YY_
23030-# define YY_(msgid) msgid
23031+# ifndef YYMALLOC
23032+# define YYMALLOC malloc
23033 # endif
23034-#endif
23035-
23036-/* Suppress unused-variable warnings by "using" E. */
23037-#if ! defined lint || defined __GNUC__
23038-# define YYUSE(e) ((void) (e))
23039-#else
23040-# define YYUSE(e) /* empty */
23041-#endif
23042-
23043-/* Identity function, used to suppress warnings about constant conditions. */
23044-#ifndef lint
23045-# define YYID(n) (n)
23046-#else
23047-#if (defined __STDC__ || defined __C99__FUNC__ \
23048- || defined __cplusplus || defined _MSC_VER)
23049-static int
23050-YYID (int i)
23051-#else
23052-static int
23053-YYID (i)
23054- int i;
23055-#endif
23056-{
23057- return i;
23058-}
23059-#endif
23060-
23061-#if ! defined yyoverflow || YYERROR_VERBOSE
23062
23063 /* The parser invokes alloca or malloc; define the necessary symbols. */
23064
23065 # ifdef YYSTACK_USE_ALLOCA
23066 # if YYSTACK_USE_ALLOCA
23067+# define YYSTACK_ALLOC alloca
23068+# endif
23069+# else
23070+# if defined (alloca) || defined (_ALLOCA_H)
23071+# define YYSTACK_ALLOC alloca
23072+# else
23073 # ifdef __GNUC__
23074 # define YYSTACK_ALLOC __builtin_alloca
23075-# elif defined __BUILTIN_VA_ARG_INCR
23076-# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
23077-# elif defined _AIX
23078-# define YYSTACK_ALLOC __alloca
23079-# elif defined _MSC_VER
23080-# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
23081-# define alloca _alloca
23082-# else
23083-# define YYSTACK_ALLOC alloca
23084-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
23085- || defined __cplusplus || defined _MSC_VER)
23086-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
23087-# ifndef _STDLIB_H
23088-# define _STDLIB_H 1
23089-# endif
23090-# endif
23091 # endif
23092 # endif
23093 # endif
23094
23095 # ifdef YYSTACK_ALLOC
23096- /* Pacify GCC's `empty if-body' warning. */
23097-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
23098-# ifndef YYSTACK_ALLOC_MAXIMUM
23099- /* The OS might guarantee only one guard page at the bottom of the stack,
23100- and a page size can be as small as 4096 bytes. So we cannot safely
23101- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
23102- to allow for a few compiler-allocated temporary stack slots. */
23103-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
23104-# endif
23105+ /* Pacify GCC's `empty if-body' warning. */
23106+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
23107 # else
23108-# define YYSTACK_ALLOC YYMALLOC
23109-# define YYSTACK_FREE YYFREE
23110-# ifndef YYSTACK_ALLOC_MAXIMUM
23111-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
23112-# endif
23113-# if (defined __cplusplus && ! defined _STDLIB_H \
23114- && ! ((defined YYMALLOC || defined malloc) \
23115- && (defined YYFREE || defined free)))
23116+# if defined (__STDC__) || defined (__cplusplus)
23117 # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
23118-# ifndef _STDLIB_H
23119-# define _STDLIB_H 1
23120-# endif
23121-# endif
23122-# ifndef YYMALLOC
23123-# define YYMALLOC malloc
23124-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
23125- || defined __cplusplus || defined _MSC_VER)
23126-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
23127-# endif
23128-# endif
23129-# ifndef YYFREE
23130-# define YYFREE free
23131-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
23132- || defined __cplusplus || defined _MSC_VER)
23133-void free (void *); /* INFRINGES ON USER NAME SPACE */
23134-# endif
23135+# define YYSIZE_T size_t
23136 # endif
23137+# define YYSTACK_ALLOC YYMALLOC
23138+# define YYSTACK_FREE YYFREE
23139 # endif
23140-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
23141+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
23142
23143
23144-#if (! defined yyoverflow \
23145- && (! defined __cplusplus \
23146- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
23147+#if (! defined (yyoverflow) \
23148+ && (! defined (__cplusplus) \
23149+ || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
23150
23151 /* A type that is properly aligned for any stack member. */
23152 union yyalloc
23153 {
23154- yytype_int16 yyss;
23155+ short int yyss;
23156 YYSTYPE yyvs;
23157 };
23158
23159@@ -689,24 +553,24 @@
23160 /* The size of an array large to enough to hold all stacks, each with
23161 N elements. */
23162 # define YYSTACK_BYTES(N) \
23163- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
23164+ ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
23165 + YYSTACK_GAP_MAXIMUM)
23166
23167 /* Copy COUNT objects from FROM to TO. The source and destination do
23168 not overlap. */
23169 # ifndef YYCOPY
23170-# if defined __GNUC__ && 1 < __GNUC__
23171+# if defined (__GNUC__) && 1 < __GNUC__
23172 # define YYCOPY(To, From, Count) \
23173 __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
23174 # else
23175 # define YYCOPY(To, From, Count) \
23176 do \
23177 { \
23178- YYSIZE_T yyi; \
23179+ register YYSIZE_T yyi; \
23180 for (yyi = 0; yyi < (Count); yyi++) \
23181 (To)[yyi] = (From)[yyi]; \
23182 } \
23183- while (YYID (0))
23184+ while (0)
23185 # endif
23186 # endif
23187
23188@@ -724,33 +588,39 @@
23189 yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
23190 yyptr += yynewbytes / sizeof (*yyptr); \
23191 } \
23192- while (YYID (0))
23193+ while (0)
23194+
23195+#endif
23196
23197+#if defined (__STDC__) || defined (__cplusplus)
23198+ typedef signed char yysigned_char;
23199+#else
23200+ typedef short int yysigned_char;
23201 #endif
23202
23203-/* YYFINAL -- State number of the termination state. */
23204+/* YYFINAL -- State number of the termination state. */
23205 #define YYFINAL 3
23206 /* YYLAST -- Last index in YYTABLE. */
23207 #define YYLAST 9550
23208
23209-/* YYNTOKENS -- Number of terminals. */
23210+/* YYNTOKENS -- Number of terminals. */
23211 #define YYNTOKENS 132
23212-/* YYNNTS -- Number of nonterminals. */
23213+/* YYNNTS -- Number of nonterminals. */
23214 #define YYNNTS 144
23215-/* YYNRULES -- Number of rules. */
23216+/* YYNRULES -- Number of rules. */
23217 #define YYNRULES 501
23218-/* YYNRULES -- Number of states. */
23219+/* YYNRULES -- Number of states. */
23220 #define YYNSTATES 895
23221
23222 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
23223 #define YYUNDEFTOK 2
23224 #define YYMAXUTOK 359
23225
23226-#define YYTRANSLATE(YYX) \
23227+#define YYTRANSLATE(YYX) \
23228 ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
23229
23230 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
23231-static const yytype_uint8 yytranslate[] =
23232+static const unsigned char yytranslate[] =
23233 {
23234 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
23235 130, 2, 2, 2, 2, 2, 2, 2, 2, 2,
23236@@ -793,7 +663,7 @@
23237 #if YYDEBUG
23238 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
23239 YYRHS. */
23240-static const yytype_uint16 yyprhs[] =
23241+static const unsigned short int yyprhs[] =
23242 {
23243 0, 0, 3, 4, 7, 12, 15, 17, 19, 23,
23244 26, 27, 32, 36, 40, 44, 47, 51, 55, 59,
23245@@ -848,8 +718,8 @@
23246 1541, 1544
23247 };
23248
23249-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
23250-static const yytype_int16 yyrhs[] =
23251+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
23252+static const short int yyrhs[] =
23253 {
23254 133, 0, -1, -1, 134, 136, -1, 136, 219, 203,
23255 222, -1, 137, 270, -1, 275, -1, 138, -1, 137,
23256@@ -1009,7 +879,7 @@
23257 };
23258
23259 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
23260-static const yytype_uint16 yyrline[] =
23261+static const unsigned short int yyrline[] =
23262 {
23263 0, 346, 346, 346, 371, 391, 398, 399, 403, 407,
23264 413, 413, 417, 421, 428, 433, 437, 446, 455, 467,
23265@@ -1065,9 +935,9 @@
23266 };
23267 #endif
23268
23269-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
23270-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
23271- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
23272+#if YYDEBUG || YYERROR_VERBOSE
23273+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
23274+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
23275 static const char *const yytname[] =
23276 {
23277 "$end", "error", "$undefined", "kCLASS", "kMODULE", "kDEF", "kUNDEF",
23278@@ -1119,7 +989,7 @@
23279 # ifdef YYPRINT
23280 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
23281 token YYLEX-NUM. */
23282-static const yytype_uint16 yytoknum[] =
23283+static const unsigned short int yytoknum[] =
23284 {
23285 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
23286 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
23287@@ -1139,7 +1009,7 @@
23288 # endif
23289
23290 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
23291-static const yytype_uint16 yyr1[] =
23292+static const unsigned short int yyr1[] =
23293 {
23294 0, 132, 134, 133, 135, 136, 137, 137, 137, 137,
23295 139, 138, 138, 138, 138, 138, 138, 138, 138, 138,
23296@@ -1195,7 +1065,7 @@
23297 };
23298
23299 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
23300-static const yytype_uint8 yyr2[] =
23301+static const unsigned char yyr2[] =
23302 {
23303 0, 2, 0, 2, 4, 2, 1, 1, 3, 2,
23304 0, 4, 3, 3, 3, 2, 3, 3, 3, 3,
23305@@ -1253,7 +1123,7 @@
23306 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
23307 STATE-NUM when YYTABLE doesn't specify something else to do. Zero
23308 means the default is an error. */
23309-static const yytype_uint16 yydefact[] =
23310+static const unsigned short int yydefact[] =
23311 {
23312 2, 0, 0, 1, 0, 0, 0, 0, 0, 278,
23313 0, 0, 490, 299, 302, 0, 323, 324, 325, 326,
23314@@ -1347,8 +1217,8 @@
23315 245, 0, 250, 501, 251
23316 };
23317
23318-/* YYDEFGOTO[NTERM-NUM]. */
23319-static const yytype_int16 yydefgoto[] =
23320+/* YYDEFGOTO[NTERM-NUM]. */
23321+static const short int yydefgoto[] =
23322 {
23323 -1, 1, 2, 377, 378, 62, 63, 424, 255, 64,
23324 209, 65, 66, 540, 678, 823, 67, 68, 263, 69,
23325@@ -1370,7 +1240,7 @@
23326 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
23327 STATE-NUM. */
23328 #define YYPACT_NINF -654
23329-static const yytype_int16 yypact[] =
23330+static const short int yypact[] =
23331 {
23332 -654, 73, 2254, -654, 5471, 7939, 8236, 3906, 5121, -654,
23333 6810, 6810, 3777, -654, -654, 8038, 5677, 5677, -654, -654,
23334@@ -1465,7 +1335,7 @@
23335 };
23336
23337 /* YYPGOTO[NTERM-NUM]. */
23338-static const yytype_int16 yypgoto[] =
23339+static const short int yypgoto[] =
23340 {
23341 -654, -654, -654, -360, 431, -654, 59, -654, -654, 958,
23342 44, 23, -654, -569, -654, -654, 1, -6, -183, 22,
23343@@ -1489,7 +1359,7 @@
23344 number is the opposite. If zero, do what YYDEFACT says.
23345 If YYTABLE_NINF, syntax error. */
23346 #define YYTABLE_NINF -502
23347-static const yytype_int16 yytable[] =
23348+static const short int yytable[] =
23349 {
23350 235, 235, 188, 188, 235, 523, 390, 238, 238, 225,
23351 551, 238, 240, 240, 187, 248, 240, 234, 234, 419,
23352@@ -2449,7 +2319,7 @@
23353 341
23354 };
23355
23356-static const yytype_int16 yycheck[] =
23357+static const short int yycheck[] =
23358 {
23359 16, 17, 7, 8, 20, 343, 215, 16, 17, 15,
23360 370, 20, 16, 17, 7, 22, 20, 16, 17, 247,
23361@@ -3411,7 +3281,7 @@
23362
23363 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
23364 symbol of state STATE-NUM. */
23365-static const yytype_uint16 yystos[] =
23366+static const unsigned short int yystos[] =
23367 {
23368 0, 133, 134, 0, 1, 3, 4, 5, 6, 7,
23369 11, 12, 16, 18, 19, 20, 21, 22, 23, 24,
23370@@ -3505,6 +3375,22 @@
23371 179, 91, 179, 167, 179
23372 };
23373
23374+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
23375+# define YYSIZE_T __SIZE_TYPE__
23376+#endif
23377+#if ! defined (YYSIZE_T) && defined (size_t)
23378+# define YYSIZE_T size_t
23379+#endif
23380+#if ! defined (YYSIZE_T)
23381+# if defined (__STDC__) || defined (__cplusplus)
23382+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
23383+# define YYSIZE_T size_t
23384+# endif
23385+#endif
23386+#if ! defined (YYSIZE_T)
23387+# define YYSIZE_T unsigned int
23388+#endif
23389+
23390 #define yyerrok (yyerrstatus = 0)
23391 #define yyclearin (yychar = YYEMPTY)
23392 #define YYEMPTY (-2)
23393@@ -3530,63 +3416,30 @@
23394 yychar = (Token); \
23395 yylval = (Value); \
23396 yytoken = YYTRANSLATE (yychar); \
23397- YYPOPSTACK (1); \
23398+ YYPOPSTACK; \
23399 goto yybackup; \
23400 } \
23401 else \
23402- { \
23403- yyerror (YY_("syntax error: cannot back up")); \
23404+ { \
23405+ yyerror ("syntax error: cannot back up");\
23406 YYERROR; \
23407 } \
23408-while (YYID (0))
23409-
23410+while (0)
23411
23412 #define YYTERROR 1
23413 #define YYERRCODE 256
23414
23415+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
23416+ are run). */
23417
23418-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
23419- If N is 0, then set CURRENT to the empty location which ends
23420- the previous symbol: RHS[0] (always defined). */
23421-
23422-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
23423 #ifndef YYLLOC_DEFAULT
23424-# define YYLLOC_DEFAULT(Current, Rhs, N) \
23425- do \
23426- if (YYID (N)) \
23427- { \
23428- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
23429- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
23430- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
23431- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
23432- } \
23433- else \
23434- { \
23435- (Current).first_line = (Current).last_line = \
23436- YYRHSLOC (Rhs, 0).last_line; \
23437- (Current).first_column = (Current).last_column = \
23438- YYRHSLOC (Rhs, 0).last_column; \
23439- } \
23440- while (YYID (0))
23441-#endif
23442-
23443-
23444-/* YY_LOCATION_PRINT -- Print the location on the stream.
23445- This macro was not mandated originally: define only if we know
23446- we won't break user code: when these are the locations we know. */
23447-
23448-#ifndef YY_LOCATION_PRINT
23449-# if YYLTYPE_IS_TRIVIAL
23450-# define YY_LOCATION_PRINT(File, Loc) \
23451- fprintf (File, "%d.%d-%d.%d", \
23452- (Loc).first_line, (Loc).first_column, \
23453- (Loc).last_line, (Loc).last_column)
23454-# else
23455-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
23456-# endif
23457+# define YYLLOC_DEFAULT(Current, Rhs, N) \
23458+ ((Current).first_line = (Rhs)[1].first_line, \
23459+ (Current).first_column = (Rhs)[1].first_column, \
23460+ (Current).last_line = (Rhs)[N].last_line, \
23461+ (Current).last_column = (Rhs)[N].last_column)
23462 #endif
23463
23464-
23465 /* YYLEX -- calling `yylex' with the right arguments. */
23466
23467 #ifdef YYLEX_PARAM
23468@@ -3607,96 +3460,42 @@
23469 do { \
23470 if (yydebug) \
23471 YYFPRINTF Args; \
23472-} while (YYID (0))
23473+} while (0)
23474
23475-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
23476-do { \
23477- if (yydebug) \
23478- { \
23479- YYFPRINTF (stderr, "%s ", Title); \
23480- yy_symbol_print (stderr, \
23481- Type, Value); \
23482- YYFPRINTF (stderr, "\n"); \
23483- } \
23484-} while (YYID (0))
23485-
23486-
23487-/*--------------------------------.
23488-| Print this symbol on YYOUTPUT. |
23489-`--------------------------------*/
23490-
23491-/*ARGSUSED*/
23492-#if (defined __STDC__ || defined __C99__FUNC__ \
23493- || defined __cplusplus || defined _MSC_VER)
23494-static void
23495-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
23496-#else
23497-static void
23498-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
23499- FILE *yyoutput;
23500- int yytype;
23501- YYSTYPE const * const yyvaluep;
23502-#endif
23503-{
23504- if (!yyvaluep)
23505- return;
23506-# ifdef YYPRINT
23507- if (yytype < YYNTOKENS)
23508- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
23509-# else
23510- YYUSE (yyoutput);
23511-# endif
23512- switch (yytype)
23513- {
23514- default:
23515- break;
23516- }
23517-}
23518-
23519-
23520-/*--------------------------------.
23521-| Print this symbol on YYOUTPUT. |
23522-`--------------------------------*/
23523-
23524-#if (defined __STDC__ || defined __C99__FUNC__ \
23525- || defined __cplusplus || defined _MSC_VER)
23526-static void
23527-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
23528-#else
23529-static void
23530-yy_symbol_print (yyoutput, yytype, yyvaluep)
23531- FILE *yyoutput;
23532- int yytype;
23533- YYSTYPE const * const yyvaluep;
23534-#endif
23535-{
23536- if (yytype < YYNTOKENS)
23537- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
23538- else
23539- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
23540+# define YYDSYMPRINT(Args) \
23541+do { \
23542+ if (yydebug) \
23543+ yysymprint Args; \
23544+} while (0)
23545
23546- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
23547- YYFPRINTF (yyoutput, ")");
23548-}
23549+# define YYDSYMPRINTF(Title, Token, Value, Location) \
23550+do { \
23551+ if (yydebug) \
23552+ { \
23553+ YYFPRINTF (stderr, "%s ", Title); \
23554+ yysymprint (stderr, \
23555+ Token, Value); \
23556+ YYFPRINTF (stderr, "\n"); \
23557+ } \
23558+} while (0)
23559
23560 /*------------------------------------------------------------------.
23561 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
23562 | TOP (included). |
23563 `------------------------------------------------------------------*/
23564
23565-#if (defined __STDC__ || defined __C99__FUNC__ \
23566- || defined __cplusplus || defined _MSC_VER)
23567+#if defined (__STDC__) || defined (__cplusplus)
23568 static void
23569-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
23570+yy_stack_print (short int *bottom, short int *top)
23571 #else
23572 static void
23573 yy_stack_print (bottom, top)
23574- yytype_int16 *bottom;
23575- yytype_int16 *top;
23576+ short int *bottom;
23577+ short int *top;
23578 #endif
23579 {
23580 YYFPRINTF (stderr, "Stack now");
23581- for (; bottom <= top; ++bottom)
23582+ for (/* Nothing. */; bottom <= top; ++bottom)
23583 YYFPRINTF (stderr, " %d", *bottom);
23584 YYFPRINTF (stderr, "\n");
23585 }
23586@@ -3705,52 +3504,45 @@
23587 do { \
23588 if (yydebug) \
23589 yy_stack_print ((Bottom), (Top)); \
23590-} while (YYID (0))
23591+} while (0)
23592
23593
23594 /*------------------------------------------------.
23595 | Report that the YYRULE is going to be reduced. |
23596 `------------------------------------------------*/
23597
23598-#if (defined __STDC__ || defined __C99__FUNC__ \
23599- || defined __cplusplus || defined _MSC_VER)
23600+#if defined (__STDC__) || defined (__cplusplus)
23601 static void
23602-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
23603+yy_reduce_print (int yyrule)
23604 #else
23605 static void
23606-yy_reduce_print (yyvsp, yyrule)
23607- YYSTYPE *yyvsp;
23608+yy_reduce_print (yyrule)
23609 int yyrule;
23610 #endif
23611 {
23612- int yynrhs = yyr2[yyrule];
23613 int yyi;
23614- unsigned long int yylno = yyrline[yyrule];
23615- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
23616- yyrule - 1, yylno);
23617- /* The symbols being reduced. */
23618- for (yyi = 0; yyi < yynrhs; yyi++)
23619- {
23620- fprintf (stderr, " $%d = ", yyi + 1);
23621- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
23622- &(yyvsp[(yyi + 1) - (yynrhs)])
23623- );
23624- fprintf (stderr, "\n");
23625- }
23626+ unsigned int yylno = yyrline[yyrule];
23627+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
23628+ yyrule - 1, yylno);
23629+ /* Print the symbols being reduced, and their result. */
23630+ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
23631+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
23632+ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
23633 }
23634
23635 # define YY_REDUCE_PRINT(Rule) \
23636 do { \
23637 if (yydebug) \
23638- yy_reduce_print (yyvsp, Rule); \
23639-} while (YYID (0))
23640+ yy_reduce_print (Rule); \
23641+} while (0)
23642
23643 /* Nonzero means print parse trace. It is left uninitialized so that
23644 multiple parsers can coexist. */
23645 int yydebug;
23646 #else /* !YYDEBUG */
23647 # define YYDPRINTF(Args)
23648-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
23649+# define YYDSYMPRINT(Args)
23650+# define YYDSYMPRINTF(Title, Token, Value, Location)
23651 # define YY_STACK_PRINT(Bottom, Top)
23652 # define YY_REDUCE_PRINT(Rule)
23653 #endif /* !YYDEBUG */
23654@@ -3765,9 +3557,13 @@
23655 if the built-in stack extension method is used).
23656
23657 Do not make this value too large; the results are undefined if
23658- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
23659+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
23660 evaluated with infinite-precision integer arithmetic. */
23661
23662+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
23663+# undef YYMAXDEPTH
23664+#endif
23665+
23666 #ifndef YYMAXDEPTH
23667 # define YYMAXDEPTH 10000
23668 #endif
23669@@ -3777,47 +3573,45 @@
23670 #if YYERROR_VERBOSE
23671
23672 # ifndef yystrlen
23673-# if defined __GLIBC__ && defined _STRING_H
23674+# if defined (__GLIBC__) && defined (_STRING_H)
23675 # define yystrlen strlen
23676 # else
23677 /* Return the length of YYSTR. */
23678-#if (defined __STDC__ || defined __C99__FUNC__ \
23679- || defined __cplusplus || defined _MSC_VER)
23680 static YYSIZE_T
23681+# if defined (__STDC__) || defined (__cplusplus)
23682 yystrlen (const char *yystr)
23683-#else
23684-static YYSIZE_T
23685+# else
23686 yystrlen (yystr)
23687- const char *yystr;
23688-#endif
23689+ const char *yystr;
23690+# endif
23691 {
23692- YYSIZE_T yylen;
23693- for (yylen = 0; yystr[yylen]; yylen++)
23694+ register const char *yys = yystr;
23695+
23696+ while (*yys++ != '\0')
23697 continue;
23698- return yylen;
23699+
23700+ return yys - yystr - 1;
23701 }
23702 # endif
23703 # endif
23704
23705 # ifndef yystpcpy
23706-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
23707+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
23708 # define yystpcpy stpcpy
23709 # else
23710 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
23711 YYDEST. */
23712-#if (defined __STDC__ || defined __C99__FUNC__ \
23713- || defined __cplusplus || defined _MSC_VER)
23714 static char *
23715+# if defined (__STDC__) || defined (__cplusplus)
23716 yystpcpy (char *yydest, const char *yysrc)
23717-#else
23718-static char *
23719+# else
23720 yystpcpy (yydest, yysrc)
23721- char *yydest;
23722- const char *yysrc;
23723-#endif
23724+ char *yydest;
23725+ const char *yysrc;
23726+# endif
23727 {
23728- char *yyd = yydest;
23729- const char *yys = yysrc;
23730+ register char *yyd = yydest;
23731+ register const char *yys = yysrc;
23732
23733 while ((*yyd++ = *yys++) != '\0')
23734 continue;
23735@@ -3827,192 +3621,70 @@
23736 # endif
23737 # endif
23738
23739-# ifndef yytnamerr
23740-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
23741- quotes and backslashes, so that it's suitable for yyerror. The
23742- heuristic is that double-quoting is unnecessary unless the string
23743- contains an apostrophe, a comma, or backslash (other than
23744- backslash-backslash). YYSTR is taken from yytname. If YYRES is
23745- null, do not copy; instead, return the length of what the result
23746- would have been. */
23747-static YYSIZE_T
23748-yytnamerr (char *yyres, const char *yystr)
23749-{
23750- if (*yystr == '"')
23751- {
23752- YYSIZE_T yyn = 0;
23753- char const *yyp = yystr;
23754-
23755- for (;;)
23756- switch (*++yyp)
23757- {
23758- case '\'':
23759- case ',':
23760- goto do_not_strip_quotes;
23761-
23762- case '\\':
23763- if (*++yyp != '\\')
23764- goto do_not_strip_quotes;
23765- /* Fall through. */
23766- default:
23767- if (yyres)
23768- yyres[yyn] = *yyp;
23769- yyn++;
23770- break;
23771-
23772- case '"':
23773- if (yyres)
23774- yyres[yyn] = '\0';
23775- return yyn;
23776- }
23777- do_not_strip_quotes: ;
23778- }
23779+#endif /* !YYERROR_VERBOSE */
23780
23781- if (! yyres)
23782- return yystrlen (yystr);
23783+\f
23784
23785- return yystpcpy (yyres, yystr) - yyres;
23786-}
23787-# endif
23788+#if YYDEBUG
23789+/*--------------------------------.
23790+| Print this symbol on YYOUTPUT. |
23791+`--------------------------------*/
23792
23793-/* Copy into YYRESULT an error message about the unexpected token
23794- YYCHAR while in state YYSTATE. Return the number of bytes copied,
23795- including the terminating null byte. If YYRESULT is null, do not
23796- copy anything; just return the number of bytes that would be
23797- copied. As a special case, return 0 if an ordinary "syntax error"
23798- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
23799- size calculation. */
23800-static YYSIZE_T
23801-yysyntax_error (char *yyresult, int yystate, int yychar)
23802+#if defined (__STDC__) || defined (__cplusplus)
23803+static void
23804+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
23805+#else
23806+static void
23807+yysymprint (yyoutput, yytype, yyvaluep)
23808+ FILE *yyoutput;
23809+ int yytype;
23810+ YYSTYPE *yyvaluep;
23811+#endif
23812 {
23813- int yyn = yypact[yystate];
23814+ /* Pacify ``unused variable'' warnings. */
23815+ (void) yyvaluep;
23816
23817- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
23818- return 0;
23819- else
23820+ if (yytype < YYNTOKENS)
23821 {
23822- int yytype = YYTRANSLATE (yychar);
23823- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
23824- YYSIZE_T yysize = yysize0;
23825- YYSIZE_T yysize1;
23826- int yysize_overflow = 0;
23827- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
23828- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
23829- int yyx;
23830-
23831-# if 0
23832- /* This is so xgettext sees the translatable formats that are
23833- constructed on the fly. */
23834- YY_("syntax error, unexpected %s");
23835- YY_("syntax error, unexpected %s, expecting %s");
23836- YY_("syntax error, unexpected %s, expecting %s or %s");
23837- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
23838- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
23839+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
23840+# ifdef YYPRINT
23841+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
23842 # endif
23843- char *yyfmt;
23844- char const *yyf;
23845- static char const yyunexpected[] = "syntax error, unexpected %s";
23846- static char const yyexpecting[] = ", expecting %s";
23847- static char const yyor[] = " or %s";
23848- char yyformat[sizeof yyunexpected
23849- + sizeof yyexpecting - 1
23850- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
23851- * (sizeof yyor - 1))];
23852- char const *yyprefix = yyexpecting;
23853-
23854- /* Start YYX at -YYN if negative to avoid negative indexes in
23855- YYCHECK. */
23856- int yyxbegin = yyn < 0 ? -yyn : 0;
23857-
23858- /* Stay within bounds of both yycheck and yytname. */
23859- int yychecklim = YYLAST - yyn + 1;
23860- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
23861- int yycount = 1;
23862-
23863- yyarg[0] = yytname[yytype];
23864- yyfmt = yystpcpy (yyformat, yyunexpected);
23865-
23866- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
23867- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
23868- {
23869- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
23870- {
23871- yycount = 1;
23872- yysize = yysize0;
23873- yyformat[sizeof yyunexpected - 1] = '\0';
23874- break;
23875- }
23876- yyarg[yycount++] = yytname[yyx];
23877- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
23878- yysize_overflow |= (yysize1 < yysize);
23879- yysize = yysize1;
23880- yyfmt = yystpcpy (yyfmt, yyprefix);
23881- yyprefix = yyor;
23882- }
23883-
23884- yyf = YY_(yyformat);
23885- yysize1 = yysize + yystrlen (yyf);
23886- yysize_overflow |= (yysize1 < yysize);
23887- yysize = yysize1;
23888-
23889- if (yysize_overflow)
23890- return YYSIZE_MAXIMUM;
23891+ }
23892+ else
23893+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
23894
23895- if (yyresult)
23896- {
23897- /* Avoid sprintf, as that infringes on the user's name space.
23898- Don't have undefined behavior even if the translation
23899- produced a string with the wrong number of "%s"s. */
23900- char *yyp = yyresult;
23901- int yyi = 0;
23902- while ((*yyp = *yyf) != '\0')
23903- {
23904- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
23905- {
23906- yyp += yytnamerr (yyp, yyarg[yyi++]);
23907- yyf += 2;
23908- }
23909- else
23910- {
23911- yyp++;
23912- yyf++;
23913- }
23914- }
23915- }
23916- return yysize;
23917+ switch (yytype)
23918+ {
23919+ default:
23920+ break;
23921 }
23922+ YYFPRINTF (yyoutput, ")");
23923 }
23924-#endif /* YYERROR_VERBOSE */
23925-\f
23926
23927+#endif /* ! YYDEBUG */
23928 /*-----------------------------------------------.
23929 | Release the memory associated to this symbol. |
23930 `-----------------------------------------------*/
23931
23932-/*ARGSUSED*/
23933-#if (defined __STDC__ || defined __C99__FUNC__ \
23934- || defined __cplusplus || defined _MSC_VER)
23935+#if defined (__STDC__) || defined (__cplusplus)
23936 static void
23937-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
23938+yydestruct (int yytype, YYSTYPE *yyvaluep)
23939 #else
23940 static void
23941-yydestruct (yymsg, yytype, yyvaluep)
23942- const char *yymsg;
23943+yydestruct (yytype, yyvaluep)
23944 int yytype;
23945 YYSTYPE *yyvaluep;
23946 #endif
23947 {
23948- YYUSE (yyvaluep);
23949-
23950- if (!yymsg)
23951- yymsg = "Deleting";
23952- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
23953+ /* Pacify ``unused variable'' warnings. */
23954+ (void) yyvaluep;
23955
23956 switch (yytype)
23957 {
23958
23959 default:
23960- break;
23961+ break;
23962 }
23963 }
23964 \f
23965@@ -4020,13 +3692,13 @@
23966 /* Prevent warnings from -Wmissing-prototypes. */
23967
23968 #ifdef YYPARSE_PARAM
23969-#if defined __STDC__ || defined __cplusplus
23970+# if defined (__STDC__) || defined (__cplusplus)
23971 int yyparse (void *YYPARSE_PARAM);
23972-#else
23973+# else
23974 int yyparse ();
23975-#endif
23976+# endif
23977 #else /* ! YYPARSE_PARAM */
23978-#if defined __STDC__ || defined __cplusplus
23979+#if defined (__STDC__) || defined (__cplusplus)
23980 int yyparse (void);
23981 #else
23982 int yyparse ();
23983@@ -4035,10 +3707,10 @@
23984
23985
23986
23987-/* The look-ahead symbol. */
23988+/* The lookahead symbol. */
23989 int yychar;
23990
23991-/* The semantic value of the look-ahead symbol. */
23992+/* The semantic value of the lookahead symbol. */
23993 YYSTYPE yylval;
23994
23995 /* Number of syntax errors so far. */
23996@@ -4051,18 +3723,14 @@
23997 `----------*/
23998
23999 #ifdef YYPARSE_PARAM
24000-#if (defined __STDC__ || defined __C99__FUNC__ \
24001- || defined __cplusplus || defined _MSC_VER)
24002-int
24003-yyparse (void *YYPARSE_PARAM)
24004-#else
24005-int
24006-yyparse (YYPARSE_PARAM)
24007- void *YYPARSE_PARAM;
24008-#endif
24009+# if defined (__STDC__) || defined (__cplusplus)
24010+int yyparse (void *YYPARSE_PARAM)
24011+# else
24012+int yyparse (YYPARSE_PARAM)
24013+ void *YYPARSE_PARAM;
24014+# endif
24015 #else /* ! YYPARSE_PARAM */
24016-#if (defined __STDC__ || defined __C99__FUNC__ \
24017- || defined __cplusplus || defined _MSC_VER)
24018+#if defined (__STDC__) || defined (__cplusplus)
24019 int
24020 yyparse (void)
24021 #else
24022@@ -4073,19 +3741,13 @@
24023 #endif
24024 {
24025
24026- int yystate;
24027- int yyn;
24028+ register int yystate;
24029+ register int yyn;
24030 int yyresult;
24031 /* Number of tokens to shift before error messages enabled. */
24032 int yyerrstatus;
24033- /* Look-ahead token as an internal (translated) token number. */
24034+ /* Lookahead token as an internal (translated) token number. */
24035 int yytoken = 0;
24036-#if YYERROR_VERBOSE
24037- /* Buffer for error messages, and its allocated size. */
24038- char yymsgbuf[128];
24039- char *yymsg = yymsgbuf;
24040- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
24041-#endif
24042
24043 /* Three stacks and their tools:
24044 `yyss': related to states,
24045@@ -4096,18 +3758,18 @@
24046 to reallocate them elsewhere. */
24047
24048 /* The state stack. */
24049- yytype_int16 yyssa[YYINITDEPTH];
24050- yytype_int16 *yyss = yyssa;
24051- yytype_int16 *yyssp;
24052+ short int yyssa[YYINITDEPTH];
24053+ short int *yyss = yyssa;
24054+ register short int *yyssp;
24055
24056 /* The semantic value stack. */
24057 YYSTYPE yyvsa[YYINITDEPTH];
24058 YYSTYPE *yyvs = yyvsa;
24059- YYSTYPE *yyvsp;
24060+ register YYSTYPE *yyvsp;
24061
24062
24063
24064-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
24065+#define YYPOPSTACK (yyvsp--, yyssp--)
24066
24067 YYSIZE_T yystacksize = YYINITDEPTH;
24068
24069@@ -4116,9 +3778,9 @@
24070 YYSTYPE yyval;
24071
24072
24073- /* The number of symbols on the RHS of the reduced rule.
24074- Keep to zero when no symbol should be popped. */
24075- int yylen = 0;
24076+ /* When reducing, the number of symbols on the RHS of the reduced
24077+ rule. */
24078+ int yylen;
24079
24080 YYDPRINTF ((stderr, "Starting parse\n"));
24081
24082@@ -4135,6 +3797,7 @@
24083 yyssp = yyss;
24084 yyvsp = yyvs;
24085
24086+
24087 goto yysetstate;
24088
24089 /*------------------------------------------------------------.
24090@@ -4142,7 +3805,8 @@
24091 `------------------------------------------------------------*/
24092 yynewstate:
24093 /* In all cases, when you get here, the value and location stacks
24094- have just been pushed. So pushing a state here evens the stacks. */
24095+ have just been pushed. so pushing a state here evens the stacks.
24096+ */
24097 yyssp++;
24098
24099 yysetstate:
24100@@ -4155,18 +3819,18 @@
24101
24102 #ifdef yyoverflow
24103 {
24104- /* Give user a chance to reallocate the stack. Use copies of
24105+ /* Give user a chance to reallocate the stack. Use copies of
24106 these so that the &'s don't force the real ones into
24107 memory. */
24108 YYSTYPE *yyvs1 = yyvs;
24109- yytype_int16 *yyss1 = yyss;
24110+ short int *yyss1 = yyss;
24111
24112
24113 /* Each stack pointer address is followed by the size of the
24114 data in use in that stack, in bytes. This used to be a
24115 conditional around just the two extra args, but that might
24116 be undefined if yyoverflow is a macro. */
24117- yyoverflow (YY_("memory exhausted"),
24118+ yyoverflow ("parser stack overflow",
24119 &yyss1, yysize * sizeof (*yyssp),
24120 &yyvs1, yysize * sizeof (*yyvsp),
24121
24122@@ -4177,21 +3841,21 @@
24123 }
24124 #else /* no yyoverflow */
24125 # ifndef YYSTACK_RELOCATE
24126- goto yyexhaustedlab;
24127+ goto yyoverflowlab;
24128 # else
24129 /* Extend the stack our own way. */
24130 if (YYMAXDEPTH <= yystacksize)
24131- goto yyexhaustedlab;
24132+ goto yyoverflowlab;
24133 yystacksize *= 2;
24134 if (YYMAXDEPTH < yystacksize)
24135 yystacksize = YYMAXDEPTH;
24136
24137 {
24138- yytype_int16 *yyss1 = yyss;
24139+ short int *yyss1 = yyss;
24140 union yyalloc *yyptr =
24141 (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
24142 if (! yyptr)
24143- goto yyexhaustedlab;
24144+ goto yyoverflowlab;
24145 YYSTACK_RELOCATE (yyss);
24146 YYSTACK_RELOCATE (yyvs);
24147
24148@@ -4222,17 +3886,19 @@
24149 `-----------*/
24150 yybackup:
24151
24152- /* Do appropriate processing given the current state. Read a
24153- look-ahead token if we need one and don't already have one. */
24154+/* Do appropriate processing given the current state. */
24155+/* Read a lookahead token if we need one and don't already have one. */
24156+/* yyresume: */
24157+
24158+ /* First try to decide what to do without reference to lookahead token. */
24159
24160- /* First try to decide what to do without reference to look-ahead token. */
24161 yyn = yypact[yystate];
24162 if (yyn == YYPACT_NINF)
24163 goto yydefault;
24164
24165- /* Not known => get a look-ahead token if don't already have one. */
24166+ /* Not known => get a lookahead token if don't already have one. */
24167
24168- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
24169+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
24170 if (yychar == YYEMPTY)
24171 {
24172 YYDPRINTF ((stderr, "Reading a token: "));
24173@@ -4247,7 +3913,7 @@
24174 else
24175 {
24176 yytoken = YYTRANSLATE (yychar);
24177- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
24178+ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
24179 }
24180
24181 /* If the proper action on seeing token YYTOKEN is to reduce or to
24182@@ -4267,21 +3933,22 @@
24183 if (yyn == YYFINAL)
24184 YYACCEPT;
24185
24186- /* Count tokens shifted since error; after three, turn off error
24187- status. */
24188- if (yyerrstatus)
24189- yyerrstatus--;
24190-
24191- /* Shift the look-ahead token. */
24192- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
24193+ /* Shift the lookahead token. */
24194+ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
24195
24196- /* Discard the shifted token unless it is eof. */
24197+ /* Discard the token being shifted unless it is eof. */
24198 if (yychar != YYEOF)
24199 yychar = YYEMPTY;
24200
24201- yystate = yyn;
24202 *++yyvsp = yylval;
24203
24204+
24205+ /* Count tokens shifted since error; after three, turn off error
24206+ status. */
24207+ if (yyerrstatus)
24208+ yyerrstatus--;
24209+
24210+ yystate = yyn;
24211 goto yynewstate;
24212
24213
24214@@ -4323,93 +3990,93 @@
24215 top_local_init();
24216 if (ruby_class == rb_cObject) class_nest = 0;
24217 else class_nest = 1;
24218- }
24219+ ;}
24220 break;
24221
24222 case 3:
24223 #line 353 "parse.y"
24224 {
24225- if ((yyvsp[(2) - (2)].node) && !compile_for_eval) {
24226+ if (yyvsp[0].node && !compile_for_eval) {
24227 /* last expression should not be void */
24228- if (nd_type((yyvsp[(2) - (2)].node)) != NODE_BLOCK) void_expr((yyvsp[(2) - (2)].node));
24229+ if (nd_type(yyvsp[0].node) != NODE_BLOCK) void_expr(yyvsp[0].node);
24230 else {
24231- NODE *node = (yyvsp[(2) - (2)].node);
24232+ NODE *node = yyvsp[0].node;
24233 while (node->nd_next) {
24234 node = node->nd_next;
24235 }
24236 void_expr(node->nd_head);
24237 }
24238 }
24239- ruby_eval_tree = block_append(ruby_eval_tree, (yyvsp[(2) - (2)].node));
24240+ ruby_eval_tree = block_append(ruby_eval_tree, yyvsp[0].node);
24241 top_local_setup();
24242 class_nest = 0;
24243- }
24244+ ;}
24245 break;
24246
24247 case 4:
24248 #line 375 "parse.y"
24249 {
24250- (yyval.node) = (yyvsp[(1) - (4)].node);
24251- if ((yyvsp[(2) - (4)].node)) {
24252- (yyval.node) = NEW_RESCUE((yyvsp[(1) - (4)].node), (yyvsp[(2) - (4)].node), (yyvsp[(3) - (4)].node));
24253+ yyval.node = yyvsp[-3].node;
24254+ if (yyvsp[-2].node) {
24255+ yyval.node = NEW_RESCUE(yyvsp[-3].node, yyvsp[-2].node, yyvsp[-1].node);
24256 }
24257- else if ((yyvsp[(3) - (4)].node)) {
24258+ else if (yyvsp[-1].node) {
24259 rb_warn("else without rescue is useless");
24260- (yyval.node) = block_append((yyval.node), (yyvsp[(3) - (4)].node));
24261+ yyval.node = block_append(yyval.node, yyvsp[-1].node);
24262 }
24263- if ((yyvsp[(4) - (4)].node)) {
24264- (yyval.node) = NEW_ENSURE((yyval.node), (yyvsp[(4) - (4)].node));
24265+ if (yyvsp[0].node) {
24266+ yyval.node = NEW_ENSURE(yyval.node, yyvsp[0].node);
24267 }
24268- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
24269- }
24270+ fixpos(yyval.node, yyvsp[-3].node);
24271+ ;}
24272 break;
24273
24274 case 5:
24275 #line 392 "parse.y"
24276 {
24277- void_stmts((yyvsp[(1) - (2)].node));
24278- (yyval.node) = (yyvsp[(1) - (2)].node);
24279- }
24280+ void_stmts(yyvsp[-1].node);
24281+ yyval.node = yyvsp[-1].node;
24282+ ;}
24283 break;
24284
24285 case 7:
24286 #line 400 "parse.y"
24287 {
24288- (yyval.node) = newline_node((yyvsp[(1) - (1)].node));
24289- }
24290+ yyval.node = newline_node(yyvsp[0].node);
24291+ ;}
24292 break;
24293
24294 case 8:
24295 #line 404 "parse.y"
24296 {
24297- (yyval.node) = block_append((yyvsp[(1) - (3)].node), newline_node((yyvsp[(3) - (3)].node)));
24298- }
24299+ yyval.node = block_append(yyvsp[-2].node, newline_node(yyvsp[0].node));
24300+ ;}
24301 break;
24302
24303 case 9:
24304 #line 408 "parse.y"
24305 {
24306- (yyval.node) = (yyvsp[(2) - (2)].node);
24307- }
24308+ yyval.node = yyvsp[0].node;
24309+ ;}
24310 break;
24311
24312 case 10:
24313 #line 413 "parse.y"
24314- {lex_state = EXPR_FNAME;}
24315+ {lex_state = EXPR_FNAME;;}
24316 break;
24317
24318 case 11:
24319 #line 414 "parse.y"
24320 {
24321- (yyval.node) = NEW_ALIAS((yyvsp[(2) - (4)].node), (yyvsp[(4) - (4)].node));
24322- }
24323+ yyval.node = NEW_ALIAS(yyvsp[-2].node, yyvsp[0].node);
24324+ ;}
24325 break;
24326
24327 case 12:
24328 #line 418 "parse.y"
24329 {
24330- (yyval.node) = NEW_VALIAS((yyvsp[(2) - (3)].id), (yyvsp[(3) - (3)].id));
24331- }
24332+ yyval.node = NEW_VALIAS(yyvsp[-1].id, yyvsp[0].id);
24333+ ;}
24334 break;
24335
24336 case 13:
24337@@ -4417,85 +4084,85 @@
24338 {
24339 char buf[3];
24340
24341- sprintf(buf, "$%c", (char)(yyvsp[(3) - (3)].node)->nd_nth);
24342- (yyval.node) = NEW_VALIAS((yyvsp[(2) - (3)].id), rb_intern(buf));
24343- }
24344+ sprintf(buf, "$%c", (char)yyvsp[0].node->nd_nth);
24345+ yyval.node = NEW_VALIAS(yyvsp[-1].id, rb_intern(buf));
24346+ ;}
24347 break;
24348
24349 case 14:
24350 #line 429 "parse.y"
24351 {
24352 yyerror("can't make alias for the number variables");
24353- (yyval.node) = 0;
24354- }
24355+ yyval.node = 0;
24356+ ;}
24357 break;
24358
24359 case 15:
24360 #line 434 "parse.y"
24361 {
24362- (yyval.node) = (yyvsp[(2) - (2)].node);
24363- }
24364+ yyval.node = yyvsp[0].node;
24365+ ;}
24366 break;
24367
24368 case 16:
24369 #line 438 "parse.y"
24370 {
24371- (yyval.node) = NEW_IF(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 0);
24372- fixpos((yyval.node), (yyvsp[(3) - (3)].node));
24373- if (cond_negative(&(yyval.node)->nd_cond)) {
24374- (yyval.node)->nd_else = (yyval.node)->nd_body;
24375- (yyval.node)->nd_body = 0;
24376+ yyval.node = NEW_IF(cond(yyvsp[0].node), yyvsp[-2].node, 0);
24377+ fixpos(yyval.node, yyvsp[0].node);
24378+ if (cond_negative(&yyval.node->nd_cond)) {
24379+ yyval.node->nd_else = yyval.node->nd_body;
24380+ yyval.node->nd_body = 0;
24381 }
24382- }
24383+ ;}
24384 break;
24385
24386 case 17:
24387 #line 447 "parse.y"
24388 {
24389- (yyval.node) = NEW_UNLESS(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 0);
24390- fixpos((yyval.node), (yyvsp[(3) - (3)].node));
24391- if (cond_negative(&(yyval.node)->nd_cond)) {
24392- (yyval.node)->nd_body = (yyval.node)->nd_else;
24393- (yyval.node)->nd_else = 0;
24394+ yyval.node = NEW_UNLESS(cond(yyvsp[0].node), yyvsp[-2].node, 0);
24395+ fixpos(yyval.node, yyvsp[0].node);
24396+ if (cond_negative(&yyval.node->nd_cond)) {
24397+ yyval.node->nd_body = yyval.node->nd_else;
24398+ yyval.node->nd_else = 0;
24399 }
24400- }
24401+ ;}
24402 break;
24403
24404 case 18:
24405 #line 456 "parse.y"
24406 {
24407- if ((yyvsp[(1) - (3)].node) && nd_type((yyvsp[(1) - (3)].node)) == NODE_BEGIN) {
24408- (yyval.node) = NEW_WHILE(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node)->nd_body, 0);
24409+ if (yyvsp[-2].node && nd_type(yyvsp[-2].node) == NODE_BEGIN) {
24410+ yyval.node = NEW_WHILE(cond(yyvsp[0].node), yyvsp[-2].node->nd_body, 0);
24411 }
24412 else {
24413- (yyval.node) = NEW_WHILE(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 1);
24414+ yyval.node = NEW_WHILE(cond(yyvsp[0].node), yyvsp[-2].node, 1);
24415 }
24416- if (cond_negative(&(yyval.node)->nd_cond)) {
24417- nd_set_type((yyval.node), NODE_UNTIL);
24418+ if (cond_negative(&yyval.node->nd_cond)) {
24419+ nd_set_type(yyval.node, NODE_UNTIL);
24420 }
24421- }
24422+ ;}
24423 break;
24424
24425 case 19:
24426 #line 468 "parse.y"
24427 {
24428- if ((yyvsp[(1) - (3)].node) && nd_type((yyvsp[(1) - (3)].node)) == NODE_BEGIN) {
24429- (yyval.node) = NEW_UNTIL(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node)->nd_body, 0);
24430+ if (yyvsp[-2].node && nd_type(yyvsp[-2].node) == NODE_BEGIN) {
24431+ yyval.node = NEW_UNTIL(cond(yyvsp[0].node), yyvsp[-2].node->nd_body, 0);
24432 }
24433 else {
24434- (yyval.node) = NEW_UNTIL(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 1);
24435+ yyval.node = NEW_UNTIL(cond(yyvsp[0].node), yyvsp[-2].node, 1);
24436 }
24437- if (cond_negative(&(yyval.node)->nd_cond)) {
24438- nd_set_type((yyval.node), NODE_WHILE);
24439+ if (cond_negative(&yyval.node->nd_cond)) {
24440+ nd_set_type(yyval.node, NODE_WHILE);
24441 }
24442- }
24443+ ;}
24444 break;
24445
24446 case 20:
24447 #line 480 "parse.y"
24448 {
24449- (yyval.node) = NEW_RESCUE((yyvsp[(1) - (3)].node), NEW_RESBODY(0,(yyvsp[(3) - (3)].node),0), 0);
24450- }
24451+ yyval.node = NEW_RESCUE(yyvsp[-2].node, NEW_RESBODY(0,yyvsp[0].node,0), 0);
24452+ ;}
24453 break;
24454
24455 case 21:
24456@@ -4505,17 +4172,17 @@
24457 yyerror("BEGIN in method");
24458 }
24459 local_push(0);
24460- }
24461+ ;}
24462 break;
24463
24464 case 22:
24465 #line 491 "parse.y"
24466 {
24467 ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
24468- NEW_PREEXE((yyvsp[(4) - (5)].node)));
24469+ NEW_PREEXE(yyvsp[-1].node));
24470 local_pop();
24471- (yyval.node) = 0;
24472- }
24473+ yyval.node = 0;
24474+ ;}
24475 break;
24476
24477 case 23:
24478@@ -4525,52 +4192,52 @@
24479 rb_warn("END in method; use at_exit");
24480 }
24481
24482- (yyval.node) = NEW_ITER(0, NEW_POSTEXE(), (yyvsp[(3) - (4)].node));
24483- }
24484+ yyval.node = NEW_ITER(0, NEW_POSTEXE(), yyvsp[-1].node);
24485+ ;}
24486 break;
24487
24488 case 24:
24489 #line 506 "parse.y"
24490 {
24491- (yyval.node) = node_assign((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
24492- }
24493+ yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node);
24494+ ;}
24495 break;
24496
24497 case 25:
24498 #line 510 "parse.y"
24499 {
24500- value_expr((yyvsp[(3) - (3)].node));
24501- (yyvsp[(1) - (3)].node)->nd_value = ((yyvsp[(1) - (3)].node)->nd_head) ? NEW_TO_ARY((yyvsp[(3) - (3)].node)) : NEW_ARRAY((yyvsp[(3) - (3)].node));
24502- (yyval.node) = (yyvsp[(1) - (3)].node);
24503- }
24504+ value_expr(yyvsp[0].node);
24505+ yyvsp[-2].node->nd_value = (yyvsp[-2].node->nd_head) ? NEW_TO_ARY(yyvsp[0].node) : NEW_ARRAY(yyvsp[0].node);
24506+ yyval.node = yyvsp[-2].node;
24507+ ;}
24508 break;
24509
24510 case 26:
24511 #line 516 "parse.y"
24512 {
24513- value_expr((yyvsp[(3) - (3)].node));
24514- if ((yyvsp[(1) - (3)].node)) {
24515- ID vid = (yyvsp[(1) - (3)].node)->nd_vid;
24516- if ((yyvsp[(2) - (3)].id) == tOROP) {
24517- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
24518- (yyval.node) = NEW_OP_ASGN_OR(gettable(vid), (yyvsp[(1) - (3)].node));
24519+ value_expr(yyvsp[0].node);
24520+ if (yyvsp[-2].node) {
24521+ ID vid = yyvsp[-2].node->nd_vid;
24522+ if (yyvsp[-1].id == tOROP) {
24523+ yyvsp[-2].node->nd_value = yyvsp[0].node;
24524+ yyval.node = NEW_OP_ASGN_OR(gettable(vid), yyvsp[-2].node);
24525 if (is_asgn_or_id(vid)) {
24526- (yyval.node)->nd_aid = vid;
24527+ yyval.node->nd_aid = vid;
24528 }
24529 }
24530- else if ((yyvsp[(2) - (3)].id) == tANDOP) {
24531- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
24532- (yyval.node) = NEW_OP_ASGN_AND(gettable(vid), (yyvsp[(1) - (3)].node));
24533+ else if (yyvsp[-1].id == tANDOP) {
24534+ yyvsp[-2].node->nd_value = yyvsp[0].node;
24535+ yyval.node = NEW_OP_ASGN_AND(gettable(vid), yyvsp[-2].node);
24536 }
24537 else {
24538- (yyval.node) = (yyvsp[(1) - (3)].node);
24539- (yyval.node)->nd_value = call_op(gettable(vid),(yyvsp[(2) - (3)].id),1,(yyvsp[(3) - (3)].node));
24540+ yyval.node = yyvsp[-2].node;
24541+ yyval.node->nd_value = call_op(gettable(vid),yyvsp[-1].id,1,yyvsp[0].node);
24542 }
24543 }
24544 else {
24545- (yyval.node) = 0;
24546+ yyval.node = 0;
24547 }
24548- }
24549+ ;}
24550 break;
24551
24552 case 27:
24553@@ -4578,384 +4245,384 @@
24554 {
24555 NODE *args;
24556
24557- value_expr((yyvsp[(6) - (6)].node));
24558- if (!(yyvsp[(3) - (6)].node)) (yyvsp[(3) - (6)].node) = NEW_ZARRAY();
24559- args = arg_concat((yyvsp[(6) - (6)].node), (yyvsp[(3) - (6)].node));
24560- if ((yyvsp[(5) - (6)].id) == tOROP) {
24561- (yyvsp[(5) - (6)].id) = 0;
24562- }
24563- else if ((yyvsp[(5) - (6)].id) == tANDOP) {
24564- (yyvsp[(5) - (6)].id) = 1;
24565- }
24566- (yyval.node) = NEW_OP_ASGN1((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].id), args);
24567- fixpos((yyval.node), (yyvsp[(1) - (6)].node));
24568- }
24569+ value_expr(yyvsp[0].node);
24570+ if (!yyvsp[-3].node) yyvsp[-3].node = NEW_ZARRAY();
24571+ args = arg_concat(yyvsp[0].node, yyvsp[-3].node);
24572+ if (yyvsp[-1].id == tOROP) {
24573+ yyvsp[-1].id = 0;
24574+ }
24575+ else if (yyvsp[-1].id == tANDOP) {
24576+ yyvsp[-1].id = 1;
24577+ }
24578+ yyval.node = NEW_OP_ASGN1(yyvsp[-5].node, yyvsp[-1].id, args);
24579+ fixpos(yyval.node, yyvsp[-5].node);
24580+ ;}
24581 break;
24582
24583 case 28:
24584 #line 557 "parse.y"
24585 {
24586- value_expr((yyvsp[(5) - (5)].node));
24587- if ((yyvsp[(4) - (5)].id) == tOROP) {
24588- (yyvsp[(4) - (5)].id) = 0;
24589- }
24590- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
24591- (yyvsp[(4) - (5)].id) = 1;
24592- }
24593- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
24594- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
24595- }
24596+ value_expr(yyvsp[0].node);
24597+ if (yyvsp[-1].id == tOROP) {
24598+ yyvsp[-1].id = 0;
24599+ }
24600+ else if (yyvsp[-1].id == tANDOP) {
24601+ yyvsp[-1].id = 1;
24602+ }
24603+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
24604+ fixpos(yyval.node, yyvsp[-4].node);
24605+ ;}
24606 break;
24607
24608 case 29:
24609 #line 569 "parse.y"
24610 {
24611- value_expr((yyvsp[(5) - (5)].node));
24612- if ((yyvsp[(4) - (5)].id) == tOROP) {
24613- (yyvsp[(4) - (5)].id) = 0;
24614- }
24615- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
24616- (yyvsp[(4) - (5)].id) = 1;
24617- }
24618- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
24619- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
24620- }
24621+ value_expr(yyvsp[0].node);
24622+ if (yyvsp[-1].id == tOROP) {
24623+ yyvsp[-1].id = 0;
24624+ }
24625+ else if (yyvsp[-1].id == tANDOP) {
24626+ yyvsp[-1].id = 1;
24627+ }
24628+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
24629+ fixpos(yyval.node, yyvsp[-4].node);
24630+ ;}
24631 break;
24632
24633 case 30:
24634 #line 581 "parse.y"
24635 {
24636- value_expr((yyvsp[(5) - (5)].node));
24637- if ((yyvsp[(4) - (5)].id) == tOROP) {
24638- (yyvsp[(4) - (5)].id) = 0;
24639- }
24640- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
24641- (yyvsp[(4) - (5)].id) = 1;
24642- }
24643- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
24644- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
24645- }
24646+ value_expr(yyvsp[0].node);
24647+ if (yyvsp[-1].id == tOROP) {
24648+ yyvsp[-1].id = 0;
24649+ }
24650+ else if (yyvsp[-1].id == tANDOP) {
24651+ yyvsp[-1].id = 1;
24652+ }
24653+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
24654+ fixpos(yyval.node, yyvsp[-4].node);
24655+ ;}
24656 break;
24657
24658 case 31:
24659 #line 593 "parse.y"
24660 {
24661- rb_backref_error((yyvsp[(1) - (3)].node));
24662- (yyval.node) = 0;
24663- }
24664+ rb_backref_error(yyvsp[-2].node);
24665+ yyval.node = 0;
24666+ ;}
24667 break;
24668
24669 case 32:
24670 #line 598 "parse.y"
24671 {
24672- (yyval.node) = node_assign((yyvsp[(1) - (3)].node), NEW_SVALUE((yyvsp[(3) - (3)].node)));
24673- }
24674+ yyval.node = node_assign(yyvsp[-2].node, NEW_SVALUE(yyvsp[0].node));
24675+ ;}
24676 break;
24677
24678 case 33:
24679 #line 602 "parse.y"
24680 {
24681- (yyvsp[(1) - (3)].node)->nd_value = ((yyvsp[(1) - (3)].node)->nd_head) ? NEW_TO_ARY((yyvsp[(3) - (3)].node)) : NEW_ARRAY((yyvsp[(3) - (3)].node));
24682- (yyval.node) = (yyvsp[(1) - (3)].node);
24683- }
24684+ yyvsp[-2].node->nd_value = (yyvsp[-2].node->nd_head) ? NEW_TO_ARY(yyvsp[0].node) : NEW_ARRAY(yyvsp[0].node);
24685+ yyval.node = yyvsp[-2].node;
24686+ ;}
24687 break;
24688
24689 case 34:
24690 #line 607 "parse.y"
24691 {
24692- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
24693- (yyval.node) = (yyvsp[(1) - (3)].node);
24694- }
24695+ yyvsp[-2].node->nd_value = yyvsp[0].node;
24696+ yyval.node = yyvsp[-2].node;
24697+ ;}
24698 break;
24699
24700 case 37:
24701 #line 616 "parse.y"
24702 {
24703- (yyval.node) = logop(NODE_AND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
24704- }
24705+ yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node);
24706+ ;}
24707 break;
24708
24709 case 38:
24710 #line 620 "parse.y"
24711 {
24712- (yyval.node) = logop(NODE_OR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
24713- }
24714+ yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node);
24715+ ;}
24716 break;
24717
24718 case 39:
24719 #line 624 "parse.y"
24720 {
24721- (yyval.node) = NEW_NOT(cond((yyvsp[(2) - (2)].node)));
24722- }
24723+ yyval.node = NEW_NOT(cond(yyvsp[0].node));
24724+ ;}
24725 break;
24726
24727 case 40:
24728 #line 628 "parse.y"
24729 {
24730- (yyval.node) = NEW_NOT(cond((yyvsp[(2) - (2)].node)));
24731- }
24732+ yyval.node = NEW_NOT(cond(yyvsp[0].node));
24733+ ;}
24734 break;
24735
24736 case 42:
24737 #line 635 "parse.y"
24738 {
24739- value_expr((yyval.node));
24740- (yyval.node) = (yyvsp[(1) - (1)].node);
24741- }
24742+ value_expr(yyval.node);
24743+ yyval.node = yyvsp[0].node;
24744+ ;}
24745 break;
24746
24747 case 45:
24748 #line 644 "parse.y"
24749 {
24750- (yyval.node) = NEW_RETURN(ret_args((yyvsp[(2) - (2)].node)));
24751- }
24752+ yyval.node = NEW_RETURN(ret_args(yyvsp[0].node));
24753+ ;}
24754 break;
24755
24756 case 46:
24757 #line 648 "parse.y"
24758 {
24759- (yyval.node) = NEW_BREAK(ret_args((yyvsp[(2) - (2)].node)));
24760- }
24761+ yyval.node = NEW_BREAK(ret_args(yyvsp[0].node));
24762+ ;}
24763 break;
24764
24765 case 47:
24766 #line 652 "parse.y"
24767 {
24768- (yyval.node) = NEW_NEXT(ret_args((yyvsp[(2) - (2)].node)));
24769- }
24770+ yyval.node = NEW_NEXT(ret_args(yyvsp[0].node));
24771+ ;}
24772 break;
24773
24774 case 49:
24775 #line 659 "parse.y"
24776 {
24777- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
24778- }
24779+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
24780+ ;}
24781 break;
24782
24783 case 50:
24784 #line 663 "parse.y"
24785 {
24786- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
24787- }
24788+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
24789+ ;}
24790 break;
24791
24792 case 51:
24793 #line 669 "parse.y"
24794 {
24795- (yyval.vars) = dyna_push();
24796- (yyvsp[(1) - (1)].num) = ruby_sourceline;
24797- }
24798+ yyval.vars = dyna_push();
24799+ yyvsp[0].num = ruby_sourceline;
24800+ ;}
24801 break;
24802
24803 case 52:
24804 #line 673 "parse.y"
24805- {(yyval.vars) = ruby_dyna_vars;}
24806+ {yyval.vars = ruby_dyna_vars;;}
24807 break;
24808
24809 case 53:
24810 #line 676 "parse.y"
24811 {
24812- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
24813- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
24814- dyna_pop((yyvsp[(2) - (6)].vars));
24815- }
24816+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
24817+ nd_set_line(yyval.node, yyvsp[-5].num);
24818+ dyna_pop(yyvsp[-4].vars);
24819+ ;}
24820 break;
24821
24822 case 54:
24823 #line 684 "parse.y"
24824 {
24825- (yyval.node) = new_fcall((yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].node));
24826- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
24827- }
24828+ yyval.node = new_fcall(yyvsp[-1].id, yyvsp[0].node);
24829+ fixpos(yyval.node, yyvsp[0].node);
24830+ ;}
24831 break;
24832
24833 case 55:
24834 #line 689 "parse.y"
24835 {
24836- (yyval.node) = new_fcall((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].node));
24837- if ((yyvsp[(3) - (3)].node)) {
24838- if (nd_type((yyval.node)) == NODE_BLOCK_PASS) {
24839+ yyval.node = new_fcall(yyvsp[-2].id, yyvsp[-1].node);
24840+ if (yyvsp[0].node) {
24841+ if (nd_type(yyval.node) == NODE_BLOCK_PASS) {
24842 rb_compile_error("both block arg and actual block given");
24843 }
24844- (yyvsp[(3) - (3)].node)->nd_iter = (yyval.node);
24845- (yyval.node) = (yyvsp[(3) - (3)].node);
24846+ yyvsp[0].node->nd_iter = yyval.node;
24847+ yyval.node = yyvsp[0].node;
24848 }
24849- fixpos((yyval.node), (yyvsp[(2) - (3)].node));
24850- }
24851+ fixpos(yyval.node, yyvsp[-1].node);
24852+ ;}
24853 break;
24854
24855 case 56:
24856 #line 701 "parse.y"
24857 {
24858- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
24859- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
24860- }
24861+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
24862+ fixpos(yyval.node, yyvsp[-3].node);
24863+ ;}
24864 break;
24865
24866 case 57:
24867 #line 706 "parse.y"
24868 {
24869- (yyval.node) = new_call((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].node));
24870- if ((yyvsp[(5) - (5)].node)) {
24871- if (nd_type((yyval.node)) == NODE_BLOCK_PASS) {
24872+ yyval.node = new_call(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].node);
24873+ if (yyvsp[0].node) {
24874+ if (nd_type(yyval.node) == NODE_BLOCK_PASS) {
24875 rb_compile_error("both block arg and actual block given");
24876 }
24877- (yyvsp[(5) - (5)].node)->nd_iter = (yyval.node);
24878- (yyval.node) = (yyvsp[(5) - (5)].node);
24879+ yyvsp[0].node->nd_iter = yyval.node;
24880+ yyval.node = yyvsp[0].node;
24881 }
24882- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
24883- }
24884+ fixpos(yyval.node, yyvsp[-4].node);
24885+ ;}
24886 break;
24887
24888 case 58:
24889 #line 718 "parse.y"
24890 {
24891- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
24892- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
24893- }
24894+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
24895+ fixpos(yyval.node, yyvsp[-3].node);
24896+ ;}
24897 break;
24898
24899 case 59:
24900 #line 723 "parse.y"
24901 {
24902- (yyval.node) = new_call((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].node));
24903- if ((yyvsp[(5) - (5)].node)) {
24904- if (nd_type((yyval.node)) == NODE_BLOCK_PASS) {
24905+ yyval.node = new_call(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].node);
24906+ if (yyvsp[0].node) {
24907+ if (nd_type(yyval.node) == NODE_BLOCK_PASS) {
24908 rb_compile_error("both block arg and actual block given");
24909 }
24910- (yyvsp[(5) - (5)].node)->nd_iter = (yyval.node);
24911- (yyval.node) = (yyvsp[(5) - (5)].node);
24912+ yyvsp[0].node->nd_iter = yyval.node;
24913+ yyval.node = yyvsp[0].node;
24914 }
24915- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
24916- }
24917+ fixpos(yyval.node, yyvsp[-4].node);
24918+ ;}
24919 break;
24920
24921 case 60:
24922 #line 735 "parse.y"
24923 {
24924- (yyval.node) = new_super((yyvsp[(2) - (2)].node));
24925- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
24926- }
24927+ yyval.node = new_super(yyvsp[0].node);
24928+ fixpos(yyval.node, yyvsp[0].node);
24929+ ;}
24930 break;
24931
24932 case 61:
24933 #line 740 "parse.y"
24934 {
24935- (yyval.node) = new_yield((yyvsp[(2) - (2)].node));
24936- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
24937- }
24938+ yyval.node = new_yield(yyvsp[0].node);
24939+ fixpos(yyval.node, yyvsp[0].node);
24940+ ;}
24941 break;
24942
24943 case 63:
24944 #line 748 "parse.y"
24945 {
24946- (yyval.node) = (yyvsp[(2) - (3)].node);
24947- }
24948+ yyval.node = yyvsp[-1].node;
24949+ ;}
24950 break;
24951
24952 case 65:
24953 #line 755 "parse.y"
24954 {
24955- (yyval.node) = NEW_MASGN(NEW_LIST((yyvsp[(2) - (3)].node)), 0);
24956- }
24957+ yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-1].node), 0);
24958+ ;}
24959 break;
24960
24961 case 66:
24962 #line 761 "parse.y"
24963 {
24964- (yyval.node) = NEW_MASGN((yyvsp[(1) - (1)].node), 0);
24965- }
24966+ yyval.node = NEW_MASGN(yyvsp[0].node, 0);
24967+ ;}
24968 break;
24969
24970 case 67:
24971 #line 765 "parse.y"
24972 {
24973- (yyval.node) = NEW_MASGN(list_append((yyvsp[(1) - (2)].node),(yyvsp[(2) - (2)].node)), 0);
24974- }
24975+ yyval.node = NEW_MASGN(list_append(yyvsp[-1].node,yyvsp[0].node), 0);
24976+ ;}
24977 break;
24978
24979 case 68:
24980 #line 769 "parse.y"
24981 {
24982- (yyval.node) = NEW_MASGN((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
24983- }
24984+ yyval.node = NEW_MASGN(yyvsp[-2].node, yyvsp[0].node);
24985+ ;}
24986 break;
24987
24988 case 69:
24989 #line 773 "parse.y"
24990 {
24991- (yyval.node) = NEW_MASGN((yyvsp[(1) - (2)].node), -1);
24992- }
24993+ yyval.node = NEW_MASGN(yyvsp[-1].node, -1);
24994+ ;}
24995 break;
24996
24997 case 70:
24998 #line 777 "parse.y"
24999 {
25000- (yyval.node) = NEW_MASGN(0, (yyvsp[(2) - (2)].node));
25001- }
25002+ yyval.node = NEW_MASGN(0, yyvsp[0].node);
25003+ ;}
25004 break;
25005
25006 case 71:
25007 #line 781 "parse.y"
25008 {
25009- (yyval.node) = NEW_MASGN(0, -1);
25010- }
25011+ yyval.node = NEW_MASGN(0, -1);
25012+ ;}
25013 break;
25014
25015 case 73:
25016 #line 788 "parse.y"
25017 {
25018- (yyval.node) = (yyvsp[(2) - (3)].node);
25019- }
25020+ yyval.node = yyvsp[-1].node;
25021+ ;}
25022 break;
25023
25024 case 74:
25025 #line 794 "parse.y"
25026 {
25027- (yyval.node) = NEW_LIST((yyvsp[(1) - (2)].node));
25028- }
25029+ yyval.node = NEW_LIST(yyvsp[-1].node);
25030+ ;}
25031 break;
25032
25033 case 75:
25034 #line 798 "parse.y"
25035 {
25036- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].node));
25037- }
25038+ yyval.node = list_append(yyvsp[-2].node, yyvsp[-1].node);
25039+ ;}
25040 break;
25041
25042 case 76:
25043 #line 804 "parse.y"
25044 {
25045- (yyval.node) = assignable((yyvsp[(1) - (1)].id), 0);
25046- }
25047+ yyval.node = assignable(yyvsp[0].id, 0);
25048+ ;}
25049 break;
25050
25051 case 77:
25052 #line 808 "parse.y"
25053 {
25054- (yyval.node) = aryset((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].node));
25055- }
25056+ yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node);
25057+ ;}
25058 break;
25059
25060 case 78:
25061 #line 812 "parse.y"
25062 {
25063- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25064- }
25065+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
25066+ ;}
25067 break;
25068
25069 case 79:
25070 #line 816 "parse.y"
25071 {
25072- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25073- }
25074+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
25075+ ;}
25076 break;
25077
25078 case 80:
25079 #line 820 "parse.y"
25080 {
25081- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25082- }
25083+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
25084+ ;}
25085 break;
25086
25087 case 81:
25088@@ -4963,8 +4630,8 @@
25089 {
25090 if (in_def || in_single)
25091 yyerror("dynamic constant assignment");
25092- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id)));
25093- }
25094+ yyval.node = NEW_CDECL(0, 0, NEW_COLON2(yyvsp[-2].node, yyvsp[0].id));
25095+ ;}
25096 break;
25097
25098 case 82:
25099@@ -4972,51 +4639,51 @@
25100 {
25101 if (in_def || in_single)
25102 yyerror("dynamic constant assignment");
25103- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON3((yyvsp[(2) - (2)].id)));
25104- }
25105+ yyval.node = NEW_CDECL(0, 0, NEW_COLON3(yyvsp[0].id));
25106+ ;}
25107 break;
25108
25109 case 83:
25110 #line 836 "parse.y"
25111 {
25112- rb_backref_error((yyvsp[(1) - (1)].node));
25113- (yyval.node) = 0;
25114- }
25115+ rb_backref_error(yyvsp[0].node);
25116+ yyval.node = 0;
25117+ ;}
25118 break;
25119
25120 case 84:
25121 #line 843 "parse.y"
25122 {
25123- (yyval.node) = assignable((yyvsp[(1) - (1)].id), 0);
25124- }
25125+ yyval.node = assignable(yyvsp[0].id, 0);
25126+ ;}
25127 break;
25128
25129 case 85:
25130 #line 847 "parse.y"
25131 {
25132- (yyval.node) = aryset((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].node));
25133- }
25134+ yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node);
25135+ ;}
25136 break;
25137
25138 case 86:
25139 #line 851 "parse.y"
25140 {
25141- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25142- }
25143+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
25144+ ;}
25145 break;
25146
25147 case 87:
25148 #line 855 "parse.y"
25149 {
25150- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25151- }
25152+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
25153+ ;}
25154 break;
25155
25156 case 88:
25157 #line 859 "parse.y"
25158 {
25159- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25160- }
25161+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
25162+ ;}
25163 break;
25164
25165 case 89:
25166@@ -5024,8 +4691,8 @@
25167 {
25168 if (in_def || in_single)
25169 yyerror("dynamic constant assignment");
25170- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id)));
25171- }
25172+ yyval.node = NEW_CDECL(0, 0, NEW_COLON2(yyvsp[-2].node, yyvsp[0].id));
25173+ ;}
25174 break;
25175
25176 case 90:
25177@@ -5033,1190 +4700,1190 @@
25178 {
25179 if (in_def || in_single)
25180 yyerror("dynamic constant assignment");
25181- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON3((yyvsp[(2) - (2)].id)));
25182- }
25183+ yyval.node = NEW_CDECL(0, 0, NEW_COLON3(yyvsp[0].id));
25184+ ;}
25185 break;
25186
25187 case 91:
25188 #line 875 "parse.y"
25189 {
25190- rb_backref_error((yyvsp[(1) - (1)].node));
25191- (yyval.node) = 0;
25192- }
25193+ rb_backref_error(yyvsp[0].node);
25194+ yyval.node = 0;
25195+ ;}
25196 break;
25197
25198 case 92:
25199 #line 882 "parse.y"
25200 {
25201 yyerror("class/module name must be CONSTANT");
25202- }
25203+ ;}
25204 break;
25205
25206 case 94:
25207 #line 889 "parse.y"
25208 {
25209- (yyval.node) = NEW_COLON3((yyvsp[(2) - (2)].id));
25210- }
25211+ yyval.node = NEW_COLON3(yyvsp[0].id);
25212+ ;}
25213 break;
25214
25215 case 95:
25216 #line 893 "parse.y"
25217 {
25218- (yyval.node) = NEW_COLON2(0, (yyval.node));
25219- }
25220+ yyval.node = NEW_COLON2(0, yyval.node);
25221+ ;}
25222 break;
25223
25224 case 96:
25225 #line 897 "parse.y"
25226 {
25227- (yyval.node) = NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
25228- }
25229+ yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id);
25230+ ;}
25231 break;
25232
25233 case 100:
25234 #line 906 "parse.y"
25235 {
25236 lex_state = EXPR_END;
25237- (yyval.id) = (yyvsp[(1) - (1)].id);
25238- }
25239+ yyval.id = yyvsp[0].id;
25240+ ;}
25241 break;
25242
25243 case 101:
25244 #line 911 "parse.y"
25245 {
25246 lex_state = EXPR_END;
25247- (yyval.id) = (yyvsp[(1) - (1)].id);
25248- }
25249+ yyval.id = yyvsp[0].id;
25250+ ;}
25251 break;
25252
25253 case 104:
25254 #line 922 "parse.y"
25255 {
25256- (yyval.node) = NEW_LIT(ID2SYM((yyvsp[(1) - (1)].id)));
25257- }
25258+ yyval.node = NEW_LIT(ID2SYM(yyvsp[0].id));
25259+ ;}
25260 break;
25261
25262 case 106:
25263 #line 929 "parse.y"
25264 {
25265- (yyval.node) = NEW_UNDEF((yyvsp[(1) - (1)].node));
25266- }
25267+ yyval.node = NEW_UNDEF(yyvsp[0].node);
25268+ ;}
25269 break;
25270
25271 case 107:
25272 #line 932 "parse.y"
25273- {lex_state = EXPR_FNAME;}
25274+ {lex_state = EXPR_FNAME;;}
25275 break;
25276
25277 case 108:
25278 #line 933 "parse.y"
25279 {
25280- (yyval.node) = block_append((yyvsp[(1) - (4)].node), NEW_UNDEF((yyvsp[(4) - (4)].node)));
25281- }
25282+ yyval.node = block_append(yyvsp[-3].node, NEW_UNDEF(yyvsp[0].node));
25283+ ;}
25284 break;
25285
25286 case 109:
25287 #line 938 "parse.y"
25288- { (yyval.id) = '|'; }
25289+ { yyval.id = '|'; ;}
25290 break;
25291
25292 case 110:
25293 #line 939 "parse.y"
25294- { (yyval.id) = '^'; }
25295+ { yyval.id = '^'; ;}
25296 break;
25297
25298 case 111:
25299 #line 940 "parse.y"
25300- { (yyval.id) = '&'; }
25301+ { yyval.id = '&'; ;}
25302 break;
25303
25304 case 112:
25305 #line 941 "parse.y"
25306- { (yyval.id) = tCMP; }
25307+ { yyval.id = tCMP; ;}
25308 break;
25309
25310 case 113:
25311 #line 942 "parse.y"
25312- { (yyval.id) = tEQ; }
25313+ { yyval.id = tEQ; ;}
25314 break;
25315
25316 case 114:
25317 #line 943 "parse.y"
25318- { (yyval.id) = tEQQ; }
25319+ { yyval.id = tEQQ; ;}
25320 break;
25321
25322 case 115:
25323 #line 944 "parse.y"
25324- { (yyval.id) = tMATCH; }
25325+ { yyval.id = tMATCH; ;}
25326 break;
25327
25328 case 116:
25329 #line 945 "parse.y"
25330- { (yyval.id) = '>'; }
25331+ { yyval.id = '>'; ;}
25332 break;
25333
25334 case 117:
25335 #line 946 "parse.y"
25336- { (yyval.id) = tGEQ; }
25337+ { yyval.id = tGEQ; ;}
25338 break;
25339
25340 case 118:
25341 #line 947 "parse.y"
25342- { (yyval.id) = '<'; }
25343+ { yyval.id = '<'; ;}
25344 break;
25345
25346 case 119:
25347 #line 948 "parse.y"
25348- { (yyval.id) = tLEQ; }
25349+ { yyval.id = tLEQ; ;}
25350 break;
25351
25352 case 120:
25353 #line 949 "parse.y"
25354- { (yyval.id) = tLSHFT; }
25355+ { yyval.id = tLSHFT; ;}
25356 break;
25357
25358 case 121:
25359 #line 950 "parse.y"
25360- { (yyval.id) = tRSHFT; }
25361+ { yyval.id = tRSHFT; ;}
25362 break;
25363
25364 case 122:
25365 #line 951 "parse.y"
25366- { (yyval.id) = '+'; }
25367+ { yyval.id = '+'; ;}
25368 break;
25369
25370 case 123:
25371 #line 952 "parse.y"
25372- { (yyval.id) = '-'; }
25373+ { yyval.id = '-'; ;}
25374 break;
25375
25376 case 124:
25377 #line 953 "parse.y"
25378- { (yyval.id) = '*'; }
25379+ { yyval.id = '*'; ;}
25380 break;
25381
25382 case 125:
25383 #line 954 "parse.y"
25384- { (yyval.id) = '*'; }
25385+ { yyval.id = '*'; ;}
25386 break;
25387
25388 case 126:
25389 #line 955 "parse.y"
25390- { (yyval.id) = '/'; }
25391+ { yyval.id = '/'; ;}
25392 break;
25393
25394 case 127:
25395 #line 956 "parse.y"
25396- { (yyval.id) = '%'; }
25397+ { yyval.id = '%'; ;}
25398 break;
25399
25400 case 128:
25401 #line 957 "parse.y"
25402- { (yyval.id) = tPOW; }
25403+ { yyval.id = tPOW; ;}
25404 break;
25405
25406 case 129:
25407 #line 958 "parse.y"
25408- { (yyval.id) = '~'; }
25409+ { yyval.id = '~'; ;}
25410 break;
25411
25412 case 130:
25413 #line 959 "parse.y"
25414- { (yyval.id) = tUPLUS; }
25415+ { yyval.id = tUPLUS; ;}
25416 break;
25417
25418 case 131:
25419 #line 960 "parse.y"
25420- { (yyval.id) = tUMINUS; }
25421+ { yyval.id = tUMINUS; ;}
25422 break;
25423
25424 case 132:
25425 #line 961 "parse.y"
25426- { (yyval.id) = tAREF; }
25427+ { yyval.id = tAREF; ;}
25428 break;
25429
25430 case 133:
25431 #line 962 "parse.y"
25432- { (yyval.id) = tASET; }
25433+ { yyval.id = tASET; ;}
25434 break;
25435
25436 case 134:
25437 #line 963 "parse.y"
25438- { (yyval.id) = '`'; }
25439+ { yyval.id = '`'; ;}
25440 break;
25441
25442 case 175:
25443 #line 976 "parse.y"
25444 {
25445- (yyval.node) = node_assign((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
25446- }
25447+ yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node);
25448+ ;}
25449 break;
25450
25451 case 176:
25452 #line 980 "parse.y"
25453 {
25454- (yyval.node) = node_assign((yyvsp[(1) - (5)].node), NEW_RESCUE((yyvsp[(3) - (5)].node), NEW_RESBODY(0,(yyvsp[(5) - (5)].node),0), 0));
25455- }
25456+ yyval.node = node_assign(yyvsp[-4].node, NEW_RESCUE(yyvsp[-2].node, NEW_RESBODY(0,yyvsp[0].node,0), 0));
25457+ ;}
25458 break;
25459
25460 case 177:
25461 #line 984 "parse.y"
25462 {
25463- value_expr((yyvsp[(3) - (3)].node));
25464- if ((yyvsp[(1) - (3)].node)) {
25465- ID vid = (yyvsp[(1) - (3)].node)->nd_vid;
25466- if ((yyvsp[(2) - (3)].id) == tOROP) {
25467- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
25468- (yyval.node) = NEW_OP_ASGN_OR(gettable(vid), (yyvsp[(1) - (3)].node));
25469+ value_expr(yyvsp[0].node);
25470+ if (yyvsp[-2].node) {
25471+ ID vid = yyvsp[-2].node->nd_vid;
25472+ if (yyvsp[-1].id == tOROP) {
25473+ yyvsp[-2].node->nd_value = yyvsp[0].node;
25474+ yyval.node = NEW_OP_ASGN_OR(gettable(vid), yyvsp[-2].node);
25475 if (is_asgn_or_id(vid)) {
25476- (yyval.node)->nd_aid = vid;
25477+ yyval.node->nd_aid = vid;
25478 }
25479 }
25480- else if ((yyvsp[(2) - (3)].id) == tANDOP) {
25481- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
25482- (yyval.node) = NEW_OP_ASGN_AND(gettable(vid), (yyvsp[(1) - (3)].node));
25483+ else if (yyvsp[-1].id == tANDOP) {
25484+ yyvsp[-2].node->nd_value = yyvsp[0].node;
25485+ yyval.node = NEW_OP_ASGN_AND(gettable(vid), yyvsp[-2].node);
25486 }
25487 else {
25488- (yyval.node) = (yyvsp[(1) - (3)].node);
25489- (yyval.node)->nd_value = call_op(gettable(vid),(yyvsp[(2) - (3)].id),1,(yyvsp[(3) - (3)].node));
25490+ yyval.node = yyvsp[-2].node;
25491+ yyval.node->nd_value = call_op(gettable(vid),yyvsp[-1].id,1,yyvsp[0].node);
25492 }
25493 }
25494 else {
25495- (yyval.node) = 0;
25496+ yyval.node = 0;
25497 }
25498- }
25499+ ;}
25500 break;
25501
25502 case 178:
25503 #line 1009 "parse.y"
25504 {
25505- NODE *args;
25506-
25507- value_expr((yyvsp[(6) - (6)].node));
25508- if (!(yyvsp[(3) - (6)].node)) (yyvsp[(3) - (6)].node) = NEW_ZARRAY();
25509- args = arg_concat((yyvsp[(6) - (6)].node), (yyvsp[(3) - (6)].node));
25510- if ((yyvsp[(5) - (6)].id) == tOROP) {
25511- (yyvsp[(5) - (6)].id) = 0;
25512- }
25513- else if ((yyvsp[(5) - (6)].id) == tANDOP) {
25514- (yyvsp[(5) - (6)].id) = 1;
25515- }
25516- (yyval.node) = NEW_OP_ASGN1((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].id), args);
25517- fixpos((yyval.node), (yyvsp[(1) - (6)].node));
25518- }
25519+ NODE *args;
25520+
25521+ value_expr(yyvsp[0].node);
25522+ if (!yyvsp[-3].node) yyvsp[-3].node = NEW_ZARRAY();
25523+ args = arg_concat(yyvsp[0].node, yyvsp[-3].node);
25524+ if (yyvsp[-1].id == tOROP) {
25525+ yyvsp[-1].id = 0;
25526+ }
25527+ else if (yyvsp[-1].id == tANDOP) {
25528+ yyvsp[-1].id = 1;
25529+ }
25530+ yyval.node = NEW_OP_ASGN1(yyvsp[-5].node, yyvsp[-1].id, args);
25531+ fixpos(yyval.node, yyvsp[-5].node);
25532+ ;}
25533 break;
25534
25535 case 179:
25536 #line 1025 "parse.y"
25537 {
25538- value_expr((yyvsp[(5) - (5)].node));
25539- if ((yyvsp[(4) - (5)].id) == tOROP) {
25540- (yyvsp[(4) - (5)].id) = 0;
25541- }
25542- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
25543- (yyvsp[(4) - (5)].id) = 1;
25544- }
25545- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
25546- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
25547- }
25548+ value_expr(yyvsp[0].node);
25549+ if (yyvsp[-1].id == tOROP) {
25550+ yyvsp[-1].id = 0;
25551+ }
25552+ else if (yyvsp[-1].id == tANDOP) {
25553+ yyvsp[-1].id = 1;
25554+ }
25555+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
25556+ fixpos(yyval.node, yyvsp[-4].node);
25557+ ;}
25558 break;
25559
25560 case 180:
25561 #line 1037 "parse.y"
25562 {
25563- value_expr((yyvsp[(5) - (5)].node));
25564- if ((yyvsp[(4) - (5)].id) == tOROP) {
25565- (yyvsp[(4) - (5)].id) = 0;
25566- }
25567- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
25568- (yyvsp[(4) - (5)].id) = 1;
25569- }
25570- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
25571- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
25572- }
25573+ value_expr(yyvsp[0].node);
25574+ if (yyvsp[-1].id == tOROP) {
25575+ yyvsp[-1].id = 0;
25576+ }
25577+ else if (yyvsp[-1].id == tANDOP) {
25578+ yyvsp[-1].id = 1;
25579+ }
25580+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
25581+ fixpos(yyval.node, yyvsp[-4].node);
25582+ ;}
25583 break;
25584
25585 case 181:
25586 #line 1049 "parse.y"
25587 {
25588- value_expr((yyvsp[(5) - (5)].node));
25589- if ((yyvsp[(4) - (5)].id) == tOROP) {
25590- (yyvsp[(4) - (5)].id) = 0;
25591- }
25592- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
25593- (yyvsp[(4) - (5)].id) = 1;
25594- }
25595- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
25596- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
25597- }
25598+ value_expr(yyvsp[0].node);
25599+ if (yyvsp[-1].id == tOROP) {
25600+ yyvsp[-1].id = 0;
25601+ }
25602+ else if (yyvsp[-1].id == tANDOP) {
25603+ yyvsp[-1].id = 1;
25604+ }
25605+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
25606+ fixpos(yyval.node, yyvsp[-4].node);
25607+ ;}
25608 break;
25609
25610 case 182:
25611 #line 1061 "parse.y"
25612 {
25613 yyerror("constant re-assignment");
25614- (yyval.node) = 0;
25615- }
25616+ yyval.node = 0;
25617+ ;}
25618 break;
25619
25620 case 183:
25621 #line 1066 "parse.y"
25622 {
25623 yyerror("constant re-assignment");
25624- (yyval.node) = 0;
25625- }
25626+ yyval.node = 0;
25627+ ;}
25628 break;
25629
25630 case 184:
25631 #line 1071 "parse.y"
25632 {
25633- rb_backref_error((yyvsp[(1) - (3)].node));
25634- (yyval.node) = 0;
25635- }
25636+ rb_backref_error(yyvsp[-2].node);
25637+ yyval.node = 0;
25638+ ;}
25639 break;
25640
25641 case 185:
25642 #line 1076 "parse.y"
25643 {
25644- value_expr((yyvsp[(1) - (3)].node));
25645- value_expr((yyvsp[(3) - (3)].node));
25646- if (nd_type((yyvsp[(1) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(1) - (3)].node)->nd_lit) &&
25647- nd_type((yyvsp[(3) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(3) - (3)].node)->nd_lit)) {
25648- (yyvsp[(1) - (3)].node)->nd_lit = rb_range_new((yyvsp[(1) - (3)].node)->nd_lit, (yyvsp[(3) - (3)].node)->nd_lit, Qfalse);
25649- (yyval.node) = (yyvsp[(1) - (3)].node);
25650+ value_expr(yyvsp[-2].node);
25651+ value_expr(yyvsp[0].node);
25652+ if (nd_type(yyvsp[-2].node) == NODE_LIT && FIXNUM_P(yyvsp[-2].node->nd_lit) &&
25653+ nd_type(yyvsp[0].node) == NODE_LIT && FIXNUM_P(yyvsp[0].node->nd_lit)) {
25654+ yyvsp[-2].node->nd_lit = rb_range_new(yyvsp[-2].node->nd_lit, yyvsp[0].node->nd_lit, Qfalse);
25655+ yyval.node = yyvsp[-2].node;
25656 }
25657 else {
25658- (yyval.node) = NEW_DOT2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
25659+ yyval.node = NEW_DOT2(yyvsp[-2].node, yyvsp[0].node);
25660 }
25661- }
25662+ ;}
25663 break;
25664
25665 case 186:
25666 #line 1089 "parse.y"
25667 {
25668- value_expr((yyvsp[(1) - (3)].node));
25669- value_expr((yyvsp[(3) - (3)].node));
25670- if (nd_type((yyvsp[(1) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(1) - (3)].node)->nd_lit) &&
25671- nd_type((yyvsp[(3) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(3) - (3)].node)->nd_lit)) {
25672- (yyvsp[(1) - (3)].node)->nd_lit = rb_range_new((yyvsp[(1) - (3)].node)->nd_lit, (yyvsp[(3) - (3)].node)->nd_lit, Qtrue);
25673- (yyval.node) = (yyvsp[(1) - (3)].node);
25674+ value_expr(yyvsp[-2].node);
25675+ value_expr(yyvsp[0].node);
25676+ if (nd_type(yyvsp[-2].node) == NODE_LIT && FIXNUM_P(yyvsp[-2].node->nd_lit) &&
25677+ nd_type(yyvsp[0].node) == NODE_LIT && FIXNUM_P(yyvsp[0].node->nd_lit)) {
25678+ yyvsp[-2].node->nd_lit = rb_range_new(yyvsp[-2].node->nd_lit, yyvsp[0].node->nd_lit, Qtrue);
25679+ yyval.node = yyvsp[-2].node;
25680 }
25681 else {
25682- (yyval.node) = NEW_DOT3((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
25683+ yyval.node = NEW_DOT3(yyvsp[-2].node, yyvsp[0].node);
25684 }
25685- }
25686+ ;}
25687 break;
25688
25689 case 187:
25690 #line 1102 "parse.y"
25691 {
25692- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '+', 1, (yyvsp[(3) - (3)].node));
25693- }
25694+ yyval.node = call_op(yyvsp[-2].node, '+', 1, yyvsp[0].node);
25695+ ;}
25696 break;
25697
25698 case 188:
25699 #line 1106 "parse.y"
25700 {
25701- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '-', 1, (yyvsp[(3) - (3)].node));
25702- }
25703+ yyval.node = call_op(yyvsp[-2].node, '-', 1, yyvsp[0].node);
25704+ ;}
25705 break;
25706
25707 case 189:
25708 #line 1110 "parse.y"
25709 {
25710- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '*', 1, (yyvsp[(3) - (3)].node));
25711- }
25712+ yyval.node = call_op(yyvsp[-2].node, '*', 1, yyvsp[0].node);
25713+ ;}
25714 break;
25715
25716 case 190:
25717 #line 1114 "parse.y"
25718 {
25719- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '/', 1, (yyvsp[(3) - (3)].node));
25720- }
25721+ yyval.node = call_op(yyvsp[-2].node, '/', 1, yyvsp[0].node);
25722+ ;}
25723 break;
25724
25725 case 191:
25726 #line 1118 "parse.y"
25727 {
25728- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '%', 1, (yyvsp[(3) - (3)].node));
25729- }
25730+ yyval.node = call_op(yyvsp[-2].node, '%', 1, yyvsp[0].node);
25731+ ;}
25732 break;
25733
25734 case 192:
25735 #line 1122 "parse.y"
25736 {
25737- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tPOW, 1, (yyvsp[(3) - (3)].node));
25738- }
25739+ yyval.node = call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node);
25740+ ;}
25741 break;
25742
25743 case 193:
25744 #line 1126 "parse.y"
25745 {
25746- (yyval.node) = call_op(call_op((yyvsp[(2) - (4)].node), tPOW, 1, (yyvsp[(4) - (4)].node)), tUMINUS, 0, 0);
25747- }
25748+ yyval.node = call_op(call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node), tUMINUS, 0, 0);
25749+ ;}
25750 break;
25751
25752 case 194:
25753 #line 1130 "parse.y"
25754 {
25755- (yyval.node) = call_op(call_op((yyvsp[(2) - (4)].node), tPOW, 1, (yyvsp[(4) - (4)].node)), tUMINUS, 0, 0);
25756- }
25757+ yyval.node = call_op(call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node), tUMINUS, 0, 0);
25758+ ;}
25759 break;
25760
25761 case 195:
25762 #line 1134 "parse.y"
25763 {
25764- if ((yyvsp[(2) - (2)].node) && nd_type((yyvsp[(2) - (2)].node)) == NODE_LIT) {
25765- (yyval.node) = (yyvsp[(2) - (2)].node);
25766+ if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_LIT) {
25767+ yyval.node = yyvsp[0].node;
25768 }
25769 else {
25770- (yyval.node) = call_op((yyvsp[(2) - (2)].node), tUPLUS, 0, 0);
25771+ yyval.node = call_op(yyvsp[0].node, tUPLUS, 0, 0);
25772 }
25773- }
25774+ ;}
25775 break;
25776
25777 case 196:
25778 #line 1143 "parse.y"
25779 {
25780- (yyval.node) = call_op((yyvsp[(2) - (2)].node), tUMINUS, 0, 0);
25781- }
25782+ yyval.node = call_op(yyvsp[0].node, tUMINUS, 0, 0);
25783+ ;}
25784 break;
25785
25786 case 197:
25787 #line 1147 "parse.y"
25788 {
25789- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '|', 1, (yyvsp[(3) - (3)].node));
25790- }
25791+ yyval.node = call_op(yyvsp[-2].node, '|', 1, yyvsp[0].node);
25792+ ;}
25793 break;
25794
25795 case 198:
25796 #line 1151 "parse.y"
25797 {
25798- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '^', 1, (yyvsp[(3) - (3)].node));
25799- }
25800+ yyval.node = call_op(yyvsp[-2].node, '^', 1, yyvsp[0].node);
25801+ ;}
25802 break;
25803
25804 case 199:
25805 #line 1155 "parse.y"
25806 {
25807- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '&', 1, (yyvsp[(3) - (3)].node));
25808- }
25809+ yyval.node = call_op(yyvsp[-2].node, '&', 1, yyvsp[0].node);
25810+ ;}
25811 break;
25812
25813 case 200:
25814 #line 1159 "parse.y"
25815 {
25816- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tCMP, 1, (yyvsp[(3) - (3)].node));
25817- }
25818+ yyval.node = call_op(yyvsp[-2].node, tCMP, 1, yyvsp[0].node);
25819+ ;}
25820 break;
25821
25822 case 201:
25823 #line 1163 "parse.y"
25824 {
25825- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '>', 1, (yyvsp[(3) - (3)].node));
25826- }
25827+ yyval.node = call_op(yyvsp[-2].node, '>', 1, yyvsp[0].node);
25828+ ;}
25829 break;
25830
25831 case 202:
25832 #line 1167 "parse.y"
25833 {
25834- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tGEQ, 1, (yyvsp[(3) - (3)].node));
25835- }
25836+ yyval.node = call_op(yyvsp[-2].node, tGEQ, 1, yyvsp[0].node);
25837+ ;}
25838 break;
25839
25840 case 203:
25841 #line 1171 "parse.y"
25842 {
25843- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '<', 1, (yyvsp[(3) - (3)].node));
25844- }
25845+ yyval.node = call_op(yyvsp[-2].node, '<', 1, yyvsp[0].node);
25846+ ;}
25847 break;
25848
25849 case 204:
25850 #line 1175 "parse.y"
25851 {
25852- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tLEQ, 1, (yyvsp[(3) - (3)].node));
25853- }
25854+ yyval.node = call_op(yyvsp[-2].node, tLEQ, 1, yyvsp[0].node);
25855+ ;}
25856 break;
25857
25858 case 205:
25859 #line 1179 "parse.y"
25860 {
25861- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tEQ, 1, (yyvsp[(3) - (3)].node));
25862- }
25863+ yyval.node = call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node);
25864+ ;}
25865 break;
25866
25867 case 206:
25868 #line 1183 "parse.y"
25869 {
25870- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tEQQ, 1, (yyvsp[(3) - (3)].node));
25871- }
25872+ yyval.node = call_op(yyvsp[-2].node, tEQQ, 1, yyvsp[0].node);
25873+ ;}
25874 break;
25875
25876 case 207:
25877 #line 1187 "parse.y"
25878 {
25879- (yyval.node) = NEW_NOT(call_op((yyvsp[(1) - (3)].node), tEQ, 1, (yyvsp[(3) - (3)].node)));
25880- }
25881+ yyval.node = NEW_NOT(call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node));
25882+ ;}
25883 break;
25884
25885 case 208:
25886 #line 1191 "parse.y"
25887 {
25888- (yyval.node) = match_gen((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
25889- }
25890+ yyval.node = match_gen(yyvsp[-2].node, yyvsp[0].node);
25891+ ;}
25892 break;
25893
25894 case 209:
25895 #line 1195 "parse.y"
25896 {
25897- (yyval.node) = NEW_NOT(match_gen((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)));
25898- }
25899+ yyval.node = NEW_NOT(match_gen(yyvsp[-2].node, yyvsp[0].node));
25900+ ;}
25901 break;
25902
25903 case 210:
25904 #line 1199 "parse.y"
25905 {
25906- (yyval.node) = NEW_NOT(cond((yyvsp[(2) - (2)].node)));
25907- }
25908+ yyval.node = NEW_NOT(cond(yyvsp[0].node));
25909+ ;}
25910 break;
25911
25912 case 211:
25913 #line 1203 "parse.y"
25914 {
25915- (yyval.node) = call_op((yyvsp[(2) - (2)].node), '~', 0, 0);
25916- }
25917+ yyval.node = call_op(yyvsp[0].node, '~', 0, 0);
25918+ ;}
25919 break;
25920
25921 case 212:
25922 #line 1207 "parse.y"
25923 {
25924- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tLSHFT, 1, (yyvsp[(3) - (3)].node));
25925- }
25926+ yyval.node = call_op(yyvsp[-2].node, tLSHFT, 1, yyvsp[0].node);
25927+ ;}
25928 break;
25929
25930 case 213:
25931 #line 1211 "parse.y"
25932 {
25933- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tRSHFT, 1, (yyvsp[(3) - (3)].node));
25934- }
25935+ yyval.node = call_op(yyvsp[-2].node, tRSHFT, 1, yyvsp[0].node);
25936+ ;}
25937 break;
25938
25939 case 214:
25940 #line 1215 "parse.y"
25941 {
25942- (yyval.node) = logop(NODE_AND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
25943- }
25944+ yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node);
25945+ ;}
25946 break;
25947
25948 case 215:
25949 #line 1219 "parse.y"
25950 {
25951- (yyval.node) = logop(NODE_OR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
25952- }
25953+ yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node);
25954+ ;}
25955 break;
25956
25957 case 216:
25958 #line 1222 "parse.y"
25959- {in_defined = 1;}
25960+ {in_defined = 1;;}
25961 break;
25962
25963 case 217:
25964 #line 1223 "parse.y"
25965 {
25966 in_defined = 0;
25967- (yyval.node) = NEW_DEFINED((yyvsp[(4) - (4)].node));
25968- }
25969+ yyval.node = NEW_DEFINED(yyvsp[0].node);
25970+ ;}
25971 break;
25972
25973 case 218:
25974 #line 1228 "parse.y"
25975 {
25976- (yyval.node) = NEW_IF(cond((yyvsp[(1) - (5)].node)), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));
25977- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
25978- }
25979+ yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[0].node);
25980+ fixpos(yyval.node, yyvsp[-4].node);
25981+ ;}
25982 break;
25983
25984 case 219:
25985 #line 1233 "parse.y"
25986 {
25987- (yyval.node) = (yyvsp[(1) - (1)].node);
25988- }
25989+ yyval.node = yyvsp[0].node;
25990+ ;}
25991 break;
25992
25993 case 220:
25994 #line 1239 "parse.y"
25995 {
25996- value_expr((yyvsp[(1) - (1)].node));
25997- (yyval.node) = (yyvsp[(1) - (1)].node);
25998- }
25999+ value_expr(yyvsp[0].node);
26000+ yyval.node = yyvsp[0].node;
26001+ ;}
26002 break;
26003
26004 case 222:
26005 #line 1247 "parse.y"
26006 {
26007 rb_warn("parenthesize argument(s) for future version");
26008- (yyval.node) = NEW_LIST((yyvsp[(1) - (2)].node));
26009- }
26010+ yyval.node = NEW_LIST(yyvsp[-1].node);
26011+ ;}
26012 break;
26013
26014 case 223:
26015 #line 1252 "parse.y"
26016 {
26017- (yyval.node) = (yyvsp[(1) - (2)].node);
26018- }
26019+ yyval.node = yyvsp[-1].node;
26020+ ;}
26021 break;
26022
26023 case 224:
26024 #line 1256 "parse.y"
26025 {
26026- value_expr((yyvsp[(4) - (5)].node));
26027- (yyval.node) = arg_concat((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].node));
26028- }
26029+ value_expr(yyvsp[-1].node);
26030+ yyval.node = arg_concat(yyvsp[-4].node, yyvsp[-1].node);
26031+ ;}
26032 break;
26033
26034 case 225:
26035 #line 1261 "parse.y"
26036 {
26037- (yyval.node) = NEW_LIST(NEW_HASH((yyvsp[(1) - (2)].node)));
26038- }
26039+ yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node));
26040+ ;}
26041 break;
26042
26043 case 226:
26044 #line 1265 "parse.y"
26045 {
26046- value_expr((yyvsp[(2) - (3)].node));
26047- (yyval.node) = NEW_NEWLINE(NEW_SPLAT((yyvsp[(2) - (3)].node)));
26048- }
26049+ value_expr(yyvsp[-1].node);
26050+ yyval.node = NEW_NEWLINE(NEW_SPLAT(yyvsp[-1].node));
26051+ ;}
26052 break;
26053
26054 case 227:
26055 #line 1272 "parse.y"
26056 {
26057- (yyval.node) = (yyvsp[(2) - (3)].node);
26058- }
26059+ yyval.node = yyvsp[-1].node;
26060+ ;}
26061 break;
26062
26063 case 228:
26064 #line 1276 "parse.y"
26065 {
26066- (yyval.node) = (yyvsp[(2) - (4)].node);
26067- }
26068+ yyval.node = yyvsp[-2].node;
26069+ ;}
26070 break;
26071
26072 case 229:
26073 #line 1280 "parse.y"
26074 {
26075 rb_warn("parenthesize argument for future version");
26076- (yyval.node) = NEW_LIST((yyvsp[(2) - (4)].node));
26077- }
26078+ yyval.node = NEW_LIST(yyvsp[-2].node);
26079+ ;}
26080 break;
26081
26082 case 230:
26083 #line 1285 "parse.y"
26084 {
26085 rb_warn("parenthesize argument for future version");
26086- (yyval.node) = list_append((yyvsp[(2) - (6)].node), (yyvsp[(4) - (6)].node));
26087- }
26088+ yyval.node = list_append(yyvsp[-4].node, yyvsp[-2].node);
26089+ ;}
26090 break;
26091
26092 case 233:
26093 #line 1296 "parse.y"
26094 {
26095 rb_warn("parenthesize argument(s) for future version");
26096- (yyval.node) = NEW_LIST((yyvsp[(1) - (1)].node));
26097- }
26098+ yyval.node = NEW_LIST(yyvsp[0].node);
26099+ ;}
26100 break;
26101
26102 case 234:
26103 #line 1301 "parse.y"
26104 {
26105- (yyval.node) = arg_blk_pass((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
26106- }
26107+ yyval.node = arg_blk_pass(yyvsp[-1].node, yyvsp[0].node);
26108+ ;}
26109 break;
26110
26111 case 235:
26112 #line 1305 "parse.y"
26113 {
26114- (yyval.node) = arg_concat((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].node));
26115- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
26116- }
26117+ yyval.node = arg_concat(yyvsp[-4].node, yyvsp[-1].node);
26118+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26119+ ;}
26120 break;
26121
26122 case 236:
26123 #line 1310 "parse.y"
26124 {
26125- (yyval.node) = NEW_LIST(NEW_HASH((yyvsp[(1) - (2)].node)));
26126- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(2) - (2)].node));
26127- }
26128+ yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node));
26129+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26130+ ;}
26131 break;
26132
26133 case 237:
26134 #line 1315 "parse.y"
26135 {
26136- (yyval.node) = arg_concat(NEW_LIST(NEW_HASH((yyvsp[(1) - (5)].node))), (yyvsp[(4) - (5)].node));
26137- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
26138- }
26139+ yyval.node = arg_concat(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
26140+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26141+ ;}
26142 break;
26143
26144 case 238:
26145 #line 1320 "parse.y"
26146 {
26147- (yyval.node) = list_append((yyvsp[(1) - (4)].node), NEW_HASH((yyvsp[(3) - (4)].node)));
26148- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(4) - (4)].node));
26149- }
26150+ yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node));
26151+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26152+ ;}
26153 break;
26154
26155 case 239:
26156 #line 1325 "parse.y"
26157 {
26158- value_expr((yyvsp[(6) - (7)].node));
26159- (yyval.node) = arg_concat(list_append((yyvsp[(1) - (7)].node), NEW_HASH((yyvsp[(3) - (7)].node))), (yyvsp[(6) - (7)].node));
26160- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(7) - (7)].node));
26161- }
26162+ value_expr(yyvsp[-1].node);
26163+ yyval.node = arg_concat(list_append(yyvsp[-6].node, NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
26164+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26165+ ;}
26166 break;
26167
26168 case 240:
26169 #line 1331 "parse.y"
26170 {
26171- (yyval.node) = arg_blk_pass(NEW_SPLAT((yyvsp[(2) - (3)].node)), (yyvsp[(3) - (3)].node));
26172- }
26173+ yyval.node = arg_blk_pass(NEW_SPLAT(yyvsp[-1].node), yyvsp[0].node);
26174+ ;}
26175 break;
26176
26177 case 242:
26178 #line 1338 "parse.y"
26179 {
26180- (yyval.node) = arg_blk_pass(list_concat(NEW_LIST((yyvsp[(1) - (4)].node)),(yyvsp[(3) - (4)].node)), (yyvsp[(4) - (4)].node));
26181- }
26182+ yyval.node = arg_blk_pass(list_concat(NEW_LIST(yyvsp[-3].node),yyvsp[-1].node), yyvsp[0].node);
26183+ ;}
26184 break;
26185
26186 case 243:
26187 #line 1342 "parse.y"
26188 {
26189- (yyval.node) = arg_blk_pass((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
26190- }
26191+ yyval.node = arg_blk_pass(yyvsp[-2].node, yyvsp[0].node);
26192+ ;}
26193 break;
26194
26195 case 244:
26196 #line 1346 "parse.y"
26197 {
26198- (yyval.node) = arg_concat(NEW_LIST((yyvsp[(1) - (5)].node)), (yyvsp[(4) - (5)].node));
26199- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
26200- }
26201+ yyval.node = arg_concat(NEW_LIST(yyvsp[-4].node), yyvsp[-1].node);
26202+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26203+ ;}
26204 break;
26205
26206 case 245:
26207 #line 1351 "parse.y"
26208 {
26209- (yyval.node) = arg_concat(list_concat(NEW_LIST((yyvsp[(1) - (7)].node)),(yyvsp[(3) - (7)].node)), (yyvsp[(6) - (7)].node));
26210- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(7) - (7)].node));
26211- }
26212+ yyval.node = arg_concat(list_concat(NEW_LIST(yyvsp[-6].node),yyvsp[-4].node), yyvsp[-1].node);
26213+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26214+ ;}
26215 break;
26216
26217 case 246:
26218 #line 1356 "parse.y"
26219 {
26220- (yyval.node) = NEW_LIST(NEW_HASH((yyvsp[(1) - (2)].node)));
26221- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(2) - (2)].node));
26222- }
26223+ yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node));
26224+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26225+ ;}
26226 break;
26227
26228 case 247:
26229 #line 1361 "parse.y"
26230 {
26231- (yyval.node) = arg_concat(NEW_LIST(NEW_HASH((yyvsp[(1) - (5)].node))), (yyvsp[(4) - (5)].node));
26232- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
26233- }
26234+ yyval.node = arg_concat(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
26235+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26236+ ;}
26237 break;
26238
26239 case 248:
26240 #line 1366 "parse.y"
26241 {
26242- (yyval.node) = list_append(NEW_LIST((yyvsp[(1) - (4)].node)), NEW_HASH((yyvsp[(3) - (4)].node)));
26243- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(4) - (4)].node));
26244- }
26245+ yyval.node = list_append(NEW_LIST(yyvsp[-3].node), NEW_HASH(yyvsp[-1].node));
26246+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26247+ ;}
26248 break;
26249
26250 case 249:
26251 #line 1371 "parse.y"
26252 {
26253- (yyval.node) = list_append(list_concat(NEW_LIST((yyvsp[(1) - (6)].node)),(yyvsp[(3) - (6)].node)), NEW_HASH((yyvsp[(5) - (6)].node)));
26254- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(6) - (6)].node));
26255- }
26256+ yyval.node = list_append(list_concat(NEW_LIST(yyvsp[-5].node),yyvsp[-3].node), NEW_HASH(yyvsp[-1].node));
26257+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26258+ ;}
26259 break;
26260
26261 case 250:
26262 #line 1376 "parse.y"
26263 {
26264- (yyval.node) = arg_concat(list_append(NEW_LIST((yyvsp[(1) - (7)].node)), NEW_HASH((yyvsp[(3) - (7)].node))), (yyvsp[(6) - (7)].node));
26265- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(7) - (7)].node));
26266- }
26267+ yyval.node = arg_concat(list_append(NEW_LIST(yyvsp[-6].node), NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
26268+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26269+ ;}
26270 break;
26271
26272 case 251:
26273 #line 1381 "parse.y"
26274 {
26275- (yyval.node) = arg_concat(list_append(list_concat(NEW_LIST((yyvsp[(1) - (9)].node)), (yyvsp[(3) - (9)].node)), NEW_HASH((yyvsp[(5) - (9)].node))), (yyvsp[(8) - (9)].node));
26276- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(9) - (9)].node));
26277- }
26278+ yyval.node = arg_concat(list_append(list_concat(NEW_LIST(yyvsp[-8].node), yyvsp[-6].node), NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
26279+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
26280+ ;}
26281 break;
26282
26283 case 252:
26284 #line 1386 "parse.y"
26285 {
26286- (yyval.node) = arg_blk_pass(NEW_SPLAT((yyvsp[(2) - (3)].node)), (yyvsp[(3) - (3)].node));
26287- }
26288+ yyval.node = arg_blk_pass(NEW_SPLAT(yyvsp[-1].node), yyvsp[0].node);
26289+ ;}
26290 break;
26291
26292 case 254:
26293 #line 1392 "parse.y"
26294 {
26295- (yyval.num) = cmdarg_stack;
26296+ yyval.num = cmdarg_stack;
26297 CMDARG_PUSH(1);
26298- }
26299+ ;}
26300 break;
26301
26302 case 255:
26303 #line 1397 "parse.y"
26304 {
26305 /* CMDARG_POP() */
26306- cmdarg_stack = (yyvsp[(1) - (2)].num);
26307- (yyval.node) = (yyvsp[(2) - (2)].node);
26308- }
26309+ cmdarg_stack = yyvsp[-1].num;
26310+ yyval.node = yyvsp[0].node;
26311+ ;}
26312 break;
26313
26314 case 257:
26315 #line 1405 "parse.y"
26316- {lex_state = EXPR_ENDARG;}
26317+ {lex_state = EXPR_ENDARG;;}
26318 break;
26319
26320 case 258:
26321 #line 1406 "parse.y"
26322 {
26323 rb_warn("don't put space before argument parentheses");
26324- (yyval.node) = 0;
26325- }
26326+ yyval.node = 0;
26327+ ;}
26328 break;
26329
26330 case 259:
26331 #line 1410 "parse.y"
26332- {lex_state = EXPR_ENDARG;}
26333+ {lex_state = EXPR_ENDARG;;}
26334 break;
26335
26336 case 260:
26337 #line 1411 "parse.y"
26338 {
26339 rb_warn("don't put space before argument parentheses");
26340- (yyval.node) = (yyvsp[(2) - (4)].node);
26341- }
26342+ yyval.node = yyvsp[-2].node;
26343+ ;}
26344 break;
26345
26346 case 261:
26347 #line 1418 "parse.y"
26348 {
26349- (yyval.node) = NEW_BLOCK_PASS((yyvsp[(2) - (2)].node));
26350- }
26351+ yyval.node = NEW_BLOCK_PASS(yyvsp[0].node);
26352+ ;}
26353 break;
26354
26355 case 262:
26356 #line 1424 "parse.y"
26357 {
26358- (yyval.node) = (yyvsp[(2) - (2)].node);
26359- }
26360+ yyval.node = yyvsp[0].node;
26361+ ;}
26362 break;
26363
26364 case 264:
26365 #line 1431 "parse.y"
26366 {
26367- (yyval.node) = NEW_LIST((yyvsp[(1) - (1)].node));
26368- }
26369+ yyval.node = NEW_LIST(yyvsp[0].node);
26370+ ;}
26371 break;
26372
26373 case 265:
26374 #line 1435 "parse.y"
26375 {
26376- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
26377- }
26378+ yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node);
26379+ ;}
26380 break;
26381
26382 case 266:
26383 #line 1441 "parse.y"
26384 {
26385- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
26386- }
26387+ yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node);
26388+ ;}
26389 break;
26390
26391 case 267:
26392 #line 1445 "parse.y"
26393 {
26394- (yyval.node) = arg_concat((yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node));
26395- }
26396+ yyval.node = arg_concat(yyvsp[-3].node, yyvsp[0].node);
26397+ ;}
26398 break;
26399
26400 case 268:
26401 #line 1449 "parse.y"
26402 {
26403- (yyval.node) = NEW_SPLAT((yyvsp[(2) - (2)].node));
26404- }
26405+ yyval.node = NEW_SPLAT(yyvsp[0].node);
26406+ ;}
26407 break;
26408
26409 case 277:
26410 #line 1463 "parse.y"
26411 {
26412- (yyval.node) = NEW_FCALL((yyvsp[(1) - (1)].id), 0);
26413- }
26414+ yyval.node = NEW_FCALL(yyvsp[0].id, 0);
26415+ ;}
26416 break;
26417
26418 case 278:
26419 #line 1467 "parse.y"
26420 {
26421- (yyvsp[(1) - (1)].num) = ruby_sourceline;
26422- }
26423+ yyvsp[0].num = ruby_sourceline;
26424+ ;}
26425 break;
26426
26427 case 279:
26428 #line 1472 "parse.y"
26429 {
26430- if ((yyvsp[(3) - (4)].node) == NULL)
26431- (yyval.node) = NEW_NIL();
26432+ if (yyvsp[-1].node == NULL)
26433+ yyval.node = NEW_NIL();
26434 else
26435- (yyval.node) = NEW_BEGIN((yyvsp[(3) - (4)].node));
26436- nd_set_line((yyval.node), (yyvsp[(1) - (4)].num));
26437- }
26438+ yyval.node = NEW_BEGIN(yyvsp[-1].node);
26439+ nd_set_line(yyval.node, yyvsp[-3].num);
26440+ ;}
26441 break;
26442
26443 case 280:
26444 #line 1479 "parse.y"
26445- {lex_state = EXPR_ENDARG;}
26446+ {lex_state = EXPR_ENDARG;;}
26447 break;
26448
26449 case 281:
26450 #line 1480 "parse.y"
26451 {
26452 rb_warning("(...) interpreted as grouped expression");
26453- (yyval.node) = (yyvsp[(2) - (5)].node);
26454- }
26455+ yyval.node = yyvsp[-3].node;
26456+ ;}
26457 break;
26458
26459 case 282:
26460 #line 1485 "parse.y"
26461 {
26462- if (!(yyvsp[(2) - (3)].node)) (yyval.node) = NEW_NIL();
26463- else (yyval.node) = (yyvsp[(2) - (3)].node);
26464- }
26465+ if (!yyvsp[-1].node) yyval.node = NEW_NIL();
26466+ else yyval.node = yyvsp[-1].node;
26467+ ;}
26468 break;
26469
26470 case 283:
26471 #line 1490 "parse.y"
26472 {
26473- (yyval.node) = NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
26474- }
26475+ yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id);
26476+ ;}
26477 break;
26478
26479 case 284:
26480 #line 1494 "parse.y"
26481 {
26482- (yyval.node) = NEW_COLON3((yyvsp[(2) - (2)].id));
26483- }
26484+ yyval.node = NEW_COLON3(yyvsp[0].id);
26485+ ;}
26486 break;
26487
26488 case 285:
26489 #line 1498 "parse.y"
26490 {
26491- if ((yyvsp[(1) - (4)].node) && nd_type((yyvsp[(1) - (4)].node)) == NODE_SELF)
26492- (yyval.node) = NEW_FCALL(tAREF, (yyvsp[(3) - (4)].node));
26493+ if (yyvsp[-3].node && nd_type(yyvsp[-3].node) == NODE_SELF)
26494+ yyval.node = NEW_FCALL(tAREF, yyvsp[-1].node);
26495 else
26496- (yyval.node) = NEW_CALL((yyvsp[(1) - (4)].node), tAREF, (yyvsp[(3) - (4)].node));
26497- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
26498- }
26499+ yyval.node = NEW_CALL(yyvsp[-3].node, tAREF, yyvsp[-1].node);
26500+ fixpos(yyval.node, yyvsp[-3].node);
26501+ ;}
26502 break;
26503
26504 case 286:
26505 #line 1506 "parse.y"
26506 {
26507- if ((yyvsp[(2) - (3)].node) == 0) {
26508- (yyval.node) = NEW_ZARRAY(); /* zero length array*/
26509+ if (yyvsp[-1].node == 0) {
26510+ yyval.node = NEW_ZARRAY(); /* zero length array*/
26511 }
26512 else {
26513- (yyval.node) = (yyvsp[(2) - (3)].node);
26514+ yyval.node = yyvsp[-1].node;
26515 }
26516- }
26517+ ;}
26518 break;
26519
26520 case 287:
26521 #line 1515 "parse.y"
26522 {
26523- (yyval.node) = NEW_HASH((yyvsp[(2) - (3)].node));
26524- }
26525+ yyval.node = NEW_HASH(yyvsp[-1].node);
26526+ ;}
26527 break;
26528
26529 case 288:
26530 #line 1519 "parse.y"
26531 {
26532- (yyval.node) = NEW_RETURN(0);
26533- }
26534+ yyval.node = NEW_RETURN(0);
26535+ ;}
26536 break;
26537
26538 case 289:
26539 #line 1523 "parse.y"
26540 {
26541- (yyval.node) = new_yield((yyvsp[(3) - (4)].node));
26542- }
26543+ yyval.node = new_yield(yyvsp[-1].node);
26544+ ;}
26545 break;
26546
26547 case 290:
26548 #line 1527 "parse.y"
26549 {
26550- (yyval.node) = NEW_YIELD(0, Qfalse);
26551- }
26552+ yyval.node = NEW_YIELD(0, Qfalse);
26553+ ;}
26554 break;
26555
26556 case 291:
26557 #line 1531 "parse.y"
26558 {
26559- (yyval.node) = NEW_YIELD(0, Qfalse);
26560- }
26561+ yyval.node = NEW_YIELD(0, Qfalse);
26562+ ;}
26563 break;
26564
26565 case 292:
26566 #line 1534 "parse.y"
26567- {in_defined = 1;}
26568+ {in_defined = 1;;}
26569 break;
26570
26571 case 293:
26572 #line 1535 "parse.y"
26573 {
26574 in_defined = 0;
26575- (yyval.node) = NEW_DEFINED((yyvsp[(5) - (6)].node));
26576- }
26577+ yyval.node = NEW_DEFINED(yyvsp[-1].node);
26578+ ;}
26579 break;
26580
26581 case 294:
26582 #line 1540 "parse.y"
26583 {
26584- (yyvsp[(2) - (2)].node)->nd_iter = NEW_FCALL((yyvsp[(1) - (2)].id), 0);
26585- (yyval.node) = (yyvsp[(2) - (2)].node);
26586- fixpos((yyvsp[(2) - (2)].node)->nd_iter, (yyvsp[(2) - (2)].node));
26587- }
26588+ yyvsp[0].node->nd_iter = NEW_FCALL(yyvsp[-1].id, 0);
26589+ yyval.node = yyvsp[0].node;
26590+ fixpos(yyvsp[0].node->nd_iter, yyvsp[0].node);
26591+ ;}
26592 break;
26593
26594 case 296:
26595 #line 1547 "parse.y"
26596 {
26597- if ((yyvsp[(1) - (2)].node) && nd_type((yyvsp[(1) - (2)].node)) == NODE_BLOCK_PASS) {
26598+ if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) {
26599 rb_compile_error("both block arg and actual block given");
26600 }
26601- (yyvsp[(2) - (2)].node)->nd_iter = (yyvsp[(1) - (2)].node);
26602- (yyval.node) = (yyvsp[(2) - (2)].node);
26603- fixpos((yyval.node), (yyvsp[(1) - (2)].node));
26604- }
26605+ yyvsp[0].node->nd_iter = yyvsp[-1].node;
26606+ yyval.node = yyvsp[0].node;
26607+ fixpos(yyval.node, yyvsp[-1].node);
26608+ ;}
26609 break;
26610
26611 case 297:
26612 #line 1559 "parse.y"
26613 {
26614- (yyval.node) = NEW_IF(cond((yyvsp[(2) - (6)].node)), (yyvsp[(4) - (6)].node), (yyvsp[(5) - (6)].node));
26615- fixpos((yyval.node), (yyvsp[(2) - (6)].node));
26616- if (cond_negative(&(yyval.node)->nd_cond)) {
26617- NODE *tmp = (yyval.node)->nd_body;
26618- (yyval.node)->nd_body = (yyval.node)->nd_else;
26619- (yyval.node)->nd_else = tmp;
26620+ yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node);
26621+ fixpos(yyval.node, yyvsp[-4].node);
26622+ if (cond_negative(&yyval.node->nd_cond)) {
26623+ NODE *tmp = yyval.node->nd_body;
26624+ yyval.node->nd_body = yyval.node->nd_else;
26625+ yyval.node->nd_else = tmp;
26626 }
26627- }
26628+ ;}
26629 break;
26630
26631 case 298:
26632 #line 1572 "parse.y"
26633 {
26634- (yyval.node) = NEW_UNLESS(cond((yyvsp[(2) - (6)].node)), (yyvsp[(4) - (6)].node), (yyvsp[(5) - (6)].node));
26635- fixpos((yyval.node), (yyvsp[(2) - (6)].node));
26636- if (cond_negative(&(yyval.node)->nd_cond)) {
26637- NODE *tmp = (yyval.node)->nd_body;
26638- (yyval.node)->nd_body = (yyval.node)->nd_else;
26639- (yyval.node)->nd_else = tmp;
26640+ yyval.node = NEW_UNLESS(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node);
26641+ fixpos(yyval.node, yyvsp[-4].node);
26642+ if (cond_negative(&yyval.node->nd_cond)) {
26643+ NODE *tmp = yyval.node->nd_body;
26644+ yyval.node->nd_body = yyval.node->nd_else;
26645+ yyval.node->nd_else = tmp;
26646 }
26647- }
26648+ ;}
26649 break;
26650
26651 case 299:
26652 #line 1581 "parse.y"
26653- {COND_PUSH(1);}
26654+ {COND_PUSH(1);;}
26655 break;
26656
26657 case 300:
26658 #line 1581 "parse.y"
26659- {COND_POP();}
26660+ {COND_POP();;}
26661 break;
26662
26663 case 301:
26664 #line 1584 "parse.y"
26665 {
26666- (yyval.node) = NEW_WHILE(cond((yyvsp[(3) - (7)].node)), (yyvsp[(6) - (7)].node), 1);
26667- fixpos((yyval.node), (yyvsp[(3) - (7)].node));
26668- if (cond_negative(&(yyval.node)->nd_cond)) {
26669- nd_set_type((yyval.node), NODE_UNTIL);
26670+ yyval.node = NEW_WHILE(cond(yyvsp[-4].node), yyvsp[-1].node, 1);
26671+ fixpos(yyval.node, yyvsp[-4].node);
26672+ if (cond_negative(&yyval.node->nd_cond)) {
26673+ nd_set_type(yyval.node, NODE_UNTIL);
26674 }
26675- }
26676+ ;}
26677 break;
26678
26679 case 302:
26680 #line 1591 "parse.y"
26681- {COND_PUSH(1);}
26682+ {COND_PUSH(1);;}
26683 break;
26684
26685 case 303:
26686 #line 1591 "parse.y"
26687- {COND_POP();}
26688+ {COND_POP();;}
26689 break;
26690
26691 case 304:
26692 #line 1594 "parse.y"
26693 {
26694- (yyval.node) = NEW_UNTIL(cond((yyvsp[(3) - (7)].node)), (yyvsp[(6) - (7)].node), 1);
26695- fixpos((yyval.node), (yyvsp[(3) - (7)].node));
26696- if (cond_negative(&(yyval.node)->nd_cond)) {
26697- nd_set_type((yyval.node), NODE_WHILE);
26698+ yyval.node = NEW_UNTIL(cond(yyvsp[-4].node), yyvsp[-1].node, 1);
26699+ fixpos(yyval.node, yyvsp[-4].node);
26700+ if (cond_negative(&yyval.node->nd_cond)) {
26701+ nd_set_type(yyval.node, NODE_WHILE);
26702 }
26703- }
26704+ ;}
26705 break;
26706
26707 case 305:
26708 #line 1604 "parse.y"
26709 {
26710- (yyval.node) = NEW_CASE((yyvsp[(2) - (5)].node), (yyvsp[(4) - (5)].node));
26711- fixpos((yyval.node), (yyvsp[(2) - (5)].node));
26712- }
26713+ yyval.node = NEW_CASE(yyvsp[-3].node, yyvsp[-1].node);
26714+ fixpos(yyval.node, yyvsp[-3].node);
26715+ ;}
26716 break;
26717
26718 case 306:
26719 #line 1609 "parse.y"
26720 {
26721- (yyval.node) = (yyvsp[(3) - (4)].node);
26722- }
26723+ yyval.node = yyvsp[-1].node;
26724+ ;}
26725 break;
26726
26727 case 307:
26728 #line 1613 "parse.y"
26729 {
26730- (yyval.node) = (yyvsp[(4) - (5)].node);
26731- }
26732+ yyval.node = yyvsp[-1].node;
26733+ ;}
26734 break;
26735
26736 case 308:
26737 #line 1616 "parse.y"
26738- {COND_PUSH(1);}
26739+ {COND_PUSH(1);;}
26740 break;
26741
26742 case 309:
26743 #line 1616 "parse.y"
26744- {COND_POP();}
26745+ {COND_POP();;}
26746 break;
26747
26748 case 310:
26749 #line 1619 "parse.y"
26750 {
26751- (yyval.node) = NEW_FOR((yyvsp[(2) - (9)].node), (yyvsp[(5) - (9)].node), (yyvsp[(8) - (9)].node));
26752- fixpos((yyval.node), (yyvsp[(2) - (9)].node));
26753- }
26754+ yyval.node = NEW_FOR(yyvsp[-7].node, yyvsp[-4].node, yyvsp[-1].node);
26755+ fixpos(yyval.node, yyvsp[-7].node);
26756+ ;}
26757 break;
26758
26759 case 311:
26760@@ -6226,48 +5893,48 @@
26761 yyerror("class definition in method body");
26762 class_nest++;
26763 local_push(0);
26764- (yyval.num) = ruby_sourceline;
26765- }
26766+ yyval.num = ruby_sourceline;
26767+ ;}
26768 break;
26769
26770 case 312:
26771 #line 1633 "parse.y"
26772 {
26773- (yyval.node) = NEW_CLASS((yyvsp[(2) - (6)].node), (yyvsp[(5) - (6)].node), (yyvsp[(3) - (6)].node));
26774- nd_set_line((yyval.node), (yyvsp[(4) - (6)].num));
26775+ yyval.node = NEW_CLASS(yyvsp[-4].node, yyvsp[-1].node, yyvsp[-3].node);
26776+ nd_set_line(yyval.node, yyvsp[-2].num);
26777 local_pop();
26778 class_nest--;
26779- }
26780+ ;}
26781 break;
26782
26783 case 313:
26784 #line 1640 "parse.y"
26785 {
26786- (yyval.num) = in_def;
26787+ yyval.num = in_def;
26788 in_def = 0;
26789- }
26790+ ;}
26791 break;
26792
26793 case 314:
26794 #line 1645 "parse.y"
26795 {
26796- (yyval.num) = in_single;
26797+ yyval.num = in_single;
26798 in_single = 0;
26799 class_nest++;
26800 local_push(0);
26801- }
26802+ ;}
26803 break;
26804
26805 case 315:
26806 #line 1653 "parse.y"
26807 {
26808- (yyval.node) = NEW_SCLASS((yyvsp[(3) - (8)].node), (yyvsp[(7) - (8)].node));
26809- fixpos((yyval.node), (yyvsp[(3) - (8)].node));
26810+ yyval.node = NEW_SCLASS(yyvsp[-5].node, yyvsp[-1].node);
26811+ fixpos(yyval.node, yyvsp[-5].node);
26812 local_pop();
26813 class_nest--;
26814- in_def = (yyvsp[(4) - (8)].num);
26815- in_single = (yyvsp[(6) - (8)].num);
26816- }
26817+ in_def = yyvsp[-4].num;
26818+ in_single = yyvsp[-2].num;
26819+ ;}
26820 break;
26821
26822 case 316:
26823@@ -6277,45 +5944,45 @@
26824 yyerror("module definition in method body");
26825 class_nest++;
26826 local_push(0);
26827- (yyval.num) = ruby_sourceline;
26828- }
26829+ yyval.num = ruby_sourceline;
26830+ ;}
26831 break;
26832
26833 case 317:
26834 #line 1671 "parse.y"
26835 {
26836- (yyval.node) = NEW_MODULE((yyvsp[(2) - (5)].node), (yyvsp[(4) - (5)].node));
26837- nd_set_line((yyval.node), (yyvsp[(3) - (5)].num));
26838+ yyval.node = NEW_MODULE(yyvsp[-3].node, yyvsp[-1].node);
26839+ nd_set_line(yyval.node, yyvsp[-2].num);
26840 local_pop();
26841 class_nest--;
26842- }
26843+ ;}
26844 break;
26845
26846 case 318:
26847 #line 1678 "parse.y"
26848 {
26849- (yyval.id) = cur_mid;
26850- cur_mid = (yyvsp[(2) - (2)].id);
26851+ yyval.id = cur_mid;
26852+ cur_mid = yyvsp[0].id;
26853 in_def++;
26854 local_push(0);
26855- }
26856+ ;}
26857 break;
26858
26859 case 319:
26860 #line 1687 "parse.y"
26861 {
26862- if (!(yyvsp[(5) - (6)].node)) (yyvsp[(5) - (6)].node) = NEW_NIL();
26863- (yyval.node) = NEW_DEFN((yyvsp[(2) - (6)].id), (yyvsp[(4) - (6)].node), (yyvsp[(5) - (6)].node), NOEX_PRIVATE);
26864- fixpos((yyval.node), (yyvsp[(4) - (6)].node));
26865+ if (!yyvsp[-1].node) yyvsp[-1].node = NEW_NIL();
26866+ yyval.node = NEW_DEFN(yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node, NOEX_PRIVATE);
26867+ fixpos(yyval.node, yyvsp[-2].node);
26868 local_pop();
26869 in_def--;
26870- cur_mid = (yyvsp[(3) - (6)].id);
26871- }
26872+ cur_mid = yyvsp[-3].id;
26873+ ;}
26874 break;
26875
26876 case 320:
26877 #line 1695 "parse.y"
26878- {lex_state = EXPR_FNAME;}
26879+ {lex_state = EXPR_FNAME;;}
26880 break;
26881
26882 case 321:
26883@@ -6324,325 +5991,325 @@
26884 in_single++;
26885 local_push(0);
26886 lex_state = EXPR_END; /* force for args */
26887- }
26888+ ;}
26889 break;
26890
26891 case 322:
26892 #line 1704 "parse.y"
26893 {
26894- (yyval.node) = NEW_DEFS((yyvsp[(2) - (9)].node), (yyvsp[(5) - (9)].id), (yyvsp[(7) - (9)].node), (yyvsp[(8) - (9)].node));
26895- fixpos((yyval.node), (yyvsp[(2) - (9)].node));
26896+ yyval.node = NEW_DEFS(yyvsp[-7].node, yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node);
26897+ fixpos(yyval.node, yyvsp[-7].node);
26898 local_pop();
26899 in_single--;
26900- }
26901+ ;}
26902 break;
26903
26904 case 323:
26905 #line 1711 "parse.y"
26906 {
26907- (yyval.node) = NEW_BREAK(0);
26908- }
26909+ yyval.node = NEW_BREAK(0);
26910+ ;}
26911 break;
26912
26913 case 324:
26914 #line 1715 "parse.y"
26915 {
26916- (yyval.node) = NEW_NEXT(0);
26917- }
26918+ yyval.node = NEW_NEXT(0);
26919+ ;}
26920 break;
26921
26922 case 325:
26923 #line 1719 "parse.y"
26924 {
26925- (yyval.node) = NEW_REDO();
26926- }
26927+ yyval.node = NEW_REDO();
26928+ ;}
26929 break;
26930
26931 case 326:
26932 #line 1723 "parse.y"
26933 {
26934- (yyval.node) = NEW_RETRY();
26935- }
26936+ yyval.node = NEW_RETRY();
26937+ ;}
26938 break;
26939
26940 case 327:
26941 #line 1729 "parse.y"
26942 {
26943- value_expr((yyvsp[(1) - (1)].node));
26944- (yyval.node) = (yyvsp[(1) - (1)].node);
26945- }
26946+ value_expr(yyvsp[0].node);
26947+ yyval.node = yyvsp[0].node;
26948+ ;}
26949 break;
26950
26951 case 336:
26952 #line 1750 "parse.y"
26953 {
26954- (yyval.node) = NEW_IF(cond((yyvsp[(2) - (5)].node)), (yyvsp[(4) - (5)].node), (yyvsp[(5) - (5)].node));
26955- fixpos((yyval.node), (yyvsp[(2) - (5)].node));
26956- }
26957+ yyval.node = NEW_IF(cond(yyvsp[-3].node), yyvsp[-1].node, yyvsp[0].node);
26958+ fixpos(yyval.node, yyvsp[-3].node);
26959+ ;}
26960 break;
26961
26962 case 338:
26963 #line 1758 "parse.y"
26964 {
26965- (yyval.node) = (yyvsp[(2) - (2)].node);
26966- }
26967+ yyval.node = yyvsp[0].node;
26968+ ;}
26969 break;
26970
26971 case 342:
26972 #line 1769 "parse.y"
26973 {
26974- (yyval.node) = (NODE*)1;
26975- }
26976+ yyval.node = (NODE*)1;
26977+ ;}
26978 break;
26979
26980 case 343:
26981 #line 1773 "parse.y"
26982 {
26983- (yyval.node) = (NODE*)1;
26984- }
26985+ yyval.node = (NODE*)1;
26986+ ;}
26987 break;
26988
26989 case 344:
26990 #line 1777 "parse.y"
26991 {
26992- (yyval.node) = (yyvsp[(2) - (3)].node);
26993- }
26994+ yyval.node = yyvsp[-1].node;
26995+ ;}
26996 break;
26997
26998 case 345:
26999 #line 1783 "parse.y"
27000 {
27001- (yyval.vars) = dyna_push();
27002- (yyvsp[(1) - (1)].num) = ruby_sourceline;
27003- }
27004+ yyval.vars = dyna_push();
27005+ yyvsp[0].num = ruby_sourceline;
27006+ ;}
27007 break;
27008
27009 case 346:
27010 #line 1787 "parse.y"
27011- {(yyval.vars) = ruby_dyna_vars;}
27012+ {yyval.vars = ruby_dyna_vars;;}
27013 break;
27014
27015 case 347:
27016 #line 1790 "parse.y"
27017 {
27018- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
27019- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
27020- dyna_pop((yyvsp[(2) - (6)].vars));
27021- }
27022+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
27023+ nd_set_line(yyval.node, yyvsp[-5].num);
27024+ dyna_pop(yyvsp[-4].vars);
27025+ ;}
27026 break;
27027
27028 case 348:
27029 #line 1798 "parse.y"
27030 {
27031- if ((yyvsp[(1) - (2)].node) && nd_type((yyvsp[(1) - (2)].node)) == NODE_BLOCK_PASS) {
27032+ if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) {
27033 rb_compile_error("both block arg and actual block given");
27034 }
27035- (yyvsp[(2) - (2)].node)->nd_iter = (yyvsp[(1) - (2)].node);
27036- (yyval.node) = (yyvsp[(2) - (2)].node);
27037- fixpos((yyval.node), (yyvsp[(1) - (2)].node));
27038- }
27039+ yyvsp[0].node->nd_iter = yyvsp[-1].node;
27040+ yyval.node = yyvsp[0].node;
27041+ fixpos(yyval.node, yyvsp[-1].node);
27042+ ;}
27043 break;
27044
27045 case 349:
27046 #line 1807 "parse.y"
27047 {
27048- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
27049- }
27050+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
27051+ ;}
27052 break;
27053
27054 case 350:
27055 #line 1811 "parse.y"
27056 {
27057- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
27058- }
27059+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
27060+ ;}
27061 break;
27062
27063 case 351:
27064 #line 1817 "parse.y"
27065 {
27066- (yyval.node) = new_fcall((yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].node));
27067- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
27068- }
27069+ yyval.node = new_fcall(yyvsp[-1].id, yyvsp[0].node);
27070+ fixpos(yyval.node, yyvsp[0].node);
27071+ ;}
27072 break;
27073
27074 case 352:
27075 #line 1822 "parse.y"
27076 {
27077- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
27078- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
27079- }
27080+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
27081+ fixpos(yyval.node, yyvsp[-3].node);
27082+ ;}
27083 break;
27084
27085 case 353:
27086 #line 1827 "parse.y"
27087 {
27088- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
27089- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
27090- }
27091+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
27092+ fixpos(yyval.node, yyvsp[-3].node);
27093+ ;}
27094 break;
27095
27096 case 354:
27097 #line 1832 "parse.y"
27098 {
27099- (yyval.node) = new_call((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id), 0);
27100- }
27101+ yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0);
27102+ ;}
27103 break;
27104
27105 case 355:
27106 #line 1836 "parse.y"
27107 {
27108- (yyval.node) = new_super((yyvsp[(2) - (2)].node));
27109- }
27110+ yyval.node = new_super(yyvsp[0].node);
27111+ ;}
27112 break;
27113
27114 case 356:
27115 #line 1840 "parse.y"
27116 {
27117- (yyval.node) = NEW_ZSUPER();
27118- }
27119+ yyval.node = NEW_ZSUPER();
27120+ ;}
27121 break;
27122
27123 case 357:
27124 #line 1846 "parse.y"
27125 {
27126- (yyval.vars) = dyna_push();
27127- (yyvsp[(1) - (1)].num) = ruby_sourceline;
27128- }
27129+ yyval.vars = dyna_push();
27130+ yyvsp[0].num = ruby_sourceline;
27131+ ;}
27132 break;
27133
27134 case 358:
27135 #line 1850 "parse.y"
27136- {(yyval.vars) = ruby_dyna_vars;}
27137+ {yyval.vars = ruby_dyna_vars;;}
27138 break;
27139
27140 case 359:
27141 #line 1852 "parse.y"
27142 {
27143- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
27144- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
27145- dyna_pop((yyvsp[(2) - (6)].vars));
27146- }
27147+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
27148+ nd_set_line(yyval.node, yyvsp[-5].num);
27149+ dyna_pop(yyvsp[-4].vars);
27150+ ;}
27151 break;
27152
27153 case 360:
27154 #line 1858 "parse.y"
27155 {
27156- (yyval.vars) = dyna_push();
27157- (yyvsp[(1) - (1)].num) = ruby_sourceline;
27158- }
27159+ yyval.vars = dyna_push();
27160+ yyvsp[0].num = ruby_sourceline;
27161+ ;}
27162 break;
27163
27164 case 361:
27165 #line 1862 "parse.y"
27166- {(yyval.vars) = ruby_dyna_vars;}
27167+ {yyval.vars = ruby_dyna_vars;;}
27168 break;
27169
27170 case 362:
27171 #line 1864 "parse.y"
27172 {
27173- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
27174- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
27175- dyna_pop((yyvsp[(2) - (6)].vars));
27176- }
27177+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
27178+ nd_set_line(yyval.node, yyvsp[-5].num);
27179+ dyna_pop(yyvsp[-4].vars);
27180+ ;}
27181 break;
27182
27183 case 363:
27184 #line 1874 "parse.y"
27185 {
27186- (yyval.node) = NEW_WHEN((yyvsp[(2) - (5)].node), (yyvsp[(4) - (5)].node), (yyvsp[(5) - (5)].node));
27187- }
27188+ yyval.node = NEW_WHEN(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node);
27189+ ;}
27190 break;
27191
27192 case 365:
27193 #line 1880 "parse.y"
27194 {
27195- (yyval.node) = list_append((yyvsp[(1) - (4)].node), NEW_WHEN((yyvsp[(4) - (4)].node), 0, 0));
27196- }
27197+ yyval.node = list_append(yyvsp[-3].node, NEW_WHEN(yyvsp[0].node, 0, 0));
27198+ ;}
27199 break;
27200
27201 case 366:
27202 #line 1884 "parse.y"
27203 {
27204- (yyval.node) = NEW_LIST(NEW_WHEN((yyvsp[(2) - (2)].node), 0, 0));
27205- }
27206+ yyval.node = NEW_LIST(NEW_WHEN(yyvsp[0].node, 0, 0));
27207+ ;}
27208 break;
27209
27210 case 369:
27211 #line 1896 "parse.y"
27212 {
27213- if ((yyvsp[(3) - (6)].node)) {
27214- (yyvsp[(3) - (6)].node) = node_assign((yyvsp[(3) - (6)].node), NEW_GVAR(rb_intern("$!")));
27215- (yyvsp[(5) - (6)].node) = block_append((yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].node));
27216- }
27217- (yyval.node) = NEW_RESBODY((yyvsp[(2) - (6)].node), (yyvsp[(5) - (6)].node), (yyvsp[(6) - (6)].node));
27218- fixpos((yyval.node), (yyvsp[(2) - (6)].node)?(yyvsp[(2) - (6)].node):(yyvsp[(5) - (6)].node));
27219- }
27220+ if (yyvsp[-3].node) {
27221+ yyvsp[-3].node = node_assign(yyvsp[-3].node, NEW_GVAR(rb_intern("$!")));
27222+ yyvsp[-1].node = block_append(yyvsp[-3].node, yyvsp[-1].node);
27223+ }
27224+ yyval.node = NEW_RESBODY(yyvsp[-4].node, yyvsp[-1].node, yyvsp[0].node);
27225+ fixpos(yyval.node, yyvsp[-4].node?yyvsp[-4].node:yyvsp[-1].node);
27226+ ;}
27227 break;
27228
27229 case 371:
27230 #line 1908 "parse.y"
27231 {
27232- (yyval.node) = NEW_LIST((yyvsp[(1) - (1)].node));
27233- }
27234+ yyval.node = NEW_LIST(yyvsp[0].node);
27235+ ;}
27236 break;
27237
27238 case 374:
27239 #line 1916 "parse.y"
27240 {
27241- (yyval.node) = (yyvsp[(2) - (2)].node);
27242- }
27243+ yyval.node = yyvsp[0].node;
27244+ ;}
27245 break;
27246
27247 case 376:
27248 #line 1923 "parse.y"
27249 {
27250- if ((yyvsp[(2) - (2)].node))
27251- (yyval.node) = (yyvsp[(2) - (2)].node);
27252+ if (yyvsp[0].node)
27253+ yyval.node = yyvsp[0].node;
27254 else
27255 /* place holder */
27256- (yyval.node) = NEW_NIL();
27257- }
27258+ yyval.node = NEW_NIL();
27259+ ;}
27260 break;
27261
27262 case 379:
27263 #line 1935 "parse.y"
27264 {
27265- (yyval.node) = NEW_LIT(ID2SYM((yyvsp[(1) - (1)].id)));
27266- }
27267+ yyval.node = NEW_LIT(ID2SYM(yyvsp[0].id));
27268+ ;}
27269 break;
27270
27271 case 381:
27272 #line 1942 "parse.y"
27273 {
27274- NODE *node = (yyvsp[(1) - (1)].node);
27275+ NODE *node = yyvsp[0].node;
27276 if (!node) {
27277 node = NEW_STR(rb_str_new(0, 0));
27278 }
27279 else {
27280 node = evstr2dstr(node);
27281 }
27282- (yyval.node) = node;
27283- }
27284+ yyval.node = node;
27285+ ;}
27286 break;
27287
27288 case 383:
27289 #line 1956 "parse.y"
27290 {
27291- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
27292- }
27293+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
27294+ ;}
27295 break;
27296
27297 case 384:
27298 #line 1962 "parse.y"
27299 {
27300- (yyval.node) = (yyvsp[(2) - (3)].node);
27301- }
27302+ yyval.node = yyvsp[-1].node;
27303+ ;}
27304 break;
27305
27306 case 385:
27307 #line 1968 "parse.y"
27308 {
27309- NODE *node = (yyvsp[(2) - (3)].node);
27310+ NODE *node = yyvsp[-1].node;
27311 if (!node) {
27312 node = NEW_XSTR(rb_str_new(0, 0));
27313 }
27314@@ -6659,15 +6326,15 @@
27315 break;
27316 }
27317 }
27318- (yyval.node) = node;
27319- }
27320+ yyval.node = node;
27321+ ;}
27322 break;
27323
27324 case 386:
27325 #line 1991 "parse.y"
27326 {
27327- int options = (yyvsp[(3) - (3)].num);
27328- NODE *node = (yyvsp[(2) - (3)].node);
27329+ int options = yyvsp[0].num;
27330+ NODE *node = yyvsp[-1].node;
27331 if (!node) {
27332 node = NEW_LIT(rb_reg_new("", 0, options & ~RE_OPTION_ONCE));
27333 }
27334@@ -6693,499 +6360,499 @@
27335 node->nd_cflag = options & ~RE_OPTION_ONCE;
27336 break;
27337 }
27338- (yyval.node) = node;
27339- }
27340+ yyval.node = node;
27341+ ;}
27342 break;
27343
27344 case 387:
27345 #line 2024 "parse.y"
27346 {
27347- (yyval.node) = NEW_ZARRAY();
27348- }
27349+ yyval.node = NEW_ZARRAY();
27350+ ;}
27351 break;
27352
27353 case 388:
27354 #line 2028 "parse.y"
27355 {
27356- (yyval.node) = (yyvsp[(2) - (3)].node);
27357- }
27358+ yyval.node = yyvsp[-1].node;
27359+ ;}
27360 break;
27361
27362 case 389:
27363 #line 2034 "parse.y"
27364 {
27365- (yyval.node) = 0;
27366- }
27367+ yyval.node = 0;
27368+ ;}
27369 break;
27370
27371 case 390:
27372 #line 2038 "parse.y"
27373 {
27374- (yyval.node) = list_append((yyvsp[(1) - (3)].node), evstr2dstr((yyvsp[(2) - (3)].node)));
27375- }
27376+ yyval.node = list_append(yyvsp[-2].node, evstr2dstr(yyvsp[-1].node));
27377+ ;}
27378 break;
27379
27380 case 392:
27381 #line 2045 "parse.y"
27382 {
27383- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
27384- }
27385+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
27386+ ;}
27387 break;
27388
27389 case 393:
27390 #line 2051 "parse.y"
27391 {
27392- (yyval.node) = NEW_ZARRAY();
27393- }
27394+ yyval.node = NEW_ZARRAY();
27395+ ;}
27396 break;
27397
27398 case 394:
27399 #line 2055 "parse.y"
27400 {
27401- (yyval.node) = (yyvsp[(2) - (3)].node);
27402- }
27403+ yyval.node = yyvsp[-1].node;
27404+ ;}
27405 break;
27406
27407 case 395:
27408 #line 2061 "parse.y"
27409 {
27410- (yyval.node) = 0;
27411- }
27412+ yyval.node = 0;
27413+ ;}
27414 break;
27415
27416 case 396:
27417 #line 2065 "parse.y"
27418 {
27419- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].node));
27420- }
27421+ yyval.node = list_append(yyvsp[-2].node, yyvsp[-1].node);
27422+ ;}
27423 break;
27424
27425 case 397:
27426 #line 2071 "parse.y"
27427 {
27428- (yyval.node) = 0;
27429- }
27430+ yyval.node = 0;
27431+ ;}
27432 break;
27433
27434 case 398:
27435 #line 2075 "parse.y"
27436 {
27437- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
27438- }
27439+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
27440+ ;}
27441 break;
27442
27443 case 399:
27444 #line 2081 "parse.y"
27445 {
27446- (yyval.node) = 0;
27447- }
27448+ yyval.node = 0;
27449+ ;}
27450 break;
27451
27452 case 400:
27453 #line 2085 "parse.y"
27454 {
27455- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
27456- }
27457+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
27458+ ;}
27459 break;
27460
27461 case 402:
27462 #line 2092 "parse.y"
27463 {
27464- (yyval.node) = lex_strterm;
27465+ yyval.node = lex_strterm;
27466 lex_strterm = 0;
27467 lex_state = EXPR_BEG;
27468- }
27469+ ;}
27470 break;
27471
27472 case 403:
27473 #line 2098 "parse.y"
27474 {
27475- lex_strterm = (yyvsp[(2) - (3)].node);
27476- (yyval.node) = NEW_EVSTR((yyvsp[(3) - (3)].node));
27477- }
27478+ lex_strterm = yyvsp[-1].node;
27479+ yyval.node = NEW_EVSTR(yyvsp[0].node);
27480+ ;}
27481 break;
27482
27483 case 404:
27484 #line 2103 "parse.y"
27485 {
27486- (yyval.node) = lex_strterm;
27487+ yyval.node = lex_strterm;
27488 lex_strterm = 0;
27489 lex_state = EXPR_BEG;
27490 COND_PUSH(0);
27491 CMDARG_PUSH(0);
27492- }
27493+ ;}
27494 break;
27495
27496 case 405:
27497 #line 2111 "parse.y"
27498 {
27499- lex_strterm = (yyvsp[(2) - (4)].node);
27500+ lex_strterm = yyvsp[-2].node;
27501 COND_LEXPOP();
27502 CMDARG_LEXPOP();
27503- if (((yyval.node) = (yyvsp[(3) - (4)].node)) && nd_type((yyval.node)) == NODE_NEWLINE) {
27504- (yyval.node) = (yyval.node)->nd_next;
27505- rb_gc_force_recycle((VALUE)(yyvsp[(3) - (4)].node));
27506+ if ((yyval.node = yyvsp[-1].node) && nd_type(yyval.node) == NODE_NEWLINE) {
27507+ yyval.node = yyval.node->nd_next;
27508+ rb_gc_force_recycle((VALUE)yyvsp[-1].node);
27509 }
27510- (yyval.node) = new_evstr((yyval.node));
27511- }
27512+ yyval.node = new_evstr(yyval.node);
27513+ ;}
27514 break;
27515
27516 case 406:
27517 #line 2123 "parse.y"
27518- {(yyval.node) = NEW_GVAR((yyvsp[(1) - (1)].id));}
27519+ {yyval.node = NEW_GVAR(yyvsp[0].id);;}
27520 break;
27521
27522 case 407:
27523 #line 2124 "parse.y"
27524- {(yyval.node) = NEW_IVAR((yyvsp[(1) - (1)].id));}
27525+ {yyval.node = NEW_IVAR(yyvsp[0].id);;}
27526 break;
27527
27528 case 408:
27529 #line 2125 "parse.y"
27530- {(yyval.node) = NEW_CVAR((yyvsp[(1) - (1)].id));}
27531+ {yyval.node = NEW_CVAR(yyvsp[0].id);;}
27532 break;
27533
27534 case 410:
27535 #line 2130 "parse.y"
27536 {
27537 lex_state = EXPR_END;
27538- (yyval.id) = (yyvsp[(2) - (2)].id);
27539- }
27540+ yyval.id = yyvsp[0].id;
27541+ ;}
27542 break;
27543
27544 case 415:
27545 #line 2143 "parse.y"
27546 {
27547 lex_state = EXPR_END;
27548- if (!((yyval.node) = (yyvsp[(2) - (3)].node))) {
27549+ if (!(yyval.node = yyvsp[-1].node)) {
27550 yyerror("empty symbol literal");
27551 }
27552 else {
27553 VALUE lit;
27554
27555- switch (nd_type((yyval.node))) {
27556+ switch (nd_type(yyval.node)) {
27557 case NODE_DSTR:
27558- nd_set_type((yyval.node), NODE_DSYM);
27559+ nd_set_type(yyval.node, NODE_DSYM);
27560 break;
27561 case NODE_STR:
27562- lit = (yyval.node)->nd_lit;
27563+ lit = yyval.node->nd_lit;
27564 if (RSTRING(lit)->len == 0) {
27565 yyerror("empty symbol literal");
27566 break;
27567 }
27568 if (strlen(RSTRING(lit)->ptr) == RSTRING(lit)->len) {
27569- (yyval.node)->nd_lit = ID2SYM(rb_intern(RSTRING((yyval.node)->nd_lit)->ptr));
27570- nd_set_type((yyval.node), NODE_LIT);
27571+ yyval.node->nd_lit = ID2SYM(rb_intern(RSTRING(yyval.node->nd_lit)->ptr));
27572+ nd_set_type(yyval.node, NODE_LIT);
27573 break;
27574 }
27575 /* fall through */
27576 default:
27577- (yyval.node) = NEW_NODE(NODE_DSYM, rb_str_new(0, 0), 1, NEW_LIST((yyval.node)));
27578+ yyval.node = NEW_NODE(NODE_DSYM, rb_str_new(0, 0), 1, NEW_LIST(yyval.node));
27579 break;
27580 }
27581 }
27582- }
27583+ ;}
27584 break;
27585
27586 case 418:
27587 #line 2178 "parse.y"
27588 {
27589- (yyval.node) = negate_lit((yyvsp[(2) - (2)].node));
27590- }
27591+ yyval.node = negate_lit(yyvsp[0].node);
27592+ ;}
27593 break;
27594
27595 case 419:
27596 #line 2182 "parse.y"
27597 {
27598- (yyval.node) = negate_lit((yyvsp[(2) - (2)].node));
27599- }
27600+ yyval.node = negate_lit(yyvsp[0].node);
27601+ ;}
27602 break;
27603
27604 case 425:
27605 #line 2192 "parse.y"
27606- {(yyval.id) = kNIL;}
27607+ {yyval.id = kNIL;;}
27608 break;
27609
27610 case 426:
27611 #line 2193 "parse.y"
27612- {(yyval.id) = kSELF;}
27613+ {yyval.id = kSELF;;}
27614 break;
27615
27616 case 427:
27617 #line 2194 "parse.y"
27618- {(yyval.id) = kTRUE;}
27619+ {yyval.id = kTRUE;;}
27620 break;
27621
27622 case 428:
27623 #line 2195 "parse.y"
27624- {(yyval.id) = kFALSE;}
27625+ {yyval.id = kFALSE;;}
27626 break;
27627
27628 case 429:
27629 #line 2196 "parse.y"
27630- {(yyval.id) = k__FILE__;}
27631+ {yyval.id = k__FILE__;;}
27632 break;
27633
27634 case 430:
27635 #line 2197 "parse.y"
27636- {(yyval.id) = k__LINE__;}
27637+ {yyval.id = k__LINE__;;}
27638 break;
27639
27640 case 431:
27641 #line 2201 "parse.y"
27642 {
27643- (yyval.node) = gettable((yyvsp[(1) - (1)].id));
27644- }
27645+ yyval.node = gettable(yyvsp[0].id);
27646+ ;}
27647 break;
27648
27649 case 432:
27650 #line 2207 "parse.y"
27651 {
27652- (yyval.node) = assignable((yyvsp[(1) - (1)].id), 0);
27653- }
27654+ yyval.node = assignable(yyvsp[0].id, 0);
27655+ ;}
27656 break;
27657
27658 case 435:
27659 #line 2217 "parse.y"
27660 {
27661- (yyval.node) = 0;
27662- }
27663+ yyval.node = 0;
27664+ ;}
27665 break;
27666
27667 case 436:
27668 #line 2221 "parse.y"
27669 {
27670 lex_state = EXPR_BEG;
27671- }
27672+ ;}
27673 break;
27674
27675 case 437:
27676 #line 2225 "parse.y"
27677 {
27678- (yyval.node) = (yyvsp[(3) - (4)].node);
27679- }
27680+ yyval.node = yyvsp[-1].node;
27681+ ;}
27682 break;
27683
27684 case 438:
27685 #line 2228 "parse.y"
27686- {yyerrok; (yyval.node) = 0;}
27687+ {yyerrok; yyval.node = 0;;}
27688 break;
27689
27690 case 439:
27691 #line 2232 "parse.y"
27692 {
27693- (yyval.node) = (yyvsp[(2) - (4)].node);
27694+ yyval.node = yyvsp[-2].node;
27695 lex_state = EXPR_BEG;
27696 command_start = Qtrue;
27697- }
27698+ ;}
27699 break;
27700
27701 case 440:
27702 #line 2238 "parse.y"
27703 {
27704- (yyval.node) = (yyvsp[(1) - (2)].node);
27705- }
27706+ yyval.node = yyvsp[-1].node;
27707+ ;}
27708 break;
27709
27710 case 441:
27711 #line 2244 "parse.y"
27712 {
27713- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (6)].num), (yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].node)), (yyvsp[(6) - (6)].node));
27714- }
27715+ yyval.node = block_append(NEW_ARGS(yyvsp[-5].num, yyvsp[-3].node, yyvsp[-1].node), yyvsp[0].node);
27716+ ;}
27717 break;
27718
27719 case 442:
27720 #line 2248 "parse.y"
27721 {
27722- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (4)].num), (yyvsp[(3) - (4)].node), 0), (yyvsp[(4) - (4)].node));
27723- }
27724+ yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, yyvsp[-1].node, 0), yyvsp[0].node);
27725+ ;}
27726 break;
27727
27728 case 443:
27729 #line 2252 "parse.y"
27730 {
27731- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (4)].num), 0, (yyvsp[(3) - (4)].node)), (yyvsp[(4) - (4)].node));
27732- }
27733+ yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, 0, yyvsp[-1].node), yyvsp[0].node);
27734+ ;}
27735 break;
27736
27737 case 444:
27738 #line 2256 "parse.y"
27739 {
27740- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (2)].num), 0, 0), (yyvsp[(2) - (2)].node));
27741- }
27742+ yyval.node = block_append(NEW_ARGS(yyvsp[-1].num, 0, 0), yyvsp[0].node);
27743+ ;}
27744 break;
27745
27746 case 445:
27747 #line 2260 "parse.y"
27748 {
27749- (yyval.node) = block_append(NEW_ARGS(0, (yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].node)), (yyvsp[(4) - (4)].node));
27750- }
27751+ yyval.node = block_append(NEW_ARGS(0, yyvsp[-3].node, yyvsp[-1].node), yyvsp[0].node);
27752+ ;}
27753 break;
27754
27755 case 446:
27756 #line 2264 "parse.y"
27757 {
27758- (yyval.node) = block_append(NEW_ARGS(0, (yyvsp[(1) - (2)].node), 0), (yyvsp[(2) - (2)].node));
27759- }
27760+ yyval.node = block_append(NEW_ARGS(0, yyvsp[-1].node, 0), yyvsp[0].node);
27761+ ;}
27762 break;
27763
27764 case 447:
27765 #line 2268 "parse.y"
27766 {
27767- (yyval.node) = block_append(NEW_ARGS(0, 0, (yyvsp[(1) - (2)].node)), (yyvsp[(2) - (2)].node));
27768- }
27769+ yyval.node = block_append(NEW_ARGS(0, 0, yyvsp[-1].node), yyvsp[0].node);
27770+ ;}
27771 break;
27772
27773 case 448:
27774 #line 2272 "parse.y"
27775 {
27776- (yyval.node) = block_append(NEW_ARGS(0, 0, 0), (yyvsp[(1) - (1)].node));
27777- }
27778+ yyval.node = block_append(NEW_ARGS(0, 0, 0), yyvsp[0].node);
27779+ ;}
27780 break;
27781
27782 case 449:
27783 #line 2276 "parse.y"
27784 {
27785- (yyval.node) = NEW_ARGS(0, 0, 0);
27786- }
27787+ yyval.node = NEW_ARGS(0, 0, 0);
27788+ ;}
27789 break;
27790
27791 case 450:
27792 #line 2282 "parse.y"
27793 {
27794 yyerror("formal argument cannot be a constant");
27795- }
27796+ ;}
27797 break;
27798
27799 case 451:
27800 #line 2286 "parse.y"
27801 {
27802 yyerror("formal argument cannot be an instance variable");
27803- }
27804+ ;}
27805 break;
27806
27807 case 452:
27808 #line 2290 "parse.y"
27809 {
27810 yyerror("formal argument cannot be a global variable");
27811- }
27812+ ;}
27813 break;
27814
27815 case 453:
27816 #line 2294 "parse.y"
27817 {
27818 yyerror("formal argument cannot be a class variable");
27819- }
27820+ ;}
27821 break;
27822
27823 case 454:
27824 #line 2298 "parse.y"
27825 {
27826- if (!is_local_id((yyvsp[(1) - (1)].id)))
27827+ if (!is_local_id(yyvsp[0].id))
27828 yyerror("formal argument must be local variable");
27829- else if (local_id((yyvsp[(1) - (1)].id)))
27830+ else if (local_id(yyvsp[0].id))
27831 yyerror("duplicate argument name");
27832- local_cnt((yyvsp[(1) - (1)].id));
27833- (yyval.num) = 1;
27834- }
27835+ local_cnt(yyvsp[0].id);
27836+ yyval.num = 1;
27837+ ;}
27838 break;
27839
27840 case 456:
27841 #line 2310 "parse.y"
27842 {
27843- (yyval.num) += 1;
27844- }
27845+ yyval.num += 1;
27846+ ;}
27847 break;
27848
27849 case 457:
27850 #line 2316 "parse.y"
27851 {
27852- if (!is_local_id((yyvsp[(1) - (3)].id)))
27853+ if (!is_local_id(yyvsp[-2].id))
27854 yyerror("formal argument must be local variable");
27855- else if (local_id((yyvsp[(1) - (3)].id)))
27856+ else if (local_id(yyvsp[-2].id))
27857 yyerror("duplicate optional argument name");
27858- (yyval.node) = assignable((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].node));
27859- }
27860+ yyval.node = assignable(yyvsp[-2].id, yyvsp[0].node);
27861+ ;}
27862 break;
27863
27864 case 458:
27865 #line 2326 "parse.y"
27866 {
27867- (yyval.node) = NEW_BLOCK((yyvsp[(1) - (1)].node));
27868- (yyval.node)->nd_end = (yyval.node);
27869- }
27870+ yyval.node = NEW_BLOCK(yyvsp[0].node);
27871+ yyval.node->nd_end = yyval.node;
27872+ ;}
27873 break;
27874
27875 case 459:
27876 #line 2331 "parse.y"
27877 {
27878- (yyval.node) = block_append((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
27879- }
27880+ yyval.node = block_append(yyvsp[-2].node, yyvsp[0].node);
27881+ ;}
27882 break;
27883
27884 case 462:
27885 #line 2341 "parse.y"
27886 {
27887- if (!is_local_id((yyvsp[(2) - (2)].id)))
27888+ if (!is_local_id(yyvsp[0].id))
27889 yyerror("rest argument must be local variable");
27890 if (dyna_in_block()) {
27891- rb_dvar_push((yyvsp[(2) - (2)].id), Qnil);
27892+ rb_dvar_push(yyvsp[0].id, Qnil);
27893 }
27894- (yyval.node) = assignable((yyvsp[(2) - (2)].id), 0);
27895- }
27896+ yyval.node = assignable(yyvsp[0].id, 0);
27897+ ;}
27898 break;
27899
27900 case 463:
27901 #line 2350 "parse.y"
27902 {
27903 if (dyna_in_block()) {
27904- (yyval.node) = NEW_DASGN_CURR(internal_id(), 0);
27905+ yyval.node = NEW_DASGN_CURR(internal_id(), 0);
27906 }
27907 else {
27908- (yyval.node) = NEW_NODE(NODE_LASGN,0,0,local_append(0));
27909+ yyval.node = NEW_NODE(NODE_LASGN,0,0,local_append(0));
27910 }
27911- }
27912+ ;}
27913 break;
27914
27915 case 466:
27916 #line 2365 "parse.y"
27917 {
27918- if (!is_local_id((yyvsp[(2) - (2)].id)))
27919+ if (!is_local_id(yyvsp[0].id))
27920 yyerror("block argument must be local variable");
27921- else if (local_id((yyvsp[(2) - (2)].id)))
27922+ else if (local_id(yyvsp[0].id))
27923 yyerror("duplicate block argument name");
27924- (yyval.node) = NEW_BLOCK_ARG((yyvsp[(2) - (2)].id));
27925- }
27926+ yyval.node = NEW_BLOCK_ARG(yyvsp[0].id);
27927+ ;}
27928 break;
27929
27930 case 467:
27931 #line 2375 "parse.y"
27932 {
27933- (yyval.node) = (yyvsp[(2) - (2)].node);
27934- }
27935+ yyval.node = yyvsp[0].node;
27936+ ;}
27937 break;
27938
27939 case 469:
27940 #line 2382 "parse.y"
27941 {
27942- (yyval.node) = (yyvsp[(1) - (1)].node);
27943- value_expr((yyval.node));
27944- }
27945+ yyval.node = yyvsp[0].node;
27946+ value_expr(yyval.node);
27947+ ;}
27948 break;
27949
27950 case 470:
27951 #line 2386 "parse.y"
27952- {lex_state = EXPR_BEG;}
27953+ {lex_state = EXPR_BEG;;}
27954 break;
27955
27956 case 471:
27957 #line 2387 "parse.y"
27958 {
27959- if ((yyvsp[(3) - (5)].node) == 0) {
27960+ if (yyvsp[-2].node == 0) {
27961 yyerror("can't define singleton method for ().");
27962 }
27963 else {
27964- switch (nd_type((yyvsp[(3) - (5)].node))) {
27965+ switch (nd_type(yyvsp[-2].node)) {
27966 case NODE_STR:
27967 case NODE_DSTR:
27968 case NODE_XSTR:
27969@@ -7196,69 +6863,70 @@
27970 case NODE_ZARRAY:
27971 yyerror("can't define singleton method for literals");
27972 default:
27973- value_expr((yyvsp[(3) - (5)].node));
27974+ value_expr(yyvsp[-2].node);
27975 break;
27976 }
27977 }
27978- (yyval.node) = (yyvsp[(3) - (5)].node);
27979- }
27980+ yyval.node = yyvsp[-2].node;
27981+ ;}
27982 break;
27983
27984 case 473:
27985 #line 2413 "parse.y"
27986 {
27987- (yyval.node) = (yyvsp[(1) - (2)].node);
27988- }
27989+ yyval.node = yyvsp[-1].node;
27990+ ;}
27991 break;
27992
27993 case 474:
27994 #line 2417 "parse.y"
27995 {
27996- if ((yyvsp[(1) - (2)].node)->nd_alen%2 != 0) {
27997+ if (yyvsp[-1].node->nd_alen%2 != 0) {
27998 yyerror("odd number list for Hash");
27999 }
28000- (yyval.node) = (yyvsp[(1) - (2)].node);
28001- }
28002+ yyval.node = yyvsp[-1].node;
28003+ ;}
28004 break;
28005
28006 case 476:
28007 #line 2427 "parse.y"
28008 {
28009- (yyval.node) = list_concat((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
28010- }
28011+ yyval.node = list_concat(yyvsp[-2].node, yyvsp[0].node);
28012+ ;}
28013 break;
28014
28015 case 477:
28016 #line 2433 "parse.y"
28017 {
28018- (yyval.node) = list_append(NEW_LIST((yyvsp[(1) - (3)].node)), (yyvsp[(3) - (3)].node));
28019- }
28020+ yyval.node = list_append(NEW_LIST(yyvsp[-2].node), yyvsp[0].node);
28021+ ;}
28022 break;
28023
28024 case 497:
28025 #line 2471 "parse.y"
28026- {yyerrok;}
28027+ {yyerrok;;}
28028 break;
28029
28030 case 500:
28031 #line 2476 "parse.y"
28032- {yyerrok;}
28033+ {yyerrok;;}
28034 break;
28035
28036 case 501:
28037 #line 2479 "parse.y"
28038- {(yyval.node) = 0;}
28039+ {yyval.node = 0;;}
28040 break;
28041
28042
28043-/* Line 1267 of yacc.c. */
28044-#line 7256 "parse.c"
28045- default: break;
28046 }
28047- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
28048
28049- YYPOPSTACK (yylen);
28050- yylen = 0;
28051+/* Line 1010 of yacc.c. */
28052+#line 6925 "parse.c"
28053+\f
28054+ yyvsp -= yylen;
28055+ yyssp -= yylen;
28056+
28057+
28058 YY_STACK_PRINT (yyss, yyssp);
28059
28060 *++yyvsp = yyval;
28061@@ -7287,65 +6955,99 @@
28062 if (!yyerrstatus)
28063 {
28064 ++yynerrs;
28065-#if ! YYERROR_VERBOSE
28066- yyerror (YY_("syntax error"));
28067-#else
28068- {
28069- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
28070- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
28071- {
28072- YYSIZE_T yyalloc = 2 * yysize;
28073- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
28074- yyalloc = YYSTACK_ALLOC_MAXIMUM;
28075- if (yymsg != yymsgbuf)
28076- YYSTACK_FREE (yymsg);
28077- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
28078- if (yymsg)
28079- yymsg_alloc = yyalloc;
28080- else
28081+#if YYERROR_VERBOSE
28082+ yyn = yypact[yystate];
28083+
28084+ if (YYPACT_NINF < yyn && yyn < YYLAST)
28085+ {
28086+ YYSIZE_T yysize = 0;
28087+ int yytype = YYTRANSLATE (yychar);
28088+ const char* yyprefix;
28089+ char *yymsg;
28090+ int yyx;
28091+
28092+ /* Start YYX at -YYN if negative to avoid negative indexes in
28093+ YYCHECK. */
28094+ int yyxbegin = yyn < 0 ? -yyn : 0;
28095+
28096+ /* Stay within bounds of both yycheck and yytname. */
28097+ int yychecklim = YYLAST - yyn;
28098+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
28099+ int yycount = 0;
28100+
28101+ yyprefix = ", expecting ";
28102+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
28103+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
28104 {
28105- yymsg = yymsgbuf;
28106- yymsg_alloc = sizeof yymsgbuf;
28107+ yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
28108+ yycount += 1;
28109+ if (yycount == 5)
28110+ {
28111+ yysize = 0;
28112+ break;
28113+ }
28114 }
28115- }
28116+ yysize += (sizeof ("syntax error, unexpected ")
28117+ + yystrlen (yytname[yytype]));
28118+ yymsg = (char *) YYSTACK_ALLOC (yysize);
28119+ if (yymsg != 0)
28120+ {
28121+ char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
28122+ yyp = yystpcpy (yyp, yytname[yytype]);
28123
28124- if (0 < yysize && yysize <= yymsg_alloc)
28125- {
28126- (void) yysyntax_error (yymsg, yystate, yychar);
28127- yyerror (yymsg);
28128- }
28129- else
28130- {
28131- yyerror (YY_("syntax error"));
28132- if (yysize != 0)
28133- goto yyexhaustedlab;
28134- }
28135- }
28136-#endif
28137+ if (yycount < 5)
28138+ {
28139+ yyprefix = ", expecting ";
28140+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
28141+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
28142+ {
28143+ yyp = yystpcpy (yyp, yyprefix);
28144+ yyp = yystpcpy (yyp, yytname[yyx]);
28145+ yyprefix = " or ";
28146+ }
28147+ }
28148+ yyerror (yymsg);
28149+ YYSTACK_FREE (yymsg);
28150+ }
28151+ else
28152+ yyerror ("syntax error; also virtual memory exhausted");
28153+ }
28154+ else
28155+#endif /* YYERROR_VERBOSE */
28156+ yyerror ("syntax error");
28157 }
28158
28159
28160
28161 if (yyerrstatus == 3)
28162 {
28163- /* If just tried and failed to reuse look-ahead token after an
28164+ /* If just tried and failed to reuse lookahead token after an
28165 error, discard it. */
28166
28167 if (yychar <= YYEOF)
28168- {
28169- /* Return failure if at end of input. */
28170+ {
28171+ /* If at end of input, pop the error token,
28172+ then the rest of the stack, then return failure. */
28173 if (yychar == YYEOF)
28174- YYABORT;
28175- }
28176+ for (;;)
28177+ {
28178+ YYPOPSTACK;
28179+ if (yyssp == yyss)
28180+ YYABORT;
28181+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
28182+ yydestruct (yystos[*yyssp], yyvsp);
28183+ }
28184+ }
28185 else
28186 {
28187- yydestruct ("Error: discarding",
28188- yytoken, &yylval);
28189+ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
28190+ yydestruct (yytoken, &yylval);
28191 yychar = YYEMPTY;
28192+
28193 }
28194 }
28195
28196- /* Else will try to reuse look-ahead token after shifting the error
28197+ /* Else will try to reuse lookahead token after shifting the error
28198 token. */
28199 goto yyerrlab1;
28200
28201@@ -7355,17 +7057,15 @@
28202 `---------------------------------------------------*/
28203 yyerrorlab:
28204
28205- /* Pacify compilers like GCC when the user code never invokes
28206- YYERROR and the label yyerrorlab therefore never appears in user
28207- code. */
28208- if (/*CONSTCOND*/ 0)
28209+#ifdef __GNUC__
28210+ /* Pacify GCC when the user code never invokes YYERROR and the label
28211+ yyerrorlab therefore never appears in user code. */
28212+ if (0)
28213 goto yyerrorlab;
28214+#endif
28215
28216- /* Do not reclaim the symbols of the rule which action triggered
28217- this YYERROR. */
28218- YYPOPSTACK (yylen);
28219- yylen = 0;
28220- YY_STACK_PRINT (yyss, yyssp);
28221+ yyvsp -= yylen;
28222+ yyssp -= yylen;
28223 yystate = *yyssp;
28224 goto yyerrlab1;
28225
28226@@ -7394,10 +7094,9 @@
28227 if (yyssp == yyss)
28228 YYABORT;
28229
28230-
28231- yydestruct ("Error: popping",
28232- yystos[yystate], yyvsp);
28233- YYPOPSTACK (1);
28234+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
28235+ yydestruct (yystos[yystate], yyvsp);
28236+ YYPOPSTACK;
28237 yystate = *yyssp;
28238 YY_STACK_PRINT (yyss, yyssp);
28239 }
28240@@ -7405,11 +7104,10 @@
28241 if (yyn == YYFINAL)
28242 YYACCEPT;
28243
28244- *++yyvsp = yylval;
28245+ YYDPRINTF ((stderr, "Shifting error token, "));
28246
28247+ *++yyvsp = yylval;
28248
28249- /* Shift the error token. */
28250- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
28251
28252 yystate = yyn;
28253 goto yynewstate;
28254@@ -7430,39 +7128,21 @@
28255 goto yyreturn;
28256
28257 #ifndef yyoverflow
28258-/*-------------------------------------------------.
28259-| yyexhaustedlab -- memory exhaustion comes here. |
28260-`-------------------------------------------------*/
28261-yyexhaustedlab:
28262- yyerror (YY_("memory exhausted"));
28263+/*----------------------------------------------.
28264+| yyoverflowlab -- parser overflow comes here. |
28265+`----------------------------------------------*/
28266+yyoverflowlab:
28267+ yyerror ("parser stack overflow");
28268 yyresult = 2;
28269 /* Fall through. */
28270 #endif
28271
28272 yyreturn:
28273- if (yychar != YYEOF && yychar != YYEMPTY)
28274- yydestruct ("Cleanup: discarding lookahead",
28275- yytoken, &yylval);
28276- /* Do not reclaim the symbols of the rule which action triggered
28277- this YYABORT or YYACCEPT. */
28278- YYPOPSTACK (yylen);
28279- YY_STACK_PRINT (yyss, yyssp);
28280- while (yyssp != yyss)
28281- {
28282- yydestruct ("Cleanup: popping",
28283- yystos[*yyssp], yyvsp);
28284- YYPOPSTACK (1);
28285- }
28286 #ifndef yyoverflow
28287 if (yyss != yyssa)
28288 YYSTACK_FREE (yyss);
28289 #endif
28290-#if YYERROR_VERBOSE
28291- if (yymsg != yymsgbuf)
28292- YYSTACK_FREE (yymsg);
28293-#endif
28294- /* Make sure YYID is used. */
28295- return YYID (yyresult);
28296+ return yyresult;
28297 }
28298
28299
28300@@ -9135,6 +8815,7 @@
28301 COND_PUSH(0);
28302 CMDARG_PUSH(0);
28303 lex_state = EXPR_BEG;
28304+ if (c != tLBRACE) command_start = Qtrue;
28305 return c;
28306
28307 case '\\':
28308@@ -9438,6 +9119,7 @@
28309 return kw->id[0];
28310 }
28311 if (kw->id[0] == kDO) {
28312+ command_start = Qtrue;
28313 if (COND_P()) return kDO_COND;
28314 if (CMDARG_P() && state != EXPR_CMDARG)
28315 return kDO_BLOCK;
28316@@ -11331,3 +11013,4 @@
28317 }
28318 #endif
28319
28320+
28321diff -ur ruby-1.8.6/parse.y ruby/parse.y
28322--- ruby-1.8.6/parse.y 2007-03-03 00:30:46.000000000 -0700
28323+++ ruby/parse.y 2007-04-16 01:44:56.000000000 -0600
28324@@ -2,8 +2,8 @@
28325
28326 parse.y -
28327
28328- $Author$
28329- $Date$
28330+ $Author$
28331+ $Date$
28332 created at: Fri May 28 18:02:42 JST 1993
28333
28334 Copyright (C) 1993-2003 Yukihiro Matsumoto
28335@@ -4146,6 +4146,7 @@
28336 COND_PUSH(0);
28337 CMDARG_PUSH(0);
28338 lex_state = EXPR_BEG;
28339+ if (c != tLBRACE) command_start = Qtrue;
28340 return c;
28341
28342 case '\\':
28343@@ -4449,6 +4450,7 @@
28344 return kw->id[0];
28345 }
28346 if (kw->id[0] == kDO) {
28347+ command_start = Qtrue;
28348 if (COND_P()) return kDO_COND;
28349 if (CMDARG_P() && state != EXPR_CMDARG)
28350 return kDO_BLOCK;
28351diff -ur ruby-1.8.6/README ruby/README
28352--- ruby-1.8.6/README 2007-02-20 00:37:34.000000000 -0700
28353+++ ruby/README 2007-02-20 00:37:23.000000000 -0700
28354@@ -29,7 +29,7 @@
28355 The latest source code of this version series can be checked out
28356 through SVN with the following command:
28357
28358- $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
28359+ $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
28360
28361 The trunk of the Ruby source tree can be checked out with the
28362 following command:
28363diff -ur ruby-1.8.6/README.ja ruby/README.ja
28364--- ruby-1.8.6/README.ja 2007-02-20 00:37:34.000000000 -0700
28365+++ ruby/README.ja 2007-02-20 00:37:23.000000000 -0700
28366@@ -36,7 +36,7 @@
28367
28368