+++ /dev/null
-diff -ur ruby-1.8.6/bignum.c ruby/bignum.c
---- ruby-1.8.6/bignum.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/bignum.c 2007-03-21 02:04:11.000000000 -0600
-@@ -2,8 +2,8 @@
-
- bignum.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Fri Jun 10 00:48:55 JST 1994
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -642,10 +642,10 @@
- j = j * 53L / 84 + 1;
- break;
- case 4: case 5: case 6: case 7:
-- j /= 2;
-+ j = (j + 1) / 2;
- break;
- case 8: case 9:
-- j /= 3;
-+ j = (j + 2) / 3;
- break;
- case 10: case 11: case 12: case 13: case 14: case 15:
- j = j * 28L / 93 + 1;
-@@ -653,10 +653,10 @@
- case 16: case 17: case 18: case 19: case 20: case 21:
- case 22: case 23: case 24: case 25: case 26: case 27:
- case 28: case 29: case 30: case 31:
-- j /= 4;
-+ j = (j + 3) / 4;
- break;
- case 32: case 33: case 34: case 35: case 36:
-- j /= 5;
-+ j = (j + 4) / 5;
- break;
- default:
- rb_raise(rb_eArgError, "illegal radix %d", base);
-diff -ur ruby-1.8.6/ChangeLog ruby/ChangeLog
---- ruby-1.8.6/ChangeLog 2007-03-12 13:15:06.000000000 -0600
-+++ ruby/ChangeLog 2007-04-26 11:06:54.000000000 -0600
-@@ -1,8 +1,270 @@
--Tue Mar 13 04:04:04 2007 Akinori MUSHA <knu@iDaemons.org>
-+Fri Apr 27 02:00:17 2007 Ryan Davis <ryand-ruby@zenspider.com>
-
-- * stable version 1.8.6 released.
-+ * signal.c: Fixed backwards compatibility for 'raise Interrupt'.
-+
-+ * lib/yaml/tag.rb: Running rdoc over the 1.8.6 tree skips
-+ Module. Patch from James Britt
-+
-+Thu Apr 26 13:54:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * misc/ruby-style.el: new file. C/C++ style for ruby source code.
-+
-+Wed Apr 25 19:49:16 2007 Tanaka Akira <akr@fsij.org>
-+
-+ * ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
-+ align file descriptor appropriately.
-+
-+Tue Apr 24 09:33:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
-+ [ruby-talk:248288]
-+
-+Mon Apr 23 22:14:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * ext/extmk.rb ($ruby): add extout directory to include path.
-+ [ruby-core:11003]
-+
-+ * lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
-+ directory.
-+
-+ * lib/mkmf.rb (init_mkmf): add current directory to default
-+ library path with highest priority. [ruby-core:10960]
-+
-+ * lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
-+
-+Fri Apr 20 16:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
-+ it is done by libpathflag in mkmf.rb.
-+
-+Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * lib/optparse.rb: fix to override conv proc.
-+
-+Fri Apr 20 12:17:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * eval.c (ruby_cleanup): inversed the order of errinfos.
-+
-+Thu Apr 19 14:53:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
-+ ensures Thread.critical to be false. [ruby-talk:248300]
-+
-+Wed Apr 18 10:41:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * util.c (ruby_strtod): exponent is radix 10. [ruby-talk:248272]
-+
-+Wed Apr 18 02:30:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * configure.in (LDFLAGS): prepend -L. instead appending it to
-+ XLDFLAGS. [ruby-core:10933]
-+
-+ * configure.in (Makefile): remove $U for automake from MISSING.
-+ [ruby-talk:248171]
-+
-+Tue Apr 17 16:46:46 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-+
-+ * eval.c (rb_yield_0): should not clear state on TAG_NEXT when
-+ it's invoked from within lambda body. [ruby-talk:248136]
-+
-+ * eval.c (proc_invoke): handle TAG_NEXT which would be caused by
-+ next in the lambda body as well.
-+
-+Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-+
-+ * ext/pty/expect_sample.rb: avoid symbolic link representation for
-+ expect. a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
-+ [ruby-dev:30714]
-+
-+Mon Apr 16 22:51:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-+
-+ * sample: replace TRUE, FALSE with true, false respectively.
-+ a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
-+ [ruby-dev:30713]
-+
-+Mon Apr 16 17:08:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * lib/optparse.rb (make_switch): do not clobber converter if pattern
-+ has no convert method. reported by sheepman in [ruby-dev:30709].
-+
-+Mon Apr 16 16:49:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * ext/stringio/stringio.c (strio_seek): consistent behavior with
-+ IO#seek. patch by sheepman in [ruby-dev:30710].
-+
-+Mon Apr 16 16:34:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-+
-+ * parse.y (parser_yylex): should set command_start after block
-+ starting "do"s and braces. [ruby-core:10916]
-+
-+Sun Apr 15 09:19:57 2007 Tadayoshi Funaba <tadf@dotrb.org>
-+
-+ * lib/date/format.rb: added some zone names.
-+
-+ * lib/date/format.rb (_parse): now interprets doted numerical
-+ dates as a big endian (except dd.mm.yyyy).
-+
-+Tue Apr 10 17:37:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
-+ * win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
-+ before calling original fclose()/close().
-+
-+Mon Apr 9 09:30:44 2007 Shugo Maeda <shugo@ruby-lang.org>
-+
-+ * lib/net/imap.rb (disconnect): call shutdown for
-+ SSLSocket. Thanks, Technorama Ltd.
-+
-+Thu Apr 5 00:42:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * error.c (rb_notimplement), io.c (pipe_open): removed definite
-+ articles and UNIX manual section from messages. [ruby-dev:30690]
-+
-+Wed Apr 4 17:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * io.c (pipe_open): refined the message of NotImplementedError.
-+ [ruby-dev:30685]
-+
-+Wed Apr 4 10:18:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * io.c (pipe_open): raise NotImplementedError for command "-" on
-+ platforms where fork(2) is not available. [ruby-dev:30681]
-+
-+Tue Apr 3 15:45:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
-+ * ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
-+ windows) doesn't set fromlen if the socket is connection-oriented.
-+ reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
-
--Tue Mar 13 02:54:17 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sat Mar 24 23:40:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * node.h (struct rb_thread.locals): explicit as struct.
-+ [ruby-core:10585]
-+
-+ * eval.c, node.h (enum rb_thread_status, struct rb_thread,
-+ rb_curr_thread, rb_main_thread): prefixed. [ruby-core:10586]
-+
-+ * file.c (chompdirsep): made an unprefixed name static.
-+
-+ * io.c (io_fread): ditto.
-+
-+Sat Mar 24 01:54:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
-+ block. [ruby-core:10609]
-+
-+ * test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
-+ test for exit in END block. [ruby-core:10760]
-+
-+ * test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
-+ test for signal in END block.
-+
-+Thu Mar 22 23:13:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * eval.c (rb_provided): check for extension library if SOEXT is
-+ explicitly given. [ruby-dev:30657]
-+
-+Thu Mar 22 10:29:25 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
-+ * test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
-+
-+Wed Mar 21 17:04:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * bignum.c (rb_big2str0): round up for the most significant digit.
-+ [ruby-core:10686]
-+
-+Wed Mar 21 07:21:24 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * ext/thread/thread.c (remove_one): Preserve List invariants;
-+ submitted by: MenTaLguY <mental AT rydia.net>
-+ in [ruby-core:10598] and [ruby-bugs:PR#9388].
-+
-+Tue Mar 20 22:54:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-+
-+ * marshal.c (w_extended): erroneous check condition when dump
-+ method is defined. [ruby-core:10646]
-+
-+Tue Mar 20 15:37:24 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-+
-+ * distruby.rb: Add zip generation.
-+
-+Tue Mar 20 11:28:41 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
-+ the Gauss-Jordan algorithm, making it stable. a patch from
-+ Peter Vanbroekhoven. [ruby-core:10641]
-+
-+Mon Mar 19 11:39:29 2007 Minero Aoki <aamine@loveruby.net>
-+
-+ * lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
-+
-+Sun Mar 18 04:23:52 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * NEWS: Add a note about the new `date' library defining
-+ Time#to_date and Time#to_datetime private methods.
-+
-+ * NEWS: Inform that the old `thread' library is considered to be
-+ stable.
-+
-+ * NEWS: Sort library entries in alphabetical order.
-+
-+Fri Mar 16 21:48:11 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
-+ submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-+ in [ruby-dev:30554].
-+
-+Fri Mar 16 18:28:06 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
-+ always returning the (real) group entry of the running process;
-+ reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
-+ in [ruby-dev:30586].
-+
-+Fri Mar 16 16:33:58 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * ext/thread/thread.c (unlock_mutex_inner): Make sure that the
-+ given mutex is actually owned by the caller; submitted by:
-+ Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
-+
-+Fri Mar 16 16:21:35 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
-+ ConditionVariable#wait that occurs when two threads that are
-+ trying to access the condition variable are also in concurrence
-+ for the given mutex; submitted by: Sylvain Joyeux
-+ <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
-+ in [ruby-core:10598].
-+
-+Fri Mar 16 16:17:27 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * test/thread/test_thread.rb: Add a test script for the `thread'
-+ library. This should result in failure as of now with
-+ ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
-+ m4x.org> in [ruby-core:10598].
-+
-+Wed Mar 14 12:30:00 2007 Shigeo Kobayashi <shigeo@tinyforest.jp>
-+
-+ * ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
-+ treated as ("-0.31") not as ("0.31").
-+
-+Tue Mar 13 09:25:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * common.mk (clear-installed-list): separated from install-prereq.
-+
-+Tue Mar 13 06:38:43 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * NEWS: Reword and improve entries.
-+
-+Tue Mar 13 06:03:46 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * stable version 1.8.6 released from the ruby_1_8_6 branch.
-+
-+Tue Mar 13 03:24:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * runruby.rb: added --pure (turned on by default) and --debugger
-+ options.
-+
-+Tue Mar 13 02:50:28 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
- assumption any more; submitted by MIYASAKA Masaru <alkaid AT
-@@ -34,7 +296,7 @@
-
- * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
-
--Mon Mar 12 01:23:50 2007 Akinori MUSHA <knu@iDaemons.org>
-+Mon Mar 12 01:05:17 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
- This might not be very right but it is commonly used in other
-@@ -43,12 +305,14 @@
-
- * ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
-
-+Mon Mar 12 00:59:19 2007 Akinori MUSHA <knu@iDaemons.org>
-+
- * ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
- DL::Importable::Internal::callback): Avoid race condition for an
- instance variable; submitted by sheepman <sheepman AT
- sheepman.sakura.ne.jp> in [ruby-dev:30530].
-
--Sun Mar 11 19:04:29 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sun Mar 11 18:57:50 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * misc/README: Add a note about ruby-electric.el.
-
-@@ -61,14 +325,14 @@
- interface based on rubydb3x.el; submitted by Martin Nordholts
- <enselic AT gmail.com> in [ruby-bugs:PR#9023].
-
--Sun Mar 11 17:51:46 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sun Mar 11 17:45:51 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
- function is found in the function table before trying to call
- it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
- in [ruby-dev:30524].
-
--Sun Mar 11 17:30:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+Sun Mar 11 12:09:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (error_handle): no message when exiting by signal.
-
-@@ -91,15 +355,19 @@
-
- * signal.c (rb_signal_exec, trap): handle SIGTERM. [ruby-dev:30505]
-
--Tue Mar 6 19:03:42 2007 Akinori MUSHA <knu@iDaemons.org>
-+Tue Mar 6 19:08:46 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
- Digest::MD5.
-
- * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
-
-+Tue Mar 6 18:58:37 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-+
- * lib/shell/process-controller.rb: fix thread synchronization
- problem for [ruby-dev:30477].
-+
-+Tue Mar 6 18:44:26 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
- Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
-@@ -107,47 +375,63 @@
-
- * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
-
-+Tue Mar 6 18:24:19 2007 Akinori MUSHA <knu@iDaemons.org>
-+
- * time.c (time_to_s): Back out the format changes; discussed
- in [ruby-dev:30495].
-
-+Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-+
- * ext/tk/sample/irbtkw.rbw: fails to exit process.
-
--Mon Mar 5 20:26:10 2007 Akinori MUSHA <knu@iDaemons.org>
-+Mon Mar 5 20:14:49 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * time.c (time_to_s): Correct the wrong format which did not
- really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
- iij.ad.jp> in [ruby-dev:30487].
-
--Sun Mar 4 23:53:27 2007 Minero Aoki <aamine@loveruby.net>
-+Sun Mar 4 23:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
-- * lib/fileutils.rb (mv): could not move a directory between
-- different filesystems. [ruby-dev:30411]
--
--Sun Mar 4 23:46:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
--
-- * file.c (rb_file_s_utime): allow nil to set the current time.
-+ * file.c (rb_stat_s_utime): fixed a commit miss for the platforms
-+ where utimes() does not exist.
-
-- * lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
-- options. fixed: [ruby-talk:219037]
-+ * lib/fileutils.rb (touch): ditto.
-
--Sun Mar 4 23:19:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-+Sun Mar 4 14:46:56 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (push_element): should return a int value.
-
--Sun Mar 4 01:06:55 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sun Mar 4 01:05:57 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#^, Set#&): Correct documentation. Those methods
- return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
- mangabrain.de>.
-
--Sat Mar 3 21:41:31 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sat Mar 3 23:01:07 2007 Minero Aoki <aamine@loveruby.net>
-+
-+ * lib/fileutils.rb (mv): could not move a directory between
-+ different filesystems. [ruby-dev:30411]
-+
-+Sat Mar 3 22:57:11 2007 Minero Aoki <aamine@loveruby.net>
-+
-+ * lib/fileutils.rb (touch): last commit causes error if :mtime
-+ option was not given.
-+
-+Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * file.c (rb_file_s_utime): allow nil to set the current time.
-+
-+ * lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
-+ options. fixed: [ruby-talk:219037]
-+
-+Sat Mar 3 21:17:35 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
- submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
- [ruby-list:43218].
- cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
-
--Sat Mar 3 19:07:05 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sat Mar 3 19:05:31 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c (push_list): Use ALLOC().
-
-@@ -155,21 +439,11 @@
-
- * ext/thread/thread.c (rb_condvar_alloc): Ditto.
-
--Sat Mar 3 18:56:40 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sat Mar 3 18:53:11 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * NEWS: Add a note for String#intern.
-
--Sat Mar 3 18:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
--
-- * eval.c (rb_provided): return true only for features loaded from
-- .rb files, and not search actual library type. [ruby-dev:30414]
--
-- * eval.c (rb_feature_p): check loading_tbl if the given ext is
-- empty. [ruby-dev:30452]
--
-- * eval.c (rb_feature_p): fix possible buffer overrun.
--
--Sat Mar 3 16:30:39 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sat Mar 3 16:23:13 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
- local_tbl region from getting freed many times; submitted by
-@@ -182,78 +456,108 @@
-
- * parse.y (top_local_setup_gen): Ditto.
-
--Sat Mar 3 16:09:27 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sat Mar 3 16:07:02 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * object.c (rb_obj_ivar_set): RDoc updated according to a
- suggestion from Brian Candler <B.Candler AT pobox.com>.
- [ruby-core:10469]
-
--Sat Mar 3 15:41:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+Thu Mar 1 21:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
-- empty. [ruby-dev:30452]
-+ empty. [ruby-dev:30455]
-
--Thu Mar 1 04:08:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+Thu Mar 1 08:55:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
-- * mkconfig.rb (patchlevel): read from version.h.
-+ * eval.c (rb_feature_p): check loading_tbl if the given ext is
-+ empty. [ruby-dev:30452]
-
--Thu Mar 1 03:42:09 2007 Akinori MUSHA <knu@iDaemons.org>
-+ * eval.c (rb_feature_p): fix possible buffer overrun.
-+
-+Thu Mar 1 03:30:21 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
- Digest::Base subclasses, which was unintentionally made
- impossible while restructuring Digest classes.
-
--Wed Feb 28 22:10:55 2007 Akinori MUSHA <knu@iDaemons.org>
-+Thu Mar 1 02:05:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
-- * doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
-- NEWS.
-+ * mkconfig.rb (patchlevel): read from version.h.
-
-- * NEWS: Add NEWS, a document file to keep user visible feature
-- changes between releases.
-+Thu Mar 1 00:09:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * eval.c (rb_provided): return true only for features loaded from
-+ .rb files, and not search actual library type. [ruby-dev:30414]
-+
-+Wed Feb 28 21:15:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
-
- * missing/flock.c: workaround for MinGW.
-
-+Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-+
-+ * pack.c (pack_unpack): properly ignore non-base64 octets such as
-+ UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
-+ to fix [ruby-core:10437]
-+
-+Wed Feb 28 18:59:57 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * NEWS: Add NEWS, a document file to keep user visible feature
-+ changes between releases.
-+
-+Wed Feb 28 18:35:50 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
- * ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
- they are already checked at configure.
- reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-
-+Wed Feb 28 18:34:48 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
- * lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
- should be the first elements of library paths list.
- reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-
-+Wed Feb 28 18:31:32 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
-+ NEWS.
-+
-+Wed Feb 28 01:22:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
- * test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
- target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-
-+Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
-+
- * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
-
- * common.mk: new target dist
-
- * distruby.rb: new file
-
-+Tue Feb 27 22:18:45 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-+
- * configure.in (--enable-auto-image-base): avoid the neccessity to
- rebase the shared libs as much as possible;
- submitted by Corinna Vinschen <spam at vinschen.de> in
- [ruby-talk:240964].
-
--Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
--
-- * pack.c (pack_unpack): properly ignore non-base64 octets such as
-- UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
-- to fix [ruby-core:10437]
--
--Tue Feb 27 21:50:10 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-+Tue Feb 27 21:36:47 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
-
-+Tue Feb 27 21:33:04 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-+
- * configure.in (ac_cv_func_setrlimit): workaround for djgpp.
-
--Tue Feb 27 20:49:19 2007 Akinori MUSHA <knu@iDaemons.org>
-+Tue Feb 27 19:38:52 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/base64.rb (Base64::b64encode): Fix documentation; submitted
- by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
-
-+Tue Feb 27 19:36:57 2007 Akinori MUSHA <knu@iDaemons.org>
-+
- * regex.c (calculate_must_string, slow_search, re_search): Silence
- warnings regarding char * vs. unsigned char * mismatch;
- submitted by Lyle Johnson <lyle.johnson@gmail.com>
-@@ -271,6 +575,8 @@
- * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
- rb_nkf_guess2): Ditto.
-
-+Tue Feb 27 03:40:09 2007 Akinori MUSHA <knu@iDaemons.org>
-+
- * ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
- Eliminate rb_thread_critical switching where unnecessary;
- implied by shugo in [ruby-dev:30412].
-@@ -281,28 +587,35 @@
- * ext/thread/thread.c: Consistently use 0 and 1 for
- rb_thread_critical values.
-
-+Mon Feb 26 15:18:23 2007 Akinori MUSHA <knu@iDaemons.org>
-+
- * ext/thread/thread.c: Use xmalloc()/xfree() instead of
- malloc()/free(); pointed out by shugo in [ruby-dev:30412].
-
-+Sun Feb 25 23:02:55 2007 Akinori MUSHA <knu@iDaemons.org>
-+
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
- Initialize @workdir properly to silence a warning under -w.
- Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
-
--Sun Feb 25 02:50:51 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sun Feb 25 02:47:43 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
- which is necessary for dir.c to compile on djgpp and emx.
-
--Sat Feb 24 17:04:01 2007 Tadayoshi Funaba <tadf@dotrb.org>
--
-- * lib/date/format.rb: updated based on date2 4.0.3.
--
--Sat Feb 24 17:01:02 2007 Minero Aoki <aamine@loveruby.net>
-+Sat Feb 24 10:42:01 2007 Minero Aoki <aamine@loveruby.net>
-
- * ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
- rb_gc_mark. Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
-
--Sat Feb 24 16:53:09 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+Fri Feb 23 15:10:46 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-+
-+ * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-+ workaround. [ruby-core:10259]
-+
-+ * win32/win32.c (NtInitialize): call above function.
-+
-+Fri Feb 23 14:19:40 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * signal.c (sighandler): need to tell to be interrupted to main
- context when handler is installed.
-@@ -310,19 +623,14 @@
- * win32/win32.[ch] (rb_win32_interrupted): new function to listen
- interrupt.
-
-- * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-- workaround. [ruby-core:10259]
--
-- * win32/win32.c (NtInitialize): call above function.
--
--Fri Feb 23 13:04:43 2007 Akinori MUSHA <knu@iDaemons.org>
-+Fri Feb 23 13:02:17 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
- suggested in
- http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
- [ruby-talk:240223]
-
--Fri Feb 23 12:47:13 2007 James Edward Gray II <james@grayproductions.net>
-+Fri Feb 23 12:43:17 2007 James Edward Gray II <james@grayproductions.net>
-
- * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
- Content-Length parameter optional for responses in
-@@ -332,23 +640,23 @@
- * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
- support to xmlrpc; approved by the maintainer.
-
--Mon Feb 19 18:33:30 2007 Akinori MUSHA <knu@iDaemons.org>
-+Mon Feb 19 18:22:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-+
-+ * configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
-+ load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
-+ a bug where a statically linked extension cannot be autoloaded.
-+ [ruby-dev:30023] / [ruby-dev:30239]
-+
-+Mon Feb 19 17:14:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
- message for #peeraddr. a patch from Sam Roberts
- <sroberts at uniserve.com>. [ruby-core:10366]
-
--Mon Feb 19 18:27:42 2007 Akinori MUSHA <knu@iDaemons.org>
-+Sun Feb 18 19:35:21 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
-- * configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
-- load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
-- a bug where a statically linked extension cannot be autoloaded.
-- [ruby-dev:30023] / [ruby-dev:30239]
-+ * lib/date/format.rb: updated based on date2 4.0.3.
-
--Thu Feb 15 20:31:07 2007 Akinori MUSHA <knu@iDaemons.org>
--
-- * lib/uri/ftp.rb: Revert the previous change pending discussion.
--
- Fri Feb 16 11:18:21 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/.document: Apply patch for irb, e2mmap and README by Hugh Sasse
-@@ -356,14 +664,19 @@
-
- * lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
-
--Thu Feb 15 18:10:09 2007 Akinori MUSHA <knu@iDaemons.org>
-+Thu Feb 15 20:26:30 2007 Akinori MUSHA <knu@iDaemons.org>
-+
-+ * lib/uri/ftp.rb: Revert the previous change pending discussion.
-+
-+Thu Feb 15 18:08:17 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * dir.c (glob_helper): Fix the function declaration.
-
--Thu Feb 15 16:55:33 2007 Akinori MUSHA <knu@iDaemons.org>
-+Thu Feb 15 17:13:32 2007 Akinori MUSHA <knu@iDaemons.org>
-
-- * version.h: Branch off ruby_1_8_6 from ruby_1_8 in preparation
-- for the forthcoming 1.8.6 release.
-+ * version.h: Welcome to the post-1.8.6 world. Radical changes are
-+ inhibited in the ruby_1_8 branch until the 1.8.6 final release
-+ goes out of the door.
-
- Thu Feb 15 16:44:14 2007 Akinori MUSHA <knu@iDaemons.org>
-
-diff -ur ruby-1.8.6/common.mk ruby/common.mk
---- ruby-1.8.6/common.mk 2007-02-28 06:23:42.000000000 -0700
-+++ ruby/common.mk 2007-03-12 18:24:58.000000000 -0600
-@@ -257,7 +257,11 @@
- post-no-install-doc::
- @$(NULLCMD)
-
--install-prereq:
-+CLEAR_INSTALLED_LIST = clear-installed-list
-+
-+install-prereq: $(CLEAR_INSTALLED_LIST)
-+
-+clear-installed-list:
- @exit > $(INSTALLED_LIST)
-
- clean: clean-ext clean-local
-diff -ur ruby-1.8.6/configure ruby/configure
---- ruby-1.8.6/configure 2007-03-12 13:19:03.000000000 -0600
-+++ ruby/configure 2007-04-28 13:00:47.000000000 -0600
-@@ -1,54 +1,25 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61.
-+# Generated by GNU Autoconf 2.59.
- #
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be more Bourne compatible
--DUALCASE=1; export DUALCASE # for MKS sh
-+# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
-- setopt NO_GLOB_SUBST
--else
-- case `(set -o) 2>/dev/null` in
-- *posix*) set -o posix ;;
--esac
--
--fi
--
--
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -58,43 +29,8 @@
- fi
-
-
--# IFS
--# We need space, tab and new line, in precisely that order. Quoting is
--# there to prevent editors from complaining about space-tab.
--# (If _AS_PATH_WALK were called with IFS unset, it would disable word
--# splitting by setting IFS to empty value.)
--as_nl='
--'
--IFS=" "" $as_nl"
--
--# Find who we are. Look in the path if we contain no directory separator.
--case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--# We did not find ourselves, most probably we were run as `sh COMMAND'
--# in which case we are not to be found in the path.
--if test "x$as_myself" = x; then
-- as_myself=$0
--fi
--if test ! -f "$as_myself"; then
-- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-- { (exit 1); exit 1; }
--fi
--
- # Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--done
-+$as_unset ENV MAIL MAILPATH
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -108,19 +44,18 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1 &&
-- test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -128,388 +63,157 @@
-
-
- # Name of the executable.
--as_me=`$as_basename -- "$0" ||
-+as_me=`$as_basename "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{
-- s//\1/
-- q
-- }
-- /^X\/\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\/\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'`
--
--# CDPATH.
--$as_unset CDPATH
--
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-
--if test "x$CONFIG_SHELL" = x; then
-- if (eval ":") 2>/dev/null; then
-- as_have_required=yes
--else
-- as_have_required=no
--fi
--
-- if test $as_have_required = yes && (eval ":
--(as_func_return () {
-- (exit \$1)
--}
--as_func_success () {
-- as_func_return 0
--}
--as_func_failure () {
-- as_func_return 1
--}
--as_func_ret_success () {
-- return 0
--}
--as_func_ret_failure () {
-- return 1
--}
-
--exitcode=0
--if as_func_success; then
-- :
--else
-- exitcode=1
-- echo as_func_success failed.
--fi
--
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
-- :
--else
-- exitcode=1
-- echo as_func_ret_success failed.
--fi
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
- fi
-
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
--else
-- exitcode=1
-- echo positional parameters were not saved.
--fi
-
--test \$exitcode = 0) || { (exit 1); exit 1; }
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-
--(
-- as_lineno_1=\$LINENO
-- as_lineno_2=\$LINENO
-- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
--") 2> /dev/null; then
-- :
--else
-- as_candidate_shells=
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- case $as_dir in
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
- /*)
-- for as_base in sh bash ksh sh5; do
-- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-- done;;
-- esac
--done
--IFS=$as_save_IFS
--
--
-- for as_shell in $as_candidate_shells $SHELL; do
-- # Try only shells that exist, to save several forks.
-- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-- { ("$as_shell") 2> /dev/null <<\_ASEOF
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-- emulate sh
-- NULLCMD=:
-- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-- # is contrary to our usage. Disable this feature.
-- alias -g '${1+"$@"}'='"$@"'
-- setopt NO_GLOB_SUBST
--else
-- case `(set -o) 2>/dev/null` in
-- *posix*) set -o posix ;;
--esac
--
--fi
--
--
--:
--_ASEOF
--}; then
-- CONFIG_SHELL=$as_shell
-- as_have_required=yes
-- if { "$as_shell" 2> /dev/null <<\_ASEOF
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-- emulate sh
-- NULLCMD=:
-- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-- # is contrary to our usage. Disable this feature.
-- alias -g '${1+"$@"}'='"$@"'
-- setopt NO_GLOB_SUBST
--else
-- case `(set -o) 2>/dev/null` in
-- *posix*) set -o posix ;;
--esac
--
--fi
--
--
--:
--(as_func_return () {
-- (exit $1)
--}
--as_func_success () {
-- as_func_return 0
--}
--as_func_failure () {
-- as_func_return 1
--}
--as_func_ret_success () {
-- return 0
--}
--as_func_ret_failure () {
-- return 1
--}
--
--exitcode=0
--if as_func_success; then
-- :
--else
-- exitcode=1
-- echo as_func_success failed.
--fi
--
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
-- :
--else
-- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = "$1" ); then
-- :
--else
-- exitcode=1
-- echo positional parameters were not saved.
--fi
--
--test $exitcode = 0) || { (exit 1); exit 1; }
--
--(
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
--
--_ASEOF
--}; then
-- break
--fi
--
--fi
--
-- done
--
-- if test "x$CONFIG_SHELL" != x; then
-- for as_var in BASH_ENV ENV
-- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-- done
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
--fi
--
--
-- if test $as_have_required = no; then
-- echo This script requires a shell more modern than all the
-- echo shells that I found on your system. Please install a
-- echo modern shell, or manually run the script under such a
-- echo shell if you do have one.
-- { (exit 1); exit 1; }
--fi
--
--
--fi
--
--fi
--
--
--
--(eval "as_func_return () {
-- (exit \$1)
--}
--as_func_success () {
-- as_func_return 0
--}
--as_func_failure () {
-- as_func_return 1
--}
--as_func_ret_success () {
-- return 0
--}
--as_func_ret_failure () {
-- return 1
--}
--
--exitcode=0
--if as_func_success; then
-- :
--else
-- exitcode=1
-- echo as_func_success failed.
--fi
--
--if as_func_failure; then
-- exitcode=1
-- echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
-- :
--else
-- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
--else
-- exitcode=1
-- echo positional parameters were not saved.
--fi
--
--test \$exitcode = 0") || {
-- echo No shell found that supports shell functions.
-- echo Please tell autoconf@gnu.org about your system,
-- echo including any error possibly output before this
-- echo message
--}
--
--
--
-+ if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line after each line using $LINENO; the second 'sed'
-- # does the real work. The second script uses 'N' to pair each
-- # line-number line with the line containing $LINENO, and appends
-- # trailing '-' during substitution so that $LINENO is not a special
-- # case at line end.
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # scripts with optimization help from Paolo Bonzini. Blame Lee
-- # E. McMahon (1931-1989) for sed's syntax. :-)
-- sed -n '
-- p
-- /[$]LINENO/=
-- ' <$as_myself |
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
- sed '
-- s/[$]LINENO.*/&-/
-- t lineno
-- b
-- :lineno
- N
-- :loop
-- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
- t loop
-- s/-\n.*//
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
- ' >$as_me.lineno &&
-- chmod +x "$as_me.lineno" ||
-+ chmod +x $as_me.lineno ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensitive to this).
-- . "./$as_me.lineno"
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
- # Exit status is that of the last command.
- exit
- }
-
-
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-- as_dirname=dirname
--else
-- as_dirname=false
--fi
--
--ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
---n*)
-- case `echo 'x\c'` in
-- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-- *) ECHO_C='\c';;
-- esac;;
--*)
-- ECHO_N='-n';;
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1 &&
-- test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
--if test -d conf$$.dir; then
-- rm -f conf$$.dir/conf$$.file
--else
-- rm -f conf$$.dir
-- mkdir conf$$.dir
--fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s='ln -s'
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
--rmdir conf$$.dir 2>/dev/null
-+rm -f conf$$ conf$$.exe conf$$.file
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -518,28 +222,7 @@
- as_mkdir_p=false
- fi
-
--if test -x / >/dev/null 2>&1; then
-- as_test_x='test -x'
--else
-- if ls -dL / >/dev/null 2>&1; then
-- as_ls_L_option=L
-- else
-- as_ls_L_option=
-- fi
-- as_test_x='
-- eval sh -c '\''
-- if test -d "$1"; then
-- test -d "$1/.";
-- else
-- case $1 in
-- -*)set "./$1";;
-- esac;
-- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-- ???[sx]*):;;*)false;;esac;fi
-- '\'' sh
-- '
--fi
--as_executable_p=$as_test_x
-+as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -548,27 +231,39 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-
--exec 7<&0 </dev/null 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-+exec 6>&1
-+
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
--ac_clean_files=
- ac_config_libobj_dir=.
--LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
-+# Maximum number of lines to put in a shell here document.
-+# This variable seems obsolete. It should probably be removed, and
-+# only ac_max_sed_lines should be used.
-+: ${ac_max_here_lines=38}
-+
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -579,191 +274,42 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#ifdef HAVE_SYS_TYPES_H
-+#if HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#ifdef HAVE_SYS_STAT_H
-+#if HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#ifdef STDC_HEADERS
-+#if STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# ifdef HAVE_STDLIB_H
-+# if HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#ifdef HAVE_STRING_H
--# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#ifdef HAVE_STRINGS_H
-+#if HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#ifdef HAVE_INTTYPES_H
-+#if HAVE_INTTYPES_H
- # include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+# include <stdint.h>
-+# endif
- #endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_UNISTD_H
-+#if HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
-
--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
--datarootdir
--datadir
--sysconfdir
--sharedstatedir
--localstatedir
--includedir
--oldincludedir
--docdir
--infodir
--htmldir
--dvidir
--pdfdir
--psdir
--libdir
--localedir
--mandir
--DEFS
--ECHO_C
--ECHO_N
--ECHO_T
--LIBS
--build_alias
--host_alias
--target_alias
--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
--CFLAGS
--LDFLAGS
--CPPFLAGS
--ac_ct_CC
--EXEEXT
--OBJEXT
--CPP
--GREP
--EGREP
--GNU_LD
--CPPOUTFILE
--OUTFLAG
--YACC
--YFLAGS
--RANLIB
--AR
--AS
--ASFLAGS
--NM
--WINDRES
--DLLWRAP
--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'
-+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'
- ac_subst_files=''
-- ac_precious_vars='build_alias
--host_alias
--target_alias
--CC
--CFLAGS
--LDFLAGS
--LIBS
--CPPFLAGS
--CPP
--YACC
--YFLAGS'
--
-
- # Initialize some variables set by options.
- ac_init_help=
-@@ -790,48 +336,34 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
--# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datarootdir='${prefix}/share'
--datadir='${datarootdir}'
-+datadir='${prefix}/share'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
-+libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--docdir='${datarootdir}/doc/${PACKAGE}'
--infodir='${datarootdir}/info'
--htmldir='${docdir}'
--dvidir='${docdir}'
--pdfdir='${docdir}'
--psdir='${docdir}'
--libdir='${exec_prefix}/lib'
--localedir='${datarootdir}/locale'
--mandir='${datarootdir}/man'
-+infodir='${prefix}/info'
-+mandir='${prefix}/man'
-
- ac_prev=
--ac_dashdash=
- for ac_option
- do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
-- eval $ac_prev=\$ac_option
-+ eval "$ac_prev=\$ac_option"
- ac_prev=
- continue
- fi
-
-- case $ac_option in
-- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-- *) ac_optarg=yes ;;
-- esac
-+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case $ac_dashdash$ac_option in
-- --)
-- ac_dashdash=yes ;;
-+ case $ac_option in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -853,45 +385,33 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad)
-+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-+ | --da=*)
- datadir=$ac_optarg ;;
-
-- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-- | --dataroo | --dataro | --datar)
-- ac_prev=datarootdir ;;
-- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-- datarootdir=$ac_optarg ;;
--
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-- eval enable_$ac_feature=no ;;
--
-- -docdir | --docdir | --docdi | --doc | --do)
-- ac_prev=docdir ;;
-- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-- docdir=$ac_optarg ;;
--
-- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-- ac_prev=dvidir ;;
-- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-- dvidir=$ac_optarg ;;
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ eval "enable_$ac_feature=no" ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
-- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-- eval enable_$ac_feature=\$ac_optarg ;;
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) ac_optarg=yes ;;
-+ esac
-+ eval "enable_$ac_feature='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -918,12 +438,6 @@
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
-- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-- ac_prev=htmldir ;;
-- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-- | --ht=*)
-- htmldir=$ac_optarg ;;
--
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -948,16 +462,13 @@
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
-- -localedir | --localedir | --localedi | --localed | --locale)
-- ac_prev=localedir ;;
-- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-- localedir=$ac_optarg ;;
--
- -localstatedir | --localstatedir | --localstatedi | --localstated \
-- | --localstate | --localstat | --localsta | --localst | --locals)
-+ | --localstate | --localstat | --localsta | --localst \
-+ | --locals | --local | --loca | --loc | --lo)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -1022,16 +533,6 @@
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
-- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-- ac_prev=pdfdir ;;
-- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-- pdfdir=$ac_optarg ;;
--
-- -psdir | --psdir | --psdi | --psd | --ps)
-- ac_prev=psdir ;;
-- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-- psdir=$ac_optarg ;;
--
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -1084,20 +585,24 @@
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-- eval with_$ac_package=\$ac_optarg ;;
-+ ac_package=`echo $ac_package| sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) ac_optarg=yes ;;
-+ esac
-+ eval "with_$ac_package='$ac_optarg'" ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
-- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-- eval with_$ac_package=no ;;
-+ ac_package=`echo $ac_package | sed 's/-/_/g'`
-+ eval "with_$ac_package=no" ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -1128,7 +633,8 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- eval $ac_envvar=\$ac_optarg
-+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-+ eval "$ac_envvar='$ac_optarg'"
- export $ac_envvar ;;
-
- *)
-@@ -1148,19 +654,27 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute directory names.
--for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-- datadir sysconfdir sharedstatedir localstatedir includedir \
-- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-- libdir localedir mandir
-+# Be sure to have absolute paths.
-+for ac_var in exec_prefix prefix
- do
-- eval ac_val=\$$ac_var
-+ eval ac_val=$`echo $ac_var`
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) continue;;
-- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-+
-+# Be sure to have absolute paths.
-+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-+ localstatedir libdir includedir oldincludedir infodir mandir
-+do
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
- esac
-- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1187,76 +701,74 @@
- test "$silent" = yes && exec 6>/dev/null
-
-
--ac_pwd=`pwd` && test -n "$ac_pwd" &&
--ac_ls_di=`ls -di .` &&
--ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-- { echo "$as_me: error: Working directory cannot be determined" >&2
-- { (exit 1); exit 1; }; }
--test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-- { echo "$as_me: error: pwd does not report name of working directory" >&2
-- { (exit 1); exit 1; }; }
--
--
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
-- # Try the directory containing this script, then the parent directory.
-- ac_confdir=`$as_dirname -- "$0" ||
-+ # Try the directory containing this script, then its parent.
-+ ac_confdir=`(dirname "$0") 2>/dev/null ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)[^/].*/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
- srcdir=$ac_confdir
-- if test ! -r "$srcdir/$ac_unique_file"; then
-+ if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r "$srcdir/$ac_unique_file"; then
-- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+if test ! -r $srcdir/$ac_unique_file; then
-+ if test "$ac_srcdir_defaulted" = yes; then
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
--fi
--ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
--ac_abs_confdir=`(
-- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ else
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
-- pwd)`
--# When building in place, set srcdir=.
--if test "$ac_abs_confdir" = "$ac_pwd"; then
-- srcdir=.
--fi
--# Remove unnecessary trailing slashes from srcdir.
--# Double slashes in file names in object file debugging info
--# mess up M-x gdb in Emacs.
--case $srcdir in
--*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
--esac
--for ac_var in $ac_precious_vars; do
-- eval ac_env_${ac_var}_set=\${${ac_var}+set}
-- eval ac_env_${ac_var}_value=\$${ac_var}
-- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-- eval ac_cv_env_${ac_var}_value=\$${ac_var}
--done
-+ fi
-+fi
-+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ { (exit 1); exit 1; }; }
-+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-+ac_env_build_alias_set=${build_alias+set}
-+ac_env_build_alias_value=$build_alias
-+ac_cv_env_build_alias_set=${build_alias+set}
-+ac_cv_env_build_alias_value=$build_alias
-+ac_env_host_alias_set=${host_alias+set}
-+ac_env_host_alias_value=$host_alias
-+ac_cv_env_host_alias_set=${host_alias+set}
-+ac_cv_env_host_alias_value=$host_alias
-+ac_env_target_alias_set=${target_alias+set}
-+ac_env_target_alias_value=$target_alias
-+ac_cv_env_target_alias_set=${target_alias+set}
-+ac_cv_env_target_alias_value=$target_alias
-+ac_env_CC_set=${CC+set}
-+ac_env_CC_value=$CC
-+ac_cv_env_CC_set=${CC+set}
-+ac_cv_env_CC_value=$CC
-+ac_env_CFLAGS_set=${CFLAGS+set}
-+ac_env_CFLAGS_value=$CFLAGS
-+ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+ac_cv_env_CFLAGS_value=$CFLAGS
-+ac_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_env_LDFLAGS_value=$LDFLAGS
-+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_cv_env_LDFLAGS_value=$LDFLAGS
-+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_env_CPPFLAGS_value=$CPPFLAGS
-+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-+ac_env_CPP_set=${CPP+set}
-+ac_env_CPP_value=$CPP
-+ac_cv_env_CPP_set=${CPP+set}
-+ac_cv_env_CPP_value=$CPP
-
- #
- # Report the --help message.
-@@ -1285,6 +797,9 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
-+_ACEOF
-+
-+ cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
-@@ -1302,22 +817,15 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-- --infodir=DIR info documentation [DATAROOTDIR/info]
-- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-- --mandir=DIR man documentation [DATAROOTDIR/man]
-- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
-- --htmldir=DIR html documentation [DOCDIR]
-- --dvidir=DIR dvi documentation [DOCDIR]
-- --pdfdir=DIR pdf documentation [DOCDIR]
-- --psdir=DIR ps documentation [DOCDIR]
-+ --infodir=DIR info documentation [PREFIX/info]
-+ --mandir=DIR man documentation [PREFIX/man]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -1378,100 +886,126 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- LIBS libraries to pass to the linker, e.g. -l<library>
-- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-- you have headers in a nonstandard directory <include dir>
-+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-+ headers in a nonstandard directory <include dir>
- CPP C preprocessor
-- YACC The `Yet Another C Compiler' implementation to use. Defaults to
-- the first program found out of: `bison -y', `byacc', `yacc'.
-- YFLAGS The list of arguments that will be passed by default to $YACC.
-- This script will default YFLAGS to the empty string to avoid a
-- default value of `-d' given by some make applications.
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
--ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-+ ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d "$ac_dir" || continue
-+ test -d $ac_dir || continue
- ac_builddir=.
-
--case "$ac_dir" in
--.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
--*)
-+if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-- case $ac_top_builddir_sub in
-- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-- esac ;;
--esac
--ac_abs_top_builddir=$ac_pwd
--ac_abs_builddir=$ac_pwd$ac_dir_suffix
--# for backward compatibility:
--ac_top_builddir=$ac_top_build_prefix
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-
- case $srcdir in
-- .) # We are building in place.
-+ .) # No --srcdir option. We are building in place.
- ac_srcdir=.
-- ac_top_srcdir=$ac_top_builddir_sub
-- ac_abs_top_srcdir=$ac_pwd ;;
-- [\\/]* | ?:[\\/]* ) # Absolute name.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir
-- ac_abs_top_srcdir=$srcdir ;;
-- *) # Relative name.
-- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_build_prefix$srcdir
-- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
- esac
--ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-- cd "$ac_dir" || { ac_status=$?; continue; }
-- # Check for guested configure.
-- if test -f "$ac_srcdir/configure.gnu"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-- elif test -f "$ac_srcdir/configure"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure" --help=recursive
-+ cd $ac_dir
-+ # Check for guested configure; otherwise get Cygnus style configure.
-+ if test -f $ac_srcdir/configure.gnu; then
-+ echo
-+ $SHELL $ac_srcdir/configure.gnu --help=recursive
-+ elif test -f $ac_srcdir/configure; then
-+ echo
-+ $SHELL $ac_srcdir/configure --help=recursive
-+ elif test -f $ac_srcdir/configure.ac ||
-+ test -f $ac_srcdir/configure.in; then
-+ echo
-+ $ac_configure --help
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi || ac_status=$?
-- cd "$ac_pwd" || { ac_status=$?; break; }
-+ fi
-+ cd "$ac_popdir"
- done
- fi
-
--test -n "$ac_init_help" && exit $ac_status
-+test -n "$ac_init_help" && exit 0
- if $ac_init_version; then
- cat <<\_ACEOF
--configure
--generated by GNU Autoconf 2.61
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-- exit
-+ exit 0
- fi
--cat >config.log <<_ACEOF
-+exec 5>config.log
-+cat >&5 <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.61. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
--exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1490,7 +1024,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
- /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
- /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
- /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1504,7 +1038,6 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
--IFS=$as_save_IFS
-
- } >&5
-
-@@ -1526,6 +1059,7 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
-+ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1536,7 +1070,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *\'*)
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1558,7 +1092,9 @@
- -* ) ac_must_keep_next=true ;;
- esac
- fi
-- ac_configure_args="$ac_configure_args '$ac_arg'"
-+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+ # Get rid of the leading space.
-+ ac_sep=" "
- ;;
- esac
- done
-@@ -1569,8 +1105,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Use '\'' to represent an apostrophe within the trap.
--# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+# WARNING: Be sure not to use single quotes in there, as some shells,
-+# such as our DU 5.0 friend, will then `close' the trap.
- trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
-@@ -1583,34 +1119,20 @@
- _ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
--(
-- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-- eval ac_val=\$$ac_var
-- case $ac_val in #(
-- *${as_nl}*)
-- case $ac_var in #(
-- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-- esac
-- case $ac_var in #(
-- _ | IFS | as_nl) ;; #(
-- *) $as_unset $ac_var ;;
-- esac ;;
-- esac
-- done
-+{
- (set) 2>&1 |
-- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-- *${as_nl}ac_space=\ *)
-+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
- sed -n \
-- "s/'\''/'\''\\\\'\'''\''/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-- ;; #(
-+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+ ;;
- *)
-- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
-- esac |
-- sort
--)
-+ esac;
-+}
- echo
-
- cat <<\_ASBOX
-@@ -1621,28 +1143,22 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=\$$ac_var
-- case $ac_val in
-- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-- esac
-- echo "$ac_var='\''$ac_val'\''"
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------------- ##
--## File substitutions. ##
--## ------------------- ##
-+## ------------- ##
-+## Output files. ##
-+## ------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=\$$ac_var
-- case $ac_val in
-- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-- esac
-- echo "$ac_var='\''$ac_val'\''"
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
- done | sort
- echo
- fi
-@@ -1654,24 +1170,26 @@
- ## ----------- ##
- _ASBOX
- echo
-- cat confdefs.h
-+ sed "/^$/d" confdefs.h | sort
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core *.core core.conftest.* &&
-- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core &&
-+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
--' 0
-+ ' 0
- for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -f -r conftest* confdefs.h
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo >confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1702,17 +1220,14 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -n "$CONFIG_SITE"; then
-- set x "$CONFIG_SITE"
--elif test "x$prefix" != xNONE; then
-- set x "$prefix/share/config.site" "$prefix/etc/config.site"
--else
-- set x "$ac_default_prefix/share/config.site" \
-- "$ac_default_prefix/etc/config.site"
-+if test -z "$CONFIG_SITE"; then
-+ if test "x$prefix" != xNONE; then
-+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+ else
-+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+ fi
- fi
--shift
--for ac_site_file
--do
-+for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1728,8 +1243,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . "$cache_file";;
-- *) . "./$cache_file";;
-+ [\\/]* | ?:[\\/]* ) . $cache_file;;
-+ *) . ./$cache_file;;
- esac
- fi
- else
-@@ -1741,11 +1256,12 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in $ac_precious_vars; do
-+for ac_var in `(set) 2>&1 |
-+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
-- eval ac_old_val=\$ac_cv_env_${ac_var}_value
-- eval ac_new_val=\$ac_env_${ac_var}_value
-+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-+ eval ac_new_val="\$ac_env_${ac_var}_value"
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1770,7 +1286,8 @@
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1787,6 +1304,12 @@
- { (exit 1); exit 1; }; }
- fi
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-
-
-
-@@ -1803,11 +1326,6 @@
-
-
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-@@ -1827,9 +1345,10 @@
-
-
-
--# Check whether --with-gcc was given.
-+# Check whether --with-gcc or --without-gcc was given.
- if test "${with_gcc+set}" = set; then
-- withval=$with_gcc;
-+ withval="$with_gcc"
-+
- case $withval in
- no) : ${CC=cc}
- ;;
-@@ -1838,8 +1357,7 @@
- *) CC=$withval
- ;;
- esac
--fi
--
-+fi;
- if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
- then
- { { echo "$as_me:$LINENO: error: cached CC is different -- throw away $cache_file
-@@ -1853,154 +1371,104 @@
- program_prefix=
- fi
- ac_aux_dir=
--for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-- if test -f "$ac_dir/install-sh"; then
-+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-+ if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f "$ac_dir/install.sh"; then
-+ elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f "$ac_dir/shtool"; then
-+ elif test -f $ac_dir/shtool; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
- { (exit 1); exit 1; }; }
- fi
--
--# These three variables are undocumented and unsupported,
--# and are intended to be withdrawn in a future Autoconf release.
--# They can cause serious problems if a builder's source tree is in a directory
--# whose full name contains unusual characters.
--ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
--ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
--ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
--
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
- # Make sure we can run config.sub.
--$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
--echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+$ac_config_sub sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
- { (exit 1); exit 1; }; }
-
--{ echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_build_alias=$build_alias
--test "x$ac_build_alias" = x &&
-- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
--test "x$ac_build_alias" = x &&
-+ ac_cv_build_alias=$build_alias
-+test -z "$ac_cv_build_alias" &&
-+ ac_cv_build_alias=`$ac_config_guess`
-+test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
--echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6; }
--case $ac_cv_build in
--*-*-*) ;;
--*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
--echo "$as_me: error: invalid value of canonical build" >&2;}
-- { (exit 1); exit 1; }; };;
--esac
-+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
--ac_save_IFS=$IFS; IFS='-'
--set x $ac_cv_build
--shift
--build_cpu=$1
--build_vendor=$2
--shift; shift
--# Remember, the first character of IFS is used to create $*,
--# except with old shells:
--build_os=$*
--IFS=$ac_save_IFS
--case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
--{ echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test "x$host_alias" = x; then
-- ac_cv_host=$ac_cv_build
--else
-- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
--echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+ ac_cv_host_alias=$host_alias
-+test -z "$ac_cv_host_alias" &&
-+ ac_cv_host_alias=$ac_cv_build_alias
-+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
--fi
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6; }
--case $ac_cv_host in
--*-*-*) ;;
--*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
--echo "$as_me: error: invalid value of canonical host" >&2;}
-- { (exit 1); exit 1; }; };;
--esac
-+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
--ac_save_IFS=$IFS; IFS='-'
--set x $ac_cv_host
--shift
--host_cpu=$1
--host_vendor=$2
--shift; shift
--# Remember, the first character of IFS is used to create $*,
--# except with old shells:
--host_os=$*
--IFS=$ac_save_IFS
--case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
--{ echo "$as_me:$LINENO: checking target system type" >&5
--echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6
- if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test "x$target_alias" = x; then
-- ac_cv_target=$ac_cv_host
--else
-- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
--echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-+ ac_cv_target_alias=$target_alias
-+test "x$ac_cv_target_alias" = "x" &&
-+ ac_cv_target_alias=$ac_cv_host_alias
-+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
--fi
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
--echo "${ECHO_T}$ac_cv_target" >&6; }
--case $ac_cv_target in
--*-*-*) ;;
--*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
--echo "$as_me: error: invalid value of canonical target" >&2;}
-- { (exit 1); exit 1; }; };;
--esac
-+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6
- target=$ac_cv_target
--ac_save_IFS=$IFS; IFS='-'
--set x $ac_cv_target
--shift
--target_cpu=$1
--target_vendor=$2
--shift; shift
--# Remember, the first character of IFS is used to create $*,
--# except with old shells:
--target_os=$*
--IFS=$ac_save_IFS
--case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
- # The aliases save the names the user supplied, while $host etc.
-@@ -2012,17 +1480,17 @@
- target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
- ac_install_sh='' # unusable for extension libraries.
-
--# Check whether --enable-fat-binary was given.
-+# Check whether --enable-fat-binary or --disable-fat-binary was given.
- if test "${enable_fat_binary+set}" = set; then
-- enableval=$enable_fat_binary; fat_binary=$enableval
-+ enableval="$enable_fat_binary"
-+ fat_binary=$enableval
- else
- fat_binary=no
--fi
--
-+fi;
- if test "$fat_binary" != no; then
-
-- { echo "$as_me:$LINENO: checking target architectures" >&5
--echo $ECHO_N "checking target architectures... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking target architectures" >&5
-+echo $ECHO_N "checking target architectures... $ECHO_C" >&6
-
- # Respect TARGET_ARCHS setting from environment if available.
- if test -z "$TARGET_ARCHS"; then
-@@ -2050,8 +1518,8 @@
- fi
- fi
-
-- { echo "$as_me:$LINENO: result: $TARGET_ARCHS" >&5
--echo "${ECHO_T}$TARGET_ARCHS" >&6; }
-+ echo "$as_me:$LINENO: result: $TARGET_ARCHS" >&5
-+echo "${ECHO_T}$TARGET_ARCHS" >&6
-
- # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
- ARCH_FLAG=
-@@ -2069,11 +1537,11 @@
- i?86) frame_address=yes;;
- *) frame_address=no;;
- esac
--# Check whether --enable-frame-address was given.
-+# Check whether --enable-frame-address or --disable-frame-address was given.
- if test "${enable_frame_address+set}" = set; then
-- enableval=$enable_frame_address; frame_address=$enableval
--fi
--
-+ enableval="$enable_frame_address"
-+ frame_address=$enableval
-+fi;
- if test $frame_address = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define USE_BUILTIN_FRAME_ADDRESS 1
-@@ -2082,17 +1550,17 @@
- fi
-
- test "$program_prefix" != NONE &&
-- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
-- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
- # Double any \ or $. echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm -f conftest.sed
-+rm conftest.sed
-
-
-
-@@ -2100,8 +1568,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2114,34 +1582,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2154,41 +1620,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_CC" = x; then
-- CC=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- CC=$ac_ct_CC
-- fi
-+ CC=$ac_ct_CC
- else
- CC="$ac_cv_prog_CC"
- fi
-@@ -2202,8 +1653,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2216,34 +1667,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2256,51 +1705,36 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_CC" = x; then
-- CC=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- CC=$ac_ct_CC
-- fi
-+ CC=$ac_ct_CC
- else
- CC="$ac_cv_prog_CC"
- fi
-
- if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2313,34 +1747,74 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
- fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
- fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2354,7 +1828,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -2365,7 +1839,6 @@
- fi
- done
- done
--IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -2383,23 +1856,22 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl.exe
-+ for ac_prog in cl
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2412,38 +1884,36 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl.exe
-+ for ac_prog in cl
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2456,45 +1926,29 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- test -n "$ac_ct_CC" && break
- done
-
-- if test "x$ac_ct_CC" = x; then
-- CC=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- CC=$ac_ct_CC
-- fi
-+ CC=$ac_ct_CC
- fi
-
- fi
-@@ -2507,35 +1961,21 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
-+echo "$as_me:$LINENO:" \
-+ "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compiler --version >&5") 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+ (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+ (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compiler -V >&5") 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+ (eval $ac_compiler -V </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -2560,77 +2000,47 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--#
--# List of possible output files, starting from the most likely.
--# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
--# only as a last resort. b.out is created by i960 compilers.
--ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
--#
--# The IRIX 6 linker writes into existing files which may not be
--# executable, retaining their permissions. Remove them first so a
--# subsequent execution test works.
--ac_rmfiles=
--for ac_file in $ac_files
--do
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-- esac
--done
--rm -f $ac_rmfiles
--
--if { (ac_try="$ac_link_default"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link_default") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-+ (eval $ac_link_default) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
--# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
--# in a Makefile. We should not override ac_cv_exeext if it was cached,
--# so that the user can short-circuit this test for compilers unknown to
--# Autoconf.
--for ac_file in $ac_files ''
-+ # Find the output, starting from the most likely. This scheme is
-+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+# resort.
-+
-+# Be careful to initialize this variable, since it used to be cached.
-+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-+ac_cv_exeext=
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
-- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-- then :; else
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- fi
-- # We set ac_cv_exeext here because the later test for it is not
-- # safe: cross compilers may not add the suffix if given an `-o'
-- # argument, so we may need to know it at that point already.
-- # Even if this section looks crufty: it has the advantage of
-- # actually working.
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
-+ export ac_cv_exeext
- break;;
- * )
- break;;
- esac
- done
--test "$ac_cv_exeext" = no && ac_cv_exeext=
--
- else
-- ac_file=''
--fi
--
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
--if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -2642,21 +2052,19 @@
- fi
-
- ac_exeext=$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6
-
--# Check that the compiler produces executables we can run. If not, either
-+# Check the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -2675,27 +2083,22 @@
- fi
- fi
- fi
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
-+# Check the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
--{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6; }
--
--{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6
-+
-+echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -2706,8 +2109,9 @@
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -2721,14 +2125,14 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2748,20 +2152,14 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in conftest.o conftest.obj conftest.*; do
-- test -f "$ac_file" || continue;
-+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -2779,12 +2177,12 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2807,49 +2205,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_compiler_gnu=no
-+ac_compiler_gnu=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+CFLAGS="-g"
-+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_c_werror_flag=$ac_c_werror_flag
-- ac_c_werror_flag=yes
-- ac_cv_prog_cc_g=no
-- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2865,118 +2263,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cc_g=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- CFLAGS=""
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_c_werror_flag=$ac_save_c_werror_flag
-- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_prog_cc_g=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- ac_c_werror_flag=$ac_save_c_werror_flag
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2992,12 +2309,12 @@
- CFLAGS=
- fi
- fi
--{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_c89=no
-+ ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3031,17 +2348,12 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std is added to get
-+ as 'x'. The following induces an error, until -std1 is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
-- that's true only with -std. */
-+ that's true only with -std1. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
--/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-- inside strings and character constants. */
--#define FOO(x) 'x'
--int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
--
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -3056,92 +2368,236 @@
- return 0;
- }
- _ACEOF
--for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cc_c89=$ac_arg
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_stdc=$ac_arg
-+break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext
-- test "x$ac_cv_prog_cc_c89" != "xno" && break
-+rm -f conftest.err conftest.$ac_objext
- done
--rm -f conftest.$ac_ext
-+rm -f conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
-
- fi
--# AC_CACHE_VAL
--case "x$ac_cv_prog_cc_c89" in
-- x)
-- { echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6; } ;;
-- xno)
-- { echo "$as_me:$LINENO: result: unsupported" >&5
--echo "${ECHO_T}unsupported" >&6; } ;;
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
- *)
-- CC="$CC $ac_cv_prog_cc_c89"
-- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+ CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
-
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
-- CPP=
--fi
--if test -z "$CPP"; then
-- if test "${ac_cv_prog_CPP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # Double quotes because CPP needs to be expanded
-- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-- do
-- ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
--do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- # <limits.h> exists even on freestanding compilers.
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp. "Syntax error" is here to catch this case.
-- cat >conftest.$ac_ext <<_ACEOF
-+# Some people use a C++ compiler to compile C. Since we use `exit',
-+# in C++ we need to declare it. In case someone uses the same compiler
-+# for both compiling C and C++ we need to have the C++ compiler decide
-+# the declaration of exit, since it's the most demanding environment.
-+cat >conftest.$ac_ext <<_ACEOF
-+#ifndef __cplusplus
-+ choke me
-+#endif
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ for ac_declaration in \
-+ '' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3154,22 +2610,24 @@
- #endif
- Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3178,10 +2636,9 @@
- # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether nonexistent headers
-+ # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3191,22 +2648,24 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
- continue
- else
-@@ -3217,7 +2676,6 @@
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3235,8 +2693,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--{ echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6; }
-+echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -3259,22 +2717,24 @@
- #endif
- Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- :
- else
- echo "$as_me: failed program was:" >&5
-@@ -3283,10 +2743,9 @@
- # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether nonexistent headers
-+ # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3296,22 +2755,24 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
- continue
- else
-@@ -3322,7 +2783,6 @@
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -3345,171 +2805,24 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
--echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # Extract the first word of "grep ggrep" to use in msg output
--if test -z "$GREP"; then
--set dummy grep ggrep; ac_prog_name=$2
--if test "${ac_cv_path_GREP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_path_GREP_found=false
--# Loop through the user's path and test for each of PROGNAME-LIST
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_prog in grep ggrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-- # Check for GNU ac_path_GREP and select it if it is found.
-- # Check for GNU $ac_path_GREP
--case `"$ac_path_GREP" --version 2>&1` in
--*GNU*)
-- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
--*)
-- ac_count=0
-- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-- while :
-- do
-- cat "conftest.in" "conftest.in" >"conftest.tmp"
-- mv "conftest.tmp" "conftest.in"
-- cp "conftest.in" "conftest.nl"
-- echo 'GREP' >> "conftest.nl"
-- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-- ac_count=`expr $ac_count + 1`
-- if test $ac_count -gt ${ac_path_GREP_max-0}; then
-- # Best one so far, save it but keep looking for a better one
-- ac_cv_path_GREP="$ac_path_GREP"
-- ac_path_GREP_max=$ac_count
-- fi
-- # 10*(2^10) chars as input seems more than enough
-- test $ac_count -gt 10 && break
-- done
-- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--
-- $ac_path_GREP_found && break 3
-- done
--done
--
--done
--IFS=$as_save_IFS
--
--
--fi
--
--GREP="$ac_cv_path_GREP"
--if test -z "$GREP"; then
-- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--else
-- ac_cv_path_GREP=$GREP
--fi
--
--
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
--echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-- GREP="$ac_cv_path_GREP"
--
--
--{ echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-- then ac_cv_path_EGREP="$GREP -E"
-- else
-- # Extract the first word of "egrep" to use in msg output
--if test -z "$EGREP"; then
--set dummy egrep; ac_prog_name=$2
--if test "${ac_cv_path_EGREP+set}" = set; then
-+echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+if test "${ac_cv_prog_egrep+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_path_EGREP_found=false
--# Loop through the user's path and test for each of PROGNAME-LIST
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_prog in egrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-- # Check for GNU ac_path_EGREP and select it if it is found.
-- # Check for GNU $ac_path_EGREP
--case `"$ac_path_EGREP" --version 2>&1` in
--*GNU*)
-- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
--*)
-- ac_count=0
-- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-- while :
-- do
-- cat "conftest.in" "conftest.in" >"conftest.tmp"
-- mv "conftest.tmp" "conftest.in"
-- cp "conftest.in" "conftest.nl"
-- echo 'EGREP' >> "conftest.nl"
-- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-- ac_count=`expr $ac_count + 1`
-- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-- # Best one so far, save it but keep looking for a better one
-- ac_cv_path_EGREP="$ac_path_EGREP"
-- ac_path_EGREP_max=$ac_count
-+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+ then ac_cv_prog_egrep='grep -E'
-+ else ac_cv_prog_egrep='egrep'
- fi
-- # 10*(2^10) chars as input seems more than enough
-- test $ac_count -gt 10 && break
-- done
-- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--
-- $ac_path_EGREP_found && break 3
-- done
--done
--
--done
--IFS=$as_save_IFS
--
--
--fi
--
--EGREP="$ac_cv_path_EGREP"
--if test -z "$EGREP"; then
-- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-- { (exit 1); exit 1; }; }
- fi
--
--else
-- ac_cv_path_EGREP=$EGREP
--fi
--
--
-- fi
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
--echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-- EGREP="$ac_cv_path_EGREP"
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
-
-
- if test $ac_cv_c_compiler_gnu = yes; then
-- { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
--echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3550,16 +2863,21 @@
-
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
--echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
- if test $ac_cv_prog_gcc_traditional = yes; then
- CC="$CC -traditional"
- fi
- fi
-
-+if test "$GCC" = yes; then
-+ linker_flag=-Wl,
-+else
-+ linker_flag=
-+fi
-
--{ echo "$as_me:$LINENO: checking whether the linker is GNU ld" >&5
--echo $ECHO_N "checking whether the linker is GNU ld... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether the linker is GNU ld" >&5
-+echo $ECHO_N "checking whether the linker is GNU ld... $ECHO_C" >&6
- if test "${rb_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3570,12 +2888,12 @@
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$rb_cv_prog_gnu_ld" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$rb_cv_prog_gnu_ld" >&6
- GNU_LD=$rb_cv_prog_gnu_ld
-
--{ echo "$as_me:$LINENO: checking whether ${CPP} accepts -o" >&5
--echo $ECHO_N "checking whether ${CPP} accepts -o... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether ${CPP} accepts -o" >&5
-+echo $ECHO_N "checking whether ${CPP} accepts -o... $ECHO_C" >&6
- if test "${rb_cv_cppoutfile+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3589,22 +2907,24 @@
- /* end confdefs.h. */
-
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- rb_cv_cppoutfile=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3612,13 +2932,12 @@
-
- rb_cv_cppoutfile=no
- fi
--
- rm -f conftest.err conftest.$ac_ext
- CPPFLAGS=$cppflags
- rm -f conftest*
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_cppoutfile" >&5
--echo "${ECHO_T}$rb_cv_cppoutfile" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_cppoutfile" >&5
-+echo "${ECHO_T}$rb_cv_cppoutfile" >&6
- if test "$rb_cv_cppoutfile" = yes; then
- CPPOUTFILE='-o conftest.i'
- elif test "$rb_cv_cppoutfile" = no; then
-@@ -3633,8 +2952,8 @@
-
- case "$host_os" in
- cygwin*)
--{ echo "$as_me:$LINENO: checking for mingw32 environment" >&5
--echo $ECHO_N "checking for mingw32 environment... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for mingw32 environment" >&5
-+echo $ECHO_N "checking for mingw32 environment... $ECHO_C" >&6
- if test "${rb_cv_mingw32+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3650,22 +2969,24 @@
- #endif
-
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- rb_cv_mingw32=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -3673,12 +2994,11 @@
-
- rb_cv_mingw32=no
- fi
--
- rm -f conftest.err conftest.$ac_ext
- rm -f conftest*
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_mingw32" >&5
--echo "${ECHO_T}$rb_cv_mingw32" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_mingw32" >&5
-+echo "${ECHO_T}$rb_cv_mingw32" >&6
- test "$rb_cv_mingw32" = yes && target_os="mingw32"
- ;;
- esac
-@@ -3687,8 +3007,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_YACC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3701,27 +3021,25 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_YACC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; then
-- { echo "$as_me:$LINENO: result: $YACC" >&5
--echo "${ECHO_T}$YACC" >&6; }
-+ echo "$as_me:$LINENO: result: $YACC" >&5
-+echo "${ECHO_T}$YACC" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- test -n "$YACC" && break
- done
- test -n "$YACC" || YACC="yacc"
-@@ -3736,8 +3054,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3750,34 +3068,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- { echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6; }
-+ echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3790,41 +3106,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
-+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_RANLIB" = x; then
-- RANLIB=":"
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- RANLIB=$ac_ct_RANLIB
-- fi
-+ RANLIB=$ac_ct_RANLIB
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -3832,8 +3134,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3846,34 +3148,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- { echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6; }
-+ echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3886,41 +3186,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_AR" = x; then
-- AR=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- AR=$ac_ct_AR
-- fi
-+ AR=$ac_ct_AR
- else
- AR="$ac_cv_prog_AR"
- fi
-@@ -3930,8 +3215,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3944,27 +3229,25 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AR="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
-- { echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6; }
-+ echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- test -n "$AR" && break
- done
- test -n "$AR" || AR="ar"
-@@ -3974,8 +3257,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3988,34 +3271,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; then
-- { echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6; }
-+ echo "$as_me:$LINENO: result: $AS" >&5
-+echo "${ECHO_T}$AS" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
- set dummy as; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4028,41 +3309,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_AS" = x; then
-- AS=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- AS=$ac_ct_AS
-- fi
-+ AS=$ac_ct_AS
- else
- AS="$ac_cv_prog_AS"
- fi
-@@ -4075,8 +3341,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nm; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4089,34 +3355,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_NM="${ac_tool_prefix}nm"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- NM=$ac_cv_prog_NM
- if test -n "$NM"; then
-- { echo "$as_me:$LINENO: result: $NM" >&5
--echo "${ECHO_T}$NM" >&6; }
-+ echo "$as_me:$LINENO: result: $NM" >&5
-+echo "${ECHO_T}$NM" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_NM"; then
- ac_ct_NM=$NM
- # Extract the first word of "nm", so it can be a program name with args.
- set dummy nm; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4129,41 +3393,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_NM="nm"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_NM=$ac_cv_prog_ac_ct_NM
- if test -n "$ac_ct_NM"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
--echo "${ECHO_T}$ac_ct_NM" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
-+echo "${ECHO_T}$ac_ct_NM" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_NM" = x; then
-- NM=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- NM=$ac_ct_NM
-- fi
-+ NM=$ac_ct_NM
- else
- NM="$ac_cv_prog_NM"
- fi
-@@ -4171,8 +3420,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
- set dummy ${ac_tool_prefix}windres; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4185,34 +3434,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- WINDRES=$ac_cv_prog_WINDRES
- if test -n "$WINDRES"; then
-- { echo "$as_me:$LINENO: result: $WINDRES" >&5
--echo "${ECHO_T}$WINDRES" >&6; }
-+ echo "$as_me:$LINENO: result: $WINDRES" >&5
-+echo "${ECHO_T}$WINDRES" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_WINDRES"; then
- ac_ct_WINDRES=$WINDRES
- # Extract the first word of "windres", so it can be a program name with args.
- set dummy windres; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4225,41 +3472,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_WINDRES="windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
- if test -n "$ac_ct_WINDRES"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
--echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-+echo "${ECHO_T}$ac_ct_WINDRES" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_WINDRES" = x; then
-- WINDRES=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- WINDRES=$ac_ct_WINDRES
-- fi
-+ WINDRES=$ac_ct_WINDRES
- else
- WINDRES="$ac_cv_prog_WINDRES"
- fi
-@@ -4267,8 +3499,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_DLLWRAP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4281,34 +3513,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- DLLWRAP=$ac_cv_prog_DLLWRAP
- if test -n "$DLLWRAP"; then
-- { echo "$as_me:$LINENO: result: $DLLWRAP" >&5
--echo "${ECHO_T}$DLLWRAP" >&6; }
-+ echo "$as_me:$LINENO: result: $DLLWRAP" >&5
-+echo "${ECHO_T}$DLLWRAP" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_DLLWRAP"; then
- ac_ct_DLLWRAP=$DLLWRAP
- # Extract the first word of "dllwrap", so it can be a program name with args.
- set dummy dllwrap; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4321,41 +3551,26 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
- if test -n "$ac_ct_DLLWRAP"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
--echo "${ECHO_T}$ac_ct_DLLWRAP" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
-+echo "${ECHO_T}$ac_ct_DLLWRAP" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_DLLWRAP" = x; then
-- DLLWRAP=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- DLLWRAP=$ac_ct_DLLWRAP
-- fi
-+ DLLWRAP=$ac_ct_DLLWRAP
- else
- DLLWRAP="$ac_cv_prog_DLLWRAP"
- fi
-@@ -4367,8 +3582,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4381,34 +3596,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
-- { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6; }
-+ echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
- set dummy objdump; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4421,47 +3634,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_OBJDUMP="objdump"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_OBJDUMP" = x; then
-- OBJDUMP=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- OBJDUMP=$ac_ct_OBJDUMP
-- fi
-+ OBJDUMP=$ac_ct_OBJDUMP
- else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
-
-- { echo "$as_me:$LINENO: checking for mingw32 runtime DLL" >&5
--echo $ECHO_N "checking for mingw32 runtime DLL... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for mingw32 runtime DLL" >&5
-+echo $ECHO_N "checking for mingw32 runtime DLL... $ECHO_C" >&6
- if test "${rb_cv_msvcrt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4482,23 +3680,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
- tr A-Z a-z |
- sed -n '/^[ ]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`
-@@ -4506,27 +3707,26 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_msvcrt=msvcrt
-+rb_cv_msvcrt=msvcrt
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_msvcrt" >&5
--echo "${ECHO_T}$rb_cv_msvcrt" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_msvcrt" >&5
-+echo "${ECHO_T}$rb_cv_msvcrt" >&6
-
--# Check whether --with-winsock2 was given.
-+# Check whether --with-winsock2 or --without-winsock2 was given.
- if test "${with_winsock2+set}" = set; then
-- withval=$with_winsock2;
-+ withval="$with_winsock2"
-+
- case $withval in
- yes) with_winsock2=yes;;
- *) with_winsock2=no;;
- esac
- else
- with_winsock2=no
--fi
--
-+fi;
- if test "$with_winsock2" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define USE_WINSOCK2 1
-@@ -4540,8 +3740,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nm; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4555,34 +3755,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_NM="${ac_tool_prefix}nm"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- fi
- fi
- NM=$ac_cv_prog_NM
- if test -n "$NM"; then
-- { echo "$as_me:$LINENO: result: $NM" >&5
--echo "${ECHO_T}$NM" >&6; }
-+ echo "$as_me:$LINENO: result: $NM" >&5
-+echo "${ECHO_T}$NM" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- fi
- if test -z "$ac_cv_prog_NM"; then
- ac_ct_NM=$NM
- # Extract the first word of "nm", so it can be a program name with args.
- set dummy nm; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4596,41 +3794,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_NM="nm"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
-+ test -z "$ac_cv_prog_ac_ct_NM" && ac_cv_prog_ac_ct_NM="/usr/ccs/bin/nm"
- fi
- fi
- ac_ct_NM=$ac_cv_prog_ac_ct_NM
- if test -n "$ac_ct_NM"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
--echo "${ECHO_T}$ac_ct_NM" >&6; }
-+ echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
-+echo "${ECHO_T}$ac_ct_NM" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test "x$ac_ct_NM" = x; then
-- NM="/usr/ccs/bin/nm"
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- NM=$ac_ct_NM
-- fi
-+ NM=$ac_ct_NM
- else
- NM="$ac_cv_prog_NM"
- fi
-@@ -4645,44 +3829,43 @@
- ;;
- esac
-
--{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- else
-- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6; }
-+ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6
- fi
-
--{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
--set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
--SHELL = /bin/sh
- all:
-- @echo '@@@%%%=$(MAKE)=@@@%%%'
-+ @echo 'ac_maketemp="$(MAKE)"'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--case `${MAKE-make} -f conftest.make 2>/dev/null` in
-- *@@@%%%=?*=@@@%%%*)
-- eval ac_cv_prog_make_${ac_make}_set=yes;;
-- *)
-- eval ac_cv_prog_make_${ac_make}_set=no;;
--esac
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-+if test -n "$ac_maketemp"; then
-+ eval ac_cv_prog_make_${ac_make}_set=yes
-+else
-+ eval ac_cv_prog_make_${ac_make}_set=no
-+fi
- rm -f conftest.make
- fi
--if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- SET_MAKE=
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -4699,8 +3882,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4722,7 +3905,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -4741,22 +3924,21 @@
- ;;
- esac
- done
--IFS=$as_save_IFS
-
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
-- # As a last resort, use the slow shell script. Don't cache a
-- # value for INSTALL within a source directory, because that will
-+ # As a last resort, use the slow shell script. We don't cache a
-+ # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
-- # removed, or if the value is a relative name.
-+ # removed, or if the path is relative.
- INSTALL=$ac_install_sh
- fi
- fi
--{ echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6; }
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -4769,8 +3951,8 @@
-
- # checks for UNIX variants that set C preprocessor variables
-
--{ echo "$as_me:$LINENO: checking for AIX" >&5
--echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for AIX" >&5
-+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4784,21 +3966,21 @@
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- cat >>confdefs.h <<\_ACEOF
- #define _ALL_SOURCE 1
- _ACEOF
-
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- rm -f conftest*
-
-
--{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4822,31 +4004,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_header_stdc=no
-+ac_cv_header_stdc=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4902,7 +4087,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
--#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4922,27 +4106,18 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- return 2;
-- return 0;
-+ exit(2);
-+ exit (0);
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4955,14 +4130,12 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -4985,9 +4158,9 @@
- inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5001,35 +4174,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_Header=no"
-+eval "$as_ac_Header=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -5041,17 +4216,17 @@
-
-
- if test "${ac_cv_header_minix_config_h+set}" = set; then
-- { echo "$as_me:$LINENO: checking for minix/config.h" >&5
--echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for minix/config.h" >&5
-+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
--echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
- else
- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
--echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-+echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5062,37 +4237,40 @@
- #include <minix/config.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_compiler=no
-+ac_header_compiler=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
--echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-+echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5101,22 +4279,24 @@
- /* end confdefs.h. */
- #include <minix/config.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -5124,10 +4304,9 @@
-
- ac_header_preproc=no
- fi
--
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5151,18 +4330,25 @@
- echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
--
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
--echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for minix/config.h" >&5
-+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_minix_config_h=$ac_header_preproc
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
--echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
-
- fi
- if test $ac_cv_header_minix_config_h = yes; then
-@@ -5203,15 +4389,15 @@
-
- fi
-
--# Check whether --enable-largefile was given.
-+# Check whether --enable-largefile or --disable-largefile was given.
- if test "${enable_largefile+set}" = set; then
-- enableval=$enable_largefile;
--fi
-+ enableval="$enable_largefile"
-
-+fi;
- if test "$enable_largefile" != no; then
-
-- { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
--echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5219,8 +4405,8 @@
- if test "$GCC" != yes; then
- ac_save_CC=$CC
- while :; do
-- # IRIX 6.2 and later do not support large files by default,
-- # so use the C compiler's -n32 option if that helps.
-+ # IRIX 6.2 and later do not support large files by default,
-+ # so use the C compiler's -n32 option if that helps.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5244,77 +4430,82 @@
- return 0;
- }
- _ACEOF
-- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext
-- CC="$CC -n32"
-- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+rm -f conftest.err conftest.$ac_objext
-+ CC="$CC -n32"
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_sys_largefile_CC=' -n32'; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext
-+rm -f conftest.err conftest.$ac_objext
- break
- done
- CC=$ac_save_CC
- rm -f conftest.$ac_ext
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
--echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC=$CC$ac_cv_sys_largefile_CC
- fi
-
-- { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
--echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-+ ac_cv_sys_file_offset_bits=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5339,31 +4530,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_sys_file_offset_bits=no; break
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5389,53 +4582,53 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_sys_file_offset_bits=64; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- ac_cv_sys_file_offset_bits=unknown
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- break
- done
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
--echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
--case $ac_cv_sys_file_offset_bits in #(
-- no | unknown) ;;
-- *)
-+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-+if test "$ac_cv_sys_file_offset_bits" != no; then
-+
- cat >>confdefs.h <<_ACEOF
- #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
- _ACEOF
--;;
--esac
-+
-+fi
- rm -f conftest*
-- if test $ac_cv_sys_file_offset_bits = unknown; then
-- { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
--echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-+ ac_cv_sys_large_files=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5460,31 +4653,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_sys_large_files=no; break
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5510,52 +4705,51 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_sys_large_files=1; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- ac_cv_sys_large_files=unknown
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- break
- done
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
--echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
--case $ac_cv_sys_large_files in #(
-- no | unknown) ;;
-- *)
-+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-+if test "$ac_cv_sys_large_files" != no; then
-+
- cat >>confdefs.h <<_ACEOF
- #define _LARGE_FILES $ac_cv_sys_large_files
- _ACEOF
--;;
--esac
-+
-+fi
- rm -f conftest*
-- fi
- fi
-
-
--{ echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5566,47 +4760,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef long long ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((long long *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (long long))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_long_long=no
-+ac_cv_type_long_long=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6
- if test $ac_cv_type_long_long = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -5615,8 +4811,8 @@
-
-
- fi
--{ echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5627,47 +4823,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((off_t *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (off_t))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_off_t=no
-+ac_cv_type_off_t=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6
- if test $ac_cv_type_off_t = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -5678,8 +4876,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6
- if test "${ac_cv_type_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5690,57 +4888,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef int ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((int *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (int))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_int=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_int=no
-+ac_cv_type_int=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6
- if test "${ac_cv_sizeof_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_int" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5750,11 +4951,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -5762,22 +4962,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5787,11 +4991,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -5799,53 +5002,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -5853,22 +5058,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5878,11 +5087,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -5890,48 +5098,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -5942,11 +5151,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -5954,45 +5162,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
--'') if test "$ac_cv_type_int" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+echo "$as_me: error: cannot compute sizeof (int), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_int=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6000,9 +5212,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef int ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (int)); }
-+unsigned long ulongval () { return (long) (sizeof (int)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -6011,44 +5222,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (int))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (int))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (int))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6059,32 +5261,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_int" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+echo "$as_me: error: cannot compute sizeof (int), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_int=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_int=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_INT $ac_cv_sizeof_int
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6
- if test "${ac_cv_type_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6095,57 +5294,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef short ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((short *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (short))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_short=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_short=no
-+ac_cv_type_short=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6
- if test "${ac_cv_sizeof_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_short" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6155,11 +5357,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -6167,22 +5368,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6192,11 +5397,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6204,53 +5408,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -6258,22 +5464,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6283,11 +5493,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6295,48 +5504,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -6347,11 +5557,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6359,45 +5568,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
--'') if test "$ac_cv_type_short" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short)
-+echo "$as_me: error: cannot compute sizeof (short), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_short=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6405,9 +5618,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef short ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (short)); }
-+unsigned long ulongval () { return (long) (sizeof (short)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -6416,44 +5628,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (short))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (short))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (short))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6464,32 +5667,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_short" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short)
-+echo "$as_me: error: cannot compute sizeof (short), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_short=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_short=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_SHORT $ac_cv_sizeof_short
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6
- if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6500,57 +5700,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef long ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((long *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (long))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_long=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_long=no
-+ac_cv_type_long=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6
- if test "${ac_cv_sizeof_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_long" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6560,11 +5763,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -6572,22 +5774,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6597,11 +5803,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6609,53 +5814,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -6663,22 +5870,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6688,11 +5899,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6700,48 +5910,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -6752,11 +5963,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -6764,45 +5974,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') if test "$ac_cv_type_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long)
-+echo "$as_me: error: cannot compute sizeof (long), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_long=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -6810,9 +6024,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (long)); }
-+unsigned long ulongval () { return (long) (sizeof (long)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -6821,44 +6034,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (long))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (long))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (long))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6869,32 +6073,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long)
-+echo "$as_me: error: cannot compute sizeof (long), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_long=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_long=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for long long" >&5
-+echo $ECHO_N "checking for long long... $ECHO_C" >&6
- if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6905,57 +6106,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef long long ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((long long *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (long long))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_long_long=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_long_long=no
-+ac_cv_type_long_long=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of long long" >&5
--echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of long long" >&5
-+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
- if test "${ac_cv_sizeof_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_long_long" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6965,11 +6169,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -6977,22 +6180,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7002,11 +6209,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7014,53 +6220,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -7068,22 +6276,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7093,11 +6305,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7105,48 +6316,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -7157,11 +6369,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7169,45 +6380,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long_long=$ac_lo;;
--'') if test "$ac_cv_type_long_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long)
-+echo "$as_me: error: cannot compute sizeof (long long), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_long_long=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7215,9 +6430,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef long long ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (long long)); }
-+unsigned long ulongval () { return (long) (sizeof (long long)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -7226,44 +6440,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (long long))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (long long))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (long long))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7274,32 +6479,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_long_long" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long)
-+echo "$as_me: error: cannot compute sizeof (long long), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_long_long=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_long_long=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for __int64" >&5
--echo $ECHO_N "checking for __int64... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for __int64" >&5
-+echo $ECHO_N "checking for __int64... $ECHO_C" >&6
- if test "${ac_cv_type___int64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7310,57 +6512,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef __int64 ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((__int64 *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (__int64))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type___int64=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type___int64=no
-+ac_cv_type___int64=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
--echo "${ECHO_T}$ac_cv_type___int64" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
-+echo "${ECHO_T}$ac_cv_type___int64" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of __int64" >&5
--echo $ECHO_N "checking size of __int64... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of __int64" >&5
-+echo $ECHO_N "checking size of __int64... $ECHO_C" >&6
- if test "${ac_cv_sizeof___int64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type___int64" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7370,11 +6575,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -7382,22 +6586,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7407,11 +6615,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7419,53 +6626,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -7473,22 +6682,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7498,11 +6711,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7510,48 +6722,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -7562,11 +6775,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (__int64))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7574,45 +6786,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof___int64=$ac_lo;;
--'') if test "$ac_cv_type___int64" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (__int64)
-+echo "$as_me: error: cannot compute sizeof (__int64), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof___int64=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7620,9 +6836,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef __int64 ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (__int64)); }
-+unsigned long ulongval () { return (long) (sizeof (__int64)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -7631,44 +6846,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (__int64))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (__int64))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (__int64))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7679,32 +6885,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type___int64" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (__int64)
-+echo "$as_me: error: cannot compute sizeof (__int64), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof___int64=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof___int64=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
--echo "${ECHO_T}$ac_cv_sizeof___int64" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
-+echo "${ECHO_T}$ac_cv_sizeof___int64" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF___INT64 $ac_cv_sizeof___int64
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
- if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7715,57 +6918,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((off_t *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (off_t))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_off_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_off_t=no
-+ac_cv_type_off_t=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of off_t" >&5
--echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of off_t" >&5
-+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_off_t" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7775,11 +6981,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -7787,22 +6992,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7812,11 +7021,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7824,53 +7032,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -7878,22 +7088,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7903,11 +7117,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7915,48 +7128,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -7967,11 +7181,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef off_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -7979,45 +7192,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_off_t=$ac_lo;;
--'') if test "$ac_cv_type_off_t" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t)
-+echo "$as_me: error: cannot compute sizeof (off_t), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_off_t=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8025,9 +7242,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef off_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (off_t)); }
-+unsigned long ulongval () { return (long) (sizeof (off_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8036,44 +7252,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (off_t))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (off_t))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (off_t))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8084,32 +7291,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_off_t" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t)
-+echo "$as_me: error: cannot compute sizeof (off_t), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_off_t=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_off_t=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for void*" >&5
--echo $ECHO_N "checking for void*... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for void*" >&5
-+echo $ECHO_N "checking for void*... $ECHO_C" >&6
- if test "${ac_cv_type_voidp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8120,57 +7324,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef void* ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((void* *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (void*))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_voidp=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_voidp=no
-+ac_cv_type_voidp=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
--echo "${ECHO_T}$ac_cv_type_voidp" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
-+echo "${ECHO_T}$ac_cv_type_voidp" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of void*" >&5
--echo $ECHO_N "checking size of void*... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of void*" >&5
-+echo $ECHO_N "checking size of void*... $ECHO_C" >&6
- if test "${ac_cv_sizeof_voidp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_voidp" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8180,11 +7387,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void* ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -8192,22 +7398,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8217,11 +7427,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void* ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8229,53 +7438,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void* ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (void*))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -8283,22 +7494,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8308,11 +7523,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void* ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8320,48 +7534,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8372,11 +7587,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void* ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8384,45 +7598,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_voidp=$ac_lo;;
--'') if test "$ac_cv_type_voidp" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void*)
-+echo "$as_me: error: cannot compute sizeof (void*), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_voidp=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8430,9 +7648,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef void* ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (void*)); }
-+unsigned long ulongval () { return (long) (sizeof (void*)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8441,44 +7658,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (void*))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (void*))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (void*))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8489,32 +7697,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_voidp" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (void*)
-+echo "$as_me: error: cannot compute sizeof (void*), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_voidp=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_voidp=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
--echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_VOIDP $ac_cv_sizeof_voidp
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for float" >&5
--echo $ECHO_N "checking for float... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for float" >&5
-+echo $ECHO_N "checking for float... $ECHO_C" >&6
- if test "${ac_cv_type_float+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8525,57 +7730,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef float ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((float *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (float))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_float=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_float=no
-+ac_cv_type_float=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
--echo "${ECHO_T}$ac_cv_type_float" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
-+echo "${ECHO_T}$ac_cv_type_float" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of float" >&5
--echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of float" >&5
-+echo $ECHO_N "checking size of float... $ECHO_C" >&6
- if test "${ac_cv_sizeof_float+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_float" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8585,11 +7793,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -8597,22 +7804,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8622,11 +7833,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8634,53 +7844,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -8688,22 +7900,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8713,11 +7929,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8725,48 +7940,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8777,11 +7993,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef float ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -8789,45 +8004,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_float=$ac_lo;;
--'') if test "$ac_cv_type_float" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float)
-+echo "$as_me: error: cannot compute sizeof (float), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_float=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8835,9 +8054,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef float ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (float)); }
-+unsigned long ulongval () { return (long) (sizeof (float)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -8846,44 +8064,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (float))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (float))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (float))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8894,32 +8103,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_float" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float)
-+echo "$as_me: error: cannot compute sizeof (float), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_float=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_float=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
--echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_float" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_FLOAT $ac_cv_sizeof_float
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for double" >&5
--echo $ECHO_N "checking for double... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for double" >&5
-+echo $ECHO_N "checking for double... $ECHO_C" >&6
- if test "${ac_cv_type_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8930,57 +8136,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef double ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((double *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (double))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_double=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_double=no
-+ac_cv_type_double=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
--echo "${ECHO_T}$ac_cv_type_double" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-+echo "${ECHO_T}$ac_cv_type_double" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of double" >&5
--echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of double" >&5
-+echo $ECHO_N "checking size of double... $ECHO_C" >&6
- if test "${ac_cv_sizeof_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_double" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8990,11 +8199,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -9002,22 +8210,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9027,11 +8239,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -9039,53 +8250,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -9093,22 +8306,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9118,11 +8335,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -9130,48 +8346,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -9182,11 +8399,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -9194,45 +8410,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_double=$ac_lo;;
--'') if test "$ac_cv_type_double" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double)
-+echo "$as_me: error: cannot compute sizeof (double), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_double=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9240,9 +8460,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef double ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (double)); }
-+unsigned long ulongval () { return (long) (sizeof (double)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -9251,44 +8470,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (double))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (double))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (double))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9299,32 +8509,29 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_double" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double)
-+echo "$as_me: error: cannot compute sizeof (double), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_double=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_double=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
--echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_double" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_DOUBLE $ac_cv_sizeof_double
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking for time_t" >&5
--echo $ECHO_N "checking for time_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for time_t" >&5
-+echo $ECHO_N "checking for time_t... $ECHO_C" >&6
- if test "${ac_cv_type_time_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9335,57 +8542,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef time_t ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((time_t *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (time_t))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_time_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_time_t=no
-+ac_cv_type_time_t=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5
--echo "${ECHO_T}$ac_cv_type_time_t" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5
-+echo "${ECHO_T}$ac_cv_type_time_t" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of time_t" >&5
--echo $ECHO_N "checking size of time_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of time_t" >&5
-+echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_time_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_time_t" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9395,11 +8605,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef time_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -9407,22 +8616,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9432,11 +8645,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef time_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -9444,53 +8656,55 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef time_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -9498,22 +8712,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9523,11 +8741,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef time_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -9535,48 +8752,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -9587,11 +8805,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef time_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (time_t))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -9599,45 +8816,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_time_t=$ac_lo;;
--'') if test "$ac_cv_type_time_t" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (time_t)
-+echo "$as_me: error: cannot compute sizeof (time_t), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_time_t=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9645,9 +8866,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-- typedef time_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (time_t)); }
-+unsigned long ulongval () { return (long) (sizeof (time_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -9656,44 +8876,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (time_t))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (time_t))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (time_t))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9704,25 +8915,22 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_time_t" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (time_t), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (time_t)
-+echo "$as_me: error: cannot compute sizeof (time_t), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_time_t=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_time_t=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
- _ACEOF
-@@ -9731,9 +8939,9 @@
-
- for id in pid_t gid_t uid_t; do
- as_ac_Type=`echo "ac_cv_type_$id" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $id" >&5
--echo $ECHO_N "checking for $id... $ECHO_C" >&6; }
--if { as_var=$as_ac_Type; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $id" >&5
-+echo $ECHO_N "checking for $id... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Type+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9743,48 +8951,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef $id ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if (($id *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof ($id))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_Type=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_Type=no"
-+eval "$as_ac_Type=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_Type'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Type'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Type'}'`" >&6
- if test `eval echo '${'$as_ac_Type'}'` = yes; then
- typ=$id
- else
-@@ -9797,8 +9006,8 @@
-
- done
-
--{ echo "$as_me:$LINENO: checking for prototypes" >&5
--echo $ECHO_N "checking for prototypes... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for prototypes" >&5
-+echo $ECHO_N "checking for prototypes... $ECHO_C" >&6
- if test "${rb_cv_have_prototypes+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9818,34 +9027,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_have_prototypes=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_have_prototypes=no
-+rb_cv_have_prototypes=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_have_prototypes" >&5
--echo "${ECHO_T}$rb_cv_have_prototypes" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_have_prototypes" >&5
-+echo "${ECHO_T}$rb_cv_have_prototypes" >&6
- if test "$rb_cv_have_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_PROTOTYPES 1
-@@ -9853,8 +9065,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking token paste string" >&5
--echo $ECHO_N "checking token paste string... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking token paste string" >&5
-+echo $ECHO_N "checking token paste string... $ECHO_C" >&6
- if test "${rb_cv_tokenpaste+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9874,34 +9086,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_tokenpaste=ansi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_tokenpaste=knr
-+rb_cv_tokenpaste=knr
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_tokenpaste" >&5
--echo "${ECHO_T}$rb_cv_tokenpaste" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_tokenpaste" >&5
-+echo "${ECHO_T}$rb_cv_tokenpaste" >&6
- if test "$rb_cv_tokenpaste" = ansi; then
- cat >>confdefs.h <<\_ACEOF
- #define TOKEN_PASTE(x,y) x##y
-@@ -9914,8 +9129,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5
--echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5
-+echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6
- if test "${rb_cv_stdarg+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9945,34 +9160,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_stdarg=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_stdarg=no
-+rb_cv_stdarg=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_stdarg" >&5
--echo "${ECHO_T}$rb_cv_stdarg" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_stdarg" >&5
-+echo "${ECHO_T}$rb_cv_stdarg" >&6
- if test "$rb_cv_stdarg" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_STDARG_PROTOTYPES 1
-@@ -9982,8 +9200,8 @@
-
-
-
-- { echo "$as_me:$LINENO: checking for noreturn function attribute" >&5
--echo $ECHO_N "checking for noreturn function attribute... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for noreturn function attribute" >&5
-+echo $ECHO_N "checking for noreturn function attribute... $ECHO_C" >&6
- if test "${rb_cv_func_noreturn+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10012,31 +9230,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- rb_cv_func_noreturn="$mac"; break
--else
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ rb_cv_func_noreturn="$mac"; break
-+else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- if test "${rb_c_werror_flag+set}"; then
- ac_c_werror_flag="$rb_c_werror_flag"
-@@ -10045,8 +9265,8 @@
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_func_noreturn" >&5
--echo "${ECHO_T}$rb_cv_func_noreturn" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_func_noreturn" >&5
-+echo "${ECHO_T}$rb_cv_func_noreturn" >&6
- cat >>confdefs.h <<_ACEOF
- #define NORETURN(x) $rb_cv_func_noreturn
- _ACEOF
-@@ -10054,8 +9274,8 @@
-
-
-
-- { echo "$as_me:$LINENO: checking for noinline function attribute" >&5
--echo $ECHO_N "checking for noinline function attribute... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for noinline function attribute" >&5
-+echo $ECHO_N "checking for noinline function attribute... $ECHO_C" >&6
- if test "${rb_cv_func_noinline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10084,31 +9304,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_func_noinline="$mac"; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- if test "${rb_c_werror_flag+set}"; then
- ac_c_werror_flag="$rb_c_werror_flag"
-@@ -10117,8 +9339,8 @@
- fi
-
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_func_noinline" >&5
--echo "${ECHO_T}$rb_cv_func_noinline" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_func_noinline" >&5
-+echo "${ECHO_T}$rb_cv_func_noinline" >&6
- cat >>confdefs.h <<_ACEOF
- #define NOINLINE(x) $rb_cv_func_noinline
- _ACEOF
-@@ -10127,8 +9349,8 @@
-
-
-
--{ echo "$as_me:$LINENO: checking for RUBY_EXTERN" >&5
--echo $ECHO_N "checking for RUBY_EXTERN... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for RUBY_EXTERN" >&5
-+echo $ECHO_N "checking for RUBY_EXTERN... $ECHO_C" >&6
- if test "${rb_cv_ruby_extern+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10150,35 +9372,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- :
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_ruby_extern" >&5
--echo "${ECHO_T}$rb_cv_ruby_extern" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_ruby_extern" >&5
-+echo "${ECHO_T}$rb_cv_ruby_extern" >&6
- test "x$rb_cv_ruby_extern" = xno || cat >>confdefs.h <<_ACEOF
- #define RUBY_EXTERN $rb_cv_ruby_extern
- _ACEOF
-@@ -10186,8 +9410,8 @@
-
- XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
-
--{ echo "$as_me:$LINENO: checking whether sys_nerr is declared" >&5
--echo $ECHO_N "checking whether sys_nerr is declared... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether sys_nerr is declared" >&5
-+echo $ECHO_N "checking whether sys_nerr is declared... $ECHO_C" >&6
- if test "${ac_cv_have_decl_sys_nerr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10204,7 +9428,7 @@
- main ()
- {
- #ifndef sys_nerr
-- (void) sys_nerr;
-+ char *p = (char *) sys_nerr;
- #endif
-
- ;
-@@ -10212,34 +9436,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_have_decl_sys_nerr=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_have_decl_sys_nerr=no
-+ac_cv_have_decl_sys_nerr=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_nerr" >&5
--echo "${ECHO_T}$ac_cv_have_decl_sys_nerr" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_nerr" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_sys_nerr" >&6
- if test $ac_cv_have_decl_sys_nerr = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -10258,33 +9485,33 @@
-
-
-
--# Check whether --with-libc_r was given.
-+# Check whether --with-libc_r or --without-libc_r was given.
- if test "${with_libc_r+set}" = set; then
-- withval=$with_libc_r;
-+ withval="$with_libc_r"
-+
- case $withval in
- yes) with_libc_r=yes;;
- *) with_libc_r=no;;
- esac
- else
- with_libc_r=no
--fi
-+fi;
-
--
--# Check whether --enable-pthread was given.
-+# Check whether --enable-pthread or --disable-pthread was given.
- if test "${enable_pthread+set}" = set; then
-- enableval=$enable_pthread; enable_pthread=$enableval
-+ enableval="$enable_pthread"
-+ enable_pthread=$enableval
- else
- enable_pthread=no
--fi
-+fi;
-
--
--# Check whether --enable-fastthread was given.
-+# Check whether --enable-fastthread or --disable-fastthread was given.
- if test "${enable_fastthread+set}" = set; then
-- enableval=$enable_fastthread;
-- : handled by ext/thread/extconf.rb
-+ enableval="$enable_fastthread"
-
--fi
-+ : handled by ext/thread/extconf.rb
-
-+fi;
-
- case "$target_os" in
- nextstep*) ;;
-@@ -10347,8 +9574,8 @@
- bsdi*) LIBS="-lm $LIBS"
- ac_cv_sizeof_rlim_t=8;;
- freebsd*) LIBS="-lm $LIBS"
-- { echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
--echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
-+echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6
- if test "${rb_cv_lib_xpg4_needed+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10366,22 +9593,24 @@
- #endif
-
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- rb_cv_lib_xpg4_needed=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -10389,15 +9618,14 @@
-
- rb_cv_lib_xpg4_needed=yes
- fi
--
- rm -f conftest.err conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_lib_xpg4_needed" >&5
--echo "${ECHO_T}$rb_cv_lib_xpg4_needed" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_lib_xpg4_needed" >&5
-+echo "${ECHO_T}$rb_cv_lib_xpg4_needed" >&6
- if test "$rb_cv_lib_xpg4_needed" = yes; then
-
--{ echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
--echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
-+echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6
- if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10410,53 +9638,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char setlocale ();
- int
- main ()
- {
--return setlocale ();
-+setlocale ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_xpg4_setlocale=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_xpg4_setlocale=no
-+ac_cv_lib_xpg4_setlocale=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
--echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4_setlocale" >&5
-+echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6
- if test $ac_cv_lib_xpg4_setlocale = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBXPG4 1
-@@ -10468,8 +9698,8 @@
-
- fi
- if test "$with_libc_r" = yes; then
-- { echo "$as_me:$LINENO: checking whether libc_r is supplementary to libc" >&5
--echo $ECHO_N "checking whether libc_r is supplementary to libc... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether libc_r is supplementary to libc" >&5
-+echo $ECHO_N "checking whether libc_r is supplementary to libc... $ECHO_C" >&6
- if test "${rb_cv_supplementary_lib_c_r+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10486,22 +9716,24 @@
- #endif
-
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- rb_cv_supplementary_lib_c_r=no
- else
- echo "$as_me: failed program was:" >&5
-@@ -10509,11 +9741,10 @@
-
- rb_cv_supplementary_lib_c_r=yes
- fi
--
- rm -f conftest.err conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_supplementary_lib_c_r" >&5
--echo "${ECHO_T}$rb_cv_supplementary_lib_c_r" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_supplementary_lib_c_r" >&5
-+echo "${ECHO_T}$rb_cv_supplementary_lib_c_r" >&6
- if test "$rb_cv_supplementary_lib_c_r" = yes; then
- MAINLIBS="-lc_r $MAINLIBS"
- fi
-@@ -10533,8 +9764,8 @@
- *) LIBS="-lm $LIBS";;
- esac
-
--{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
--echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
- if test "${ac_cv_lib_crypt_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10547,53 +9778,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char crypt ();
- int
- main ()
- {
--return crypt ();
-+crypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_crypt_crypt=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_crypt_crypt=no
-+ac_cv_lib_crypt_crypt=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
- if test $ac_cv_lib_crypt_crypt = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBCRYPT 1
-@@ -10604,8 +9837,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10618,53 +9851,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--return dlopen ();
-+dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_dl_dlopen=no
-+ac_cv_lib_dl_dlopen=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
-@@ -10675,8 +9910,8 @@
- fi
- # Dynamic linking for SunOS/Solaris and SYSV
-
--{ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10689,53 +9924,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char shl_load ();
- int
- main ()
- {
--return shl_load ();
-+shl_load ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_dld_shl_load=no
-+ac_cv_lib_dld_shl_load=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
- if test $ac_cv_lib_dld_shl_load = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDLD 1
-@@ -10761,9 +9998,9 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10785,35 +10022,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_Header=no"
-+eval "$as_ac_Header=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -10825,12 +10064,13 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
-- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10838,83 +10078,124 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--return opendir ();
-+opendir ();
- ;
- return 0;
- }
- _ACEOF
--for ac_lib in '' dir; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-- ac_cv_search_opendir=$ac_res
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="none required"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_opendir" = no; then
-+ for ac_lib in dir; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_opendir+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_opendir+set}" = set; then
-- :
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="-l$ac_lib"
-+break
- else
-- ac_cv_search_opendir=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
--ac_res=$ac_cv_search_opendir
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-
- fi
-
- else
-- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10922,80 +10203,120 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--return opendir ();
-+opendir ();
- ;
- return 0;
- }
- _ACEOF
--for ac_lib in '' x; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-- ac_cv_search_opendir=$ac_res
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="none required"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_opendir" = no; then
-+ for ac_lib in x; do
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_opendir+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_opendir+set}" = set; then
-- :
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char opendir ();
-+int
-+main ()
-+{
-+opendir ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_search_opendir="-l$ac_lib"
-+break
- else
-- ac_cv_search_opendir=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ done
- fi
--rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
--ac_res=$ac_cv_search_opendir
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6
-+if test "$ac_cv_search_opendir" != no; then
-+ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-
- fi
-
- fi
-
--{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11019,31 +10340,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_header_stdc=no
-+ac_cv_header_stdc=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -11099,7 +10423,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
--#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -11119,27 +10442,18 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- return 2;
-- return 0;
-+ exit(2);
-+ exit (0);
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11152,14 +10466,12 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11168,8 +10480,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
- if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11182,7 +10494,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
- # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -11199,34 +10511,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_sys_wait_h=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_header_sys_wait_h=no
-+ac_cv_header_sys_wait_h=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
- if test $ac_cv_header_sys_wait_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11271,19 +10586,18 @@
- ucontext.h intrinsics.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -11294,37 +10608,40 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_header_compiler=no
-+ac_header_compiler=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -11333,22 +10650,24 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -11356,10 +10675,9 @@
-
- ac_header_preproc=no
- fi
--
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11383,19 +10701,25 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -11408,8 +10732,8 @@
- done
-
-
--{ echo "$as_me:$LINENO: checking for rlim_t" >&5
--echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for rlim_t" >&5
-+echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6
- if test "${ac_cv_type_rlim_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11435,57 +10759,60 @@
- #include <stdio.h>
-
-
--typedef rlim_t ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((rlim_t *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (rlim_t))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_rlim_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_rlim_t=no
-+ac_cv_type_rlim_t=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
--echo "${ECHO_T}$ac_cv_type_rlim_t" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
-+echo "${ECHO_T}$ac_cv_type_rlim_t" >&6
-
--# The cast to long int works around a bug in the HP C Compiler
--# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--# This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of rlim_t" >&5
--echo $ECHO_N "checking size of rlim_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking size of rlim_t" >&5
-+echo $ECHO_N "checking size of rlim_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_rlim_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ if test "$ac_cv_type_rlim_t" = yes; then
-+ # The cast to unsigned long works around a bug in the HP C Compiler
-+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+ # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11510,11 +10837,10 @@
- #include <stdio.h>
-
-
-- typedef rlim_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -11522,26 +10848,30 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_lo=0 ac_mid=0
-- while :; do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
-@@ -11562,11 +10892,10 @@
- #include <stdio.h>
-
-
-- typedef rlim_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -11574,42 +10903,45 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11631,11 +10963,10 @@
- #include <stdio.h>
-
-
-- typedef rlim_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -11643,22 +10974,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11683,11 +11018,10 @@
- #include <stdio.h>
-
-
-- typedef rlim_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -11695,48 +11029,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo= ac_hi=
-+ac_lo= ac_hi=
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -11762,11 +11097,10 @@
- #include <stdio.h>
-
-
-- typedef rlim_t ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long) (sizeof (rlim_t))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -11774,45 +11108,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_lo=`expr '(' $ac_mid ')' + 1`
-+ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_rlim_t=$ac_lo;;
--'') if test "$ac_cv_type_rlim_t" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t)
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (rlim_t)
-+echo "$as_me: error: cannot compute sizeof (rlim_t), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_rlim_t=0
-- fi ;;
-+ { (exit 1); exit 1; }; } ;;
- esac
- else
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-+ { (exit 1); exit 1; }; }
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -11835,9 +11173,8 @@
- #include <stdio.h>
-
-
-- typedef rlim_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+long longval () { return (long) (sizeof (rlim_t)); }
-+unsigned long ulongval () { return (long) (sizeof (rlim_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -11846,44 +11183,35 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- return 1;
-- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ exit (1);
-+ if (((long) (sizeof (rlim_t))) < 0)
- {
-- long int i = longval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ long i = longval ();
-+ if (i != ((long) (sizeof (rlim_t))))
-+ exit (1);
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long int i = ulongval ();
-- if (i != ((long int) (sizeof (ac__type_sizeof_))))
-- return 1;
-+ unsigned long i = ulongval ();
-+ if (i != ((long) (sizeof (rlim_t))))
-+ exit (1);
- fprintf (f, "%lu\n", i);
- }
-- return ferror (f) || fclose (f) != 0;
-+ exit (ferror (f) || fclose (f) != 0);
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11894,33 +11222,30 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--if test "$ac_cv_type_rlim_t" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t)
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (rlim_t), 77
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (rlim_t)
-+echo "$as_me: error: cannot compute sizeof (rlim_t), 77
- See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-- else
-- ac_cv_sizeof_rlim_t=0
-- fi
-+ { (exit 1); exit 1; }; }
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
-+else
-+ ac_cv_sizeof_rlim_t=0
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_rlim_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_rlim_t" >&6; }
--
--
--
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_sizeof_rlim_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_rlim_t" >&6
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_RLIM_T $ac_cv_sizeof_rlim_t
- _ACEOF
-
-
-
--{ echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
- if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11931,59 +11256,62 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
-+if ((size_t *) 0)
- return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (size_t))
- return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_type_size_t=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_size_t=no
-+ac_cv_type_size_t=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6
- if test $ac_cv_type_size_t = yes; then
- :
- else
-
- cat >>confdefs.h <<_ACEOF
--#define size_t unsigned int
-+#define size_t unsigned
- _ACEOF
-
- fi
-
--{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
--echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
-+
-+echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-+echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
- if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12005,28 +11333,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_stat_st_blksize=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -12044,37 +11376,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_stat_st_blksize=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_blksize=no
-+ac_cv_member_struct_stat_st_blksize=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
--echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
- if test $ac_cv_member_struct_stat_st_blksize = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -12089,8 +11423,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
--echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-+echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
- if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12112,28 +11446,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_stat_st_blocks=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -12151,37 +11489,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_stat_st_blocks=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_blocks=no
-+ac_cv_member_struct_stat_st_blocks=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
--echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
- if test $ac_cv_member_struct_stat_st_blocks = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -12194,17 +11534,20 @@
- _ACEOF
-
- else
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "fileblocks.$ac_objext" | \
-+ *" fileblocks.$ac_objext" | \
-+ "fileblocks.$ac_objext "* | \
- *" fileblocks.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" ;;
- esac
-
- fi
-
-
--{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
--echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
-+
-+echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-+echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
- if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12226,28 +11569,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_stat_st_rdev=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -12265,37 +11612,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_stat_st_rdev=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_stat_st_rdev=no
-+ac_cv_member_struct_stat_st_rdev=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
--echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
- if test $ac_cv_member_struct_stat_st_rdev = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -12311,8 +11660,8 @@
-
-
-
--{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
--echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
- if test "${ac_cv_type_uid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12334,8 +11683,8 @@
- rm -f conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
--echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uid_t" >&6
- if test $ac_cv_type_uid_t = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12349,8 +11698,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
--echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
-+echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
- if test "${ac_cv_type_getgroups+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12364,7 +11713,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- /* Thanks to Mike Rendell for this test. */
--$ac_includes_default
-+#include <sys/types.h>
- #define NGID 256
- #undef MAX
- #define MAX(x, y) ((x) > (y) ? (x) : (y))
-@@ -12374,7 +11723,7 @@
- {
- gid_t gidset[NGID];
- int i, n;
-- union { gid_t gval; long int lval; } val;
-+ union { gid_t gval; long lval; } val;
-
- val.lval = -1;
- for (i = 0; i < NGID; i++)
-@@ -12382,28 +11731,18 @@
- n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
- gidset);
- /* Exit non-zero if getgroups seems to require an array of ints. This
-- happens when gid_t is short int but getgroups modifies an array
-- of ints. */
-- return n > 0 && gidset[n] != val.gval;
-+ happens when gid_t is short but getgroups modifies an array of ints. */
-+ exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12416,10 +11755,8 @@
- ( exit $ac_status )
- ac_cv_type_getgroups=int
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- if test $ac_cv_type_getgroups = cross; then
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -12440,16 +11777,16 @@
-
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
--echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
-+echo "${ECHO_T}$ac_cv_type_getgroups" >&6
-
- cat >>confdefs.h <<_ACEOF
- #define GETGROUPS_T $ac_cv_type_getgroups
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
--echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12461,44 +11798,55 @@
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <signal.h>
-+#ifdef signal
-+# undef signal
-+#endif
-+#ifdef __cplusplus
-+extern "C" void (*signal (int, void (*)(int)))(int);
-+#else
-+void (*signal ()) ();
-+#endif
-
- int
- main ()
- {
--return *(signal (0, 0)) (0) == 1;
-+int i;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_type_signal=int
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_signal=void
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_type_signal=void
-+ac_cv_type_signal=int
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6
-
- cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
-@@ -12522,8 +11870,8 @@
- *)
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
--{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
--echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for working alloca.h" >&5
-+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
- if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12538,42 +11886,43 @@
- main ()
- {
- char *p = (char *) alloca (2 * sizeof (int));
-- if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_working_alloca_h=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_working_alloca_h=no
-+ac_cv_working_alloca_h=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
--echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
- if test $ac_cv_working_alloca_h = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12582,8 +11931,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking for alloca" >&5
--echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for alloca" >&5
-+echo $ECHO_N "checking for alloca... $ECHO_C" >&6
- if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12600,7 +11949,7 @@
- # include <malloc.h>
- # define alloca _alloca
- # else
--# ifdef HAVE_ALLOCA_H
-+# if HAVE_ALLOCA_H
- # include <alloca.h>
- # else
- # ifdef _AIX
-@@ -12618,42 +11967,43 @@
- main ()
- {
- char *p = (char *) alloca (1);
-- if (p) return 0;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_func_alloca_works=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_alloca_works=no
-+ac_cv_func_alloca_works=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
--echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-
- if test $ac_cv_func_alloca_works = yes; then
-
-@@ -12667,15 +12017,15 @@
- # contain a buggy version. If you still want to use their alloca,
- # use ar to extract alloca.o from them instead of compiling alloca.c.
-
--ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-+ALLOCA=alloca.$ac_objext
-
- cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
- _ACEOF
-
-
--{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
--echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
- if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12685,7 +12035,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#if defined CRAY && ! defined CRAY2
-+#if defined(CRAY) && ! defined(CRAY2)
- webecray
- #else
- wenotbecray
-@@ -12701,14 +12051,14 @@
- rm -f conftest*
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
--echo "${ECHO_T}$ac_cv_os_cray" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-+echo "${ECHO_T}$ac_cv_os_cray" >&6
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -12734,60 +12084,67 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -12800,8 +12157,8 @@
- done
- fi
-
--{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
--echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
- if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12814,7 +12171,6 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
- int
- find_stack_direction ()
- {
-@@ -12832,26 +12188,17 @@
- int
- main ()
- {
-- return find_stack_direction () < 0;
-+ exit (find_stack_direction () < 0);
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12864,13 +12211,11 @@
- ( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
--echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-
- cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -12881,8 +12226,8 @@
-
- ;;
- esac
--{ echo "$as_me:$LINENO: checking for working memcmp" >&5
--echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for working memcmp" >&5
-+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
- if test "${ac_cv_func_memcmp_working+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12901,9 +12246,9 @@
- {
-
- /* Some versions of memcmp are not 8-bit clean. */
-- char c0 = '\100', c1 = '\200', c2 = '\201';
-+ char c0 = 0x40, c1 = 0x80, c2 = 0x81;
- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-- return 1;
-+ exit (1);
-
- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
- or more and with at least one buffer not starting on a 4-byte boundary.
-@@ -12919,9 +12264,9 @@
- strcpy (a, "--------01111111");
- strcpy (b, "--------10000000");
- if (memcmp (a, b, 16) >= 0)
-- return 1;
-+ exit (1);
- }
-- return 0;
-+ exit (0);
- }
-
- ;
-@@ -12929,22 +12274,13 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12957,71 +12293,70 @@
- ( exit $ac_status )
- ac_cv_func_memcmp_working=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
--echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
--test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-+echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-+test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
-+ "memcmp.$ac_objext" | \
-+ *" memcmp.$ac_objext" | \
-+ "memcmp.$ac_objext "* | \
- *" memcmp.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
- esac
-
-
--{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
--echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- while :; do
-+ ac_cv_sys_largefile_source=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <sys/types.h> /* for off_t */
-- #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
-- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return !fseeko;
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-- ac_cv_sys_largefile_source=no; break
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13029,65 +12364,114 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #define _LARGEFILE_SOURCE 1
--#include <sys/types.h> /* for off_t */
-- #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
-- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return !fseeko;
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_sys_largefile_source=1; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-- ac_cv_sys_largefile_source=unknown
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- break
- done
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
--echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
--case $ac_cv_sys_largefile_source in #(
-- no | unknown) ;;
-- *)
-+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
-+if test "$ac_cv_sys_largefile_source" != no; then
-+
- cat >>confdefs.h <<_ACEOF
- #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
- _ACEOF
--;;
--esac
-+
-+fi
- rm -f conftest*
-
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--if test $ac_cv_sys_largefile_source != unknown; then
-+echo "$as_me:$LINENO: checking for fseeko" >&5
-+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
-+if test "${ac_cv_func_fseeko+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+return fseeko && fseeko (stdin, 0, 0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_fseeko=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_fseeko=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
-+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
-+if test $ac_cv_func_fseeko = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FSEEKO 1
-@@ -13099,9 +12483,9 @@
- for ac_func in ftello
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13127,60 +12511,67 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13212,9 +12603,9 @@
- isnan finite isinf hypot acosh erf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13240,70 +12631,79 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
- #endif
--
--int
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "$ac_func.$ac_objext" | \
-+ *" $ac_func.$ac_objext" | \
-+ "$ac_func.$ac_objext "* | \
- *" $ac_func.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
- esac
-
- fi
-@@ -13382,9 +12782,9 @@
- cosh sinh tanh setuid setgid setenv unsetenv
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13410,60 +12810,67 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13472,11 +12879,11 @@
- fi
- done
-
--# Check whether --enable-setreuid was given.
-+# Check whether --enable-setreuid or --disable-setreuid was given.
- if test "${enable_setreuid+set}" = set; then
-- enableval=$enable_setreuid; use_setreuid=$enableval
--fi
--
-+ enableval="$enable_setreuid"
-+ use_setreuid=$enableval
-+fi;
- if test "$use_setreuid" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define USE_SETREUID 1
-@@ -13487,8 +12894,8 @@
- _ACEOF
-
- fi
--{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
--echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
- if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13504,42 +12911,43 @@
- int
- main ()
- {
--struct tm tm;
-- int *p = &tm.tm_sec;
-- return !p;
-+struct tm *tp; tp->tm_sec;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_struct_tm=time.h
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_struct_tm=sys/time.h
-+ac_cv_struct_tm=sys/time.h
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
--echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+echo "${ECHO_T}$ac_cv_struct_tm" >&6
- if test $ac_cv_struct_tm = sys/time.h; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -13548,8 +12956,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
--echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
- if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13574,28 +12982,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_tm_tm_zone=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- cat >conftest.$ac_ext <<_ACEOF
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -13616,37 +13028,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_member_struct_tm_tm_zone=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_member_struct_tm_tm_zone=no
-+ac_cv_member_struct_tm_tm_zone=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
--echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
- if test $ac_cv_member_struct_tm_tm_zone = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -13663,77 +13077,8 @@
- _ACEOF
-
- else
-- { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
--echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
--if test "${ac_cv_have_decl_tzname+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <time.h>
--
--int
--main ()
--{
--#ifndef tzname
-- (void) tzname;
--#endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_have_decl_tzname=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_have_decl_tzname=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
--echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
--if test $ac_cv_have_decl_tzname = yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_TZNAME 1
--_ACEOF
--
--
--else
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_TZNAME 0
--_ACEOF
--
--
--fi
--
--
-- { echo "$as_me:$LINENO: checking for tzname" >&5
--echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for tzname" >&5
-+echo $ECHO_N "checking for tzname... $ECHO_C" >&6
- if test "${ac_cv_var_tzname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13744,49 +13089,51 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <time.h>
--#if !HAVE_DECL_TZNAME
--extern char *tzname[];
-+#ifndef tzname /* For SGI. */
-+extern char *tzname[]; /* RS6000 and others reject char **tzname. */
- #endif
-
- int
- main ()
- {
--return tzname[0][0];
-+atoi(*tzname);
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_var_tzname=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_var_tzname=no
-+ac_cv_var_tzname=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
--echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-+echo "${ECHO_T}$ac_cv_var_tzname" >&6
- if test $ac_cv_var_tzname = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -13796,8 +13143,8 @@
- fi
- fi
-
--{ echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
--echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
-+echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6
- if test "${rb_cv_member_struct_tm_tm_gmtoff+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13817,42 +13164,45 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_member_struct_tm_tm_gmtoff=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_member_struct_tm_tm_gmtoff=no
-+rb_cv_member_struct_tm_tm_gmtoff=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_member_struct_tm_tm_gmtoff" >&5
--echo "${ECHO_T}$rb_cv_member_struct_tm_tm_gmtoff" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_member_struct_tm_tm_gmtoff" >&5
-+echo "${ECHO_T}$rb_cv_member_struct_tm_tm_gmtoff" >&6
- if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_TM_TM_GMTOFF 1
- _ACEOF
-
- fi
--{ echo "$as_me:$LINENO: checking for external int daylight" >&5
--echo $ECHO_N "checking for external int daylight... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for external int daylight" >&5
-+echo $ECHO_N "checking for external int daylight... $ECHO_C" >&6
- if test "${rb_cv_have_daylight+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13873,44 +13223,46 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_have_daylight=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_have_daylight=no
-+rb_cv_have_daylight=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_have_daylight" >&5
--echo "${ECHO_T}$rb_cv_have_daylight" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_have_daylight" >&5
-+echo "${ECHO_T}$rb_cv_have_daylight" >&6
- if test "$rb_cv_have_daylight" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DAYLIGHT 1
- _ACEOF
-
- fi
--{ echo "$as_me:$LINENO: checking for negative time_t for gmtime(3)" >&5
--echo $ECHO_N "checking for negative time_t for gmtime(3)... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for negative time_t for gmtime(3)" >&5
-+echo $ECHO_N "checking for negative time_t for gmtime(3)... $ECHO_C" >&6
- if test "${rb_cv_negative_time_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13955,22 +13307,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13983,13 +13326,11 @@
- ( exit $ac_status )
- rb_cv_negative_time_t=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_negative_time_t" >&5
--echo "${ECHO_T}$rb_cv_negative_time_t" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_negative_time_t" >&5
-+echo "${ECHO_T}$rb_cv_negative_time_t" >&6
- if test "$rb_cv_negative_time_t" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define NEGATIVE_TIME_T 1
-@@ -14003,8 +13344,8 @@
- _ACEOF
-
- else
-- { echo "$as_me:$LINENO: checking for BSD signal semantics" >&5
--echo $ECHO_N "checking for BSD signal semantics... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for BSD signal semantics" >&5
-+echo $ECHO_N "checking for BSD signal semantics... $ECHO_C" >&6
- if test "${rb_cv_bsd_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14038,22 +13379,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14066,13 +13398,11 @@
- ( exit $ac_status )
- rb_cv_bsd_signal=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_bsd_signal" >&5
--echo "${ECHO_T}$rb_cv_bsd_signal" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_bsd_signal" >&5
-+echo "${ECHO_T}$rb_cv_bsd_signal" >&6
- if test "$rb_cv_bsd_signal" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define BSD_SIGNAL 1
-@@ -14081,8 +13411,8 @@
- fi
- fi
-
--{ echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
--echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
-+echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6
- if test "${ac_cv_func_getpgrp_void+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14103,35 +13433,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_func_getpgrp_void=no
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_getpgrp_void=yes
-+ac_cv_func_getpgrp_void=yes
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
--echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
-+echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
- if test $ac_cv_func_getpgrp_void = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14140,8 +13473,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
--echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
-+echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
- if test "${ac_cv_func_setpgrp_void+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14156,35 +13489,29 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif
-+
- int
- main ()
- {
- /* If this system has a BSD-style setpgrp which takes arguments,
- setpgrp(1, 1) will fail with ESRCH and return -1, in that case
- exit successfully. */
-- return setpgrp (1,1) != -1;
-+ exit (setpgrp (1,1) == -1 ? 0 : 1);
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14197,13 +13524,11 @@
- ( exit $ac_status )
- ac_cv_func_setpgrp_void=yes
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
--echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
-+echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
- if test $ac_cv_func_setpgrp_void = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14213,8 +13538,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14231,8 +13556,7 @@
- int
- main ()
- {
--#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-- && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
- #endif
-
-@@ -14241,22 +13565,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -14279,36 +13607,39 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_c_bigendian=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_c_bigendian=no
-+ac_cv_c_bigendian=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- # It does not; compile a test program.
-+# It does not; compile a test program.
- if test "$cross_compiling" = yes; then
- # try to guess the endianness by grepping values into an object file
- ac_cv_c_bigendian=unknown
-@@ -14318,11 +13649,11 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
- int
- main ()
-@@ -14333,22 +13664,26 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
- fi
-@@ -14364,10 +13699,8 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -14375,41 +13708,27 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--$ac_includes_default
- int
- main ()
- {
--
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
-- long int l;
-- char c[sizeof (long int)];
-+ long l;
-+ char c[sizeof (long)];
- } u;
- u.l = 1;
-- return u.c[sizeof (long int) - 1] == 1;
--
-- ;
-- return 0;
-+ exit (u.c[sizeof (long) - 1] == 1);
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14422,16 +13741,13 @@
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
- case $ac_cv_c_bigendian in
- yes)
-
-@@ -14449,8 +13765,8 @@
- { (exit 1); exit 1; }; } ;;
- esac
-
--{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14468,10 +13784,10 @@
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
-- const charset cs;
-+ const charset x;
- /* SunOS 4.1.1 cc rejects this. */
-- char const *const *pcpcc;
-- char **ppc;
-+ char const *const *ccp;
-+ char **p;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
-@@ -14480,17 +13796,16 @@
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
-- pcpcc = &g + (g ? g-g : 0);
-+ ccp = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
-- ++pcpcc;
-- ppc = (char**) pcpcc;
-- pcpcc = (char const *const *) ppc;
-+ ++ccp;
-+ p = (char**) ccp;
-+ ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -14509,9 +13824,7 @@
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-- if (!foo) return 0;
- }
-- return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -14519,34 +13832,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_c_const=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_c_const=no
-+ac_cv_c_const=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14556,8 +13872,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
--echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
- if test "${ac_cv_c_char_unsigned+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14579,34 +13895,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_c_char_unsigned=no
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_c_char_unsigned=yes
-+ac_cv_c_char_unsigned=yes
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
--echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
- if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
- cat >>confdefs.h <<\_ACEOF
- #define __CHAR_UNSIGNED__ 1
-@@ -14614,8 +13933,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14635,37 +13954,38 @@
-
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_cv_c_inline=$ac_kw
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_c_inline=$ac_kw; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- test "$ac_cv_c_inline" != no && break
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6
-
-
- case $ac_cv_c_inline in
-@@ -14683,8 +14003,8 @@
- ;;
- esac
-
--{ echo "$as_me:$LINENO: checking for working volatile" >&5
--echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for working volatile" >&5
-+echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
- if test "${ac_cv_c_volatile+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14700,41 +14020,43 @@
- {
-
- volatile int x;
--int * volatile y = (int *) 0;
--return !x && !y;
-+int * volatile y;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_c_volatile=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_c_volatile=no
-+ac_cv_c_volatile=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
--echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
-+echo "${ECHO_T}$ac_cv_c_volatile" >&6
- if test $ac_cv_c_volatile = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -14745,14 +14067,16 @@
-
-
- if test x"$target_cpu" = xia64; then
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "ia64.$ac_objext" | \
-+ *" ia64.$ac_objext" | \
-+ "ia64.$ac_objext "* | \
- *" ia64.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS ia64.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS ia64.$ac_objext" ;;
- esac
-
-- { echo "$as_me:$LINENO: checking for __libc_ia64_register_backing_store_base" >&5
--echo $ECHO_N "checking for __libc_ia64_register_backing_store_base... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking for __libc_ia64_register_backing_store_base" >&5
-+echo $ECHO_N "checking for __libc_ia64_register_backing_store_base... $ECHO_C" >&6
- if test "${rb_cv___libc_ia64_register_backing_store_base+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14774,36 +14098,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv___libc_ia64_register_backing_store_base=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv___libc_ia64_register_backing_store_base" >&5
--echo "${ECHO_T}$rb_cv___libc_ia64_register_backing_store_base" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv___libc_ia64_register_backing_store_base" >&5
-+echo "${ECHO_T}$rb_cv___libc_ia64_register_backing_store_base" >&6
- if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE 1
-@@ -14812,8 +14137,8 @@
- fi
- fi
-
--{ echo "$as_me:$LINENO: checking whether right shift preserve sign bit" >&5
--echo $ECHO_N "checking whether right shift preserve sign bit... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether right shift preserve sign bit" >&5
-+echo $ECHO_N "checking whether right shift preserve sign bit... $ECHO_C" >&6
- if test "${rb_cv_rshift_sign+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14837,22 +14162,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14865,13 +14181,11 @@
- ( exit $ac_status )
- rb_cv_rshift_sign=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_rshift_sign" >&5
--echo "${ECHO_T}$rb_cv_rshift_sign" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_rshift_sign" >&5
-+echo "${ECHO_T}$rb_cv_rshift_sign" >&6
- if test "$rb_cv_rshift_sign" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define RSHIFT(x,y) ((x)>>(int)y)
-@@ -14884,8 +14198,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking read count field in FILE structures" >&5
--echo $ECHO_N "checking read count field in FILE structures... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking read count field in FILE structures" >&5
-+echo $ECHO_N "checking read count field in FILE structures... $ECHO_C" >&6
- if test "${rb_cv_fcnt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14907,48 +14221,51 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_fcnt="$fcnt"; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_fcnt="not found"
-+rb_cv_fcnt="not found"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- fi
-
- if test "$rb_cv_fcnt" = "not found"; then
-- { echo "$as_me:$LINENO: result: not found(OK if using GNU libc)" >&5
--echo "${ECHO_T}not found(OK if using GNU libc)" >&6; }
-+ echo "$as_me:$LINENO: result: not found(OK if using GNU libc)" >&5
-+echo "${ECHO_T}not found(OK if using GNU libc)" >&6
- else
-- { echo "$as_me:$LINENO: result: $rb_cv_fcnt" >&5
--echo "${ECHO_T}$rb_cv_fcnt" >&6; }
-+ echo "$as_me:$LINENO: result: $rb_cv_fcnt" >&5
-+echo "${ECHO_T}$rb_cv_fcnt" >&6
- cat >>confdefs.h <<_ACEOF
- #define FILE_COUNT $rb_cv_fcnt
- _ACEOF
-
- fi
-
--{ echo "$as_me:$LINENO: checking read buffer ptr field in FILE structures" >&5
--echo $ECHO_N "checking read buffer ptr field in FILE structures... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking read buffer ptr field in FILE structures" >&5
-+echo $ECHO_N "checking read buffer ptr field in FILE structures... $ECHO_C" >&6
- if test "${rb_cv_frptr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14970,48 +14287,51 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_frptr="$frptr"; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_frptr="not found"
-+rb_cv_frptr="not found"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- fi
-
- if test "$rb_cv_frptr" = "not found"; then
-- { echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
- else
-- { echo "$as_me:$LINENO: result: $rb_cv_frptr" >&5
--echo "${ECHO_T}$rb_cv_frptr" >&6; }
-+ echo "$as_me:$LINENO: result: $rb_cv_frptr" >&5
-+echo "${ECHO_T}$rb_cv_frptr" >&6
- cat >>confdefs.h <<_ACEOF
- #define FILE_READPTR $rb_cv_frptr
- _ACEOF
-
-
- if test "$rb_cv_fcnt" = "not found"; then
-- { echo "$as_me:$LINENO: checking read buffer end field in FILE structures" >&5
--echo $ECHO_N "checking read buffer end field in FILE structures... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking read buffer end field in FILE structures" >&5
-+echo $ECHO_N "checking read buffer end field in FILE structures... $ECHO_C" >&6
- if test "${rb_cv_frend+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15033,40 +14353,43 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_frend="$frend"; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_frend="not found"
-+rb_cv_frend="not found"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- fi
-
- if test "$rb_cv_frend" = "not found"; then
-- { echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-+ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
- else
-- { echo "$as_me:$LINENO: result: $rb_cv_frend" >&5
--echo "${ECHO_T}$rb_cv_frend" >&6; }
-+ echo "$as_me:$LINENO: result: $rb_cv_frend" >&5
-+echo "${ECHO_T}$rb_cv_frend" >&6
- cat >>confdefs.h <<_ACEOF
- #define FILE_READEND $rb_cv_frend
- _ACEOF
-@@ -15076,8 +14399,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking whether need to seek between R/W" >&5
--echo $ECHO_N "checking whether need to seek between R/W... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether need to seek between R/W" >&5
-+echo $ECHO_N "checking whether need to seek between R/W... $ECHO_C" >&6
- if test "${rb_cv_need_io_seek_between_rw+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15144,22 +14467,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15172,13 +14486,11 @@
- ( exit $ac_status )
- rb_cv_need_io_seek_between_rw=yes
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_need_io_seek_between_rw" >&5
--echo "${ECHO_T}$rb_cv_need_io_seek_between_rw" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_need_io_seek_between_rw" >&5
-+echo "${ECHO_T}$rb_cv_need_io_seek_between_rw" >&6
- if test "$rb_cv_need_io_seek_between_rw" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define NEED_IO_SEEK_BETWEEN_RW 1
-@@ -15186,8 +14498,8 @@
-
- fi
-
--{ echo "$as_me:$LINENO: checking whether st_ino is huge" >&5
--echo $ECHO_N "checking whether st_ino is huge... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether st_ino is huge" >&5
-+echo $ECHO_N "checking whether st_ino is huge... $ECHO_C" >&6
- if test "${rb_cv_huge_st_ino+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15212,35 +14524,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_huge_st_ino=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_huge_st_ino=no
-+rb_cv_huge_st_ino=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_huge_st_ino" >&5
--echo "${ECHO_T}$rb_cv_huge_st_ino" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_huge_st_ino" >&5
-+echo "${ECHO_T}$rb_cv_huge_st_ino" >&6
- if test $rb_cv_huge_st_ino = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HUGE_ST_INO 1
-@@ -15250,8 +14565,8 @@
-
- if test "$ac_cv_func_sysconf" = yes; then
-
-- { echo "$as_me:$LINENO: checking whether _SC_CLK_TCK is supported" >&5
--echo $ECHO_N "checking whether _SC_CLK_TCK is supported... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether _SC_CLK_TCK is supported" >&5
-+echo $ECHO_N "checking whether _SC_CLK_TCK is supported... $ECHO_C" >&6
- if test "${rb_cv_have_sc_clk_tck+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15272,35 +14587,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_have_sc_clk_tck=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_have_sc_clk_tck=no
-+rb_cv_have_sc_clk_tck=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_have_sc_clk_tck" >&5
--echo "${ECHO_T}$rb_cv_have_sc_clk_tck" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_have_sc_clk_tck" >&5
-+echo "${ECHO_T}$rb_cv_have_sc_clk_tck" >&6
- if test "$rb_cv_have_sc_clk_tck" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define HAVE__SC_CLK_TCK 1
-@@ -15314,8 +14632,8 @@
- m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
- hppa*) rb_cv_stack_grow_dir=+1;;
- esac
--{ echo "$as_me:$LINENO: checking stack growing direction" >&5
--echo $ECHO_N "checking stack growing direction... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking stack growing direction" >&5
-+echo $ECHO_N "checking stack growing direction... $ECHO_C" >&6
- if test "${rb_cv_stack_grow_dir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15348,22 +14666,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15376,13 +14685,11 @@
- ( exit $ac_status )
- rb_cv_stack_grow_dir=+1
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_stack_grow_dir" >&5
--echo "${ECHO_T}$rb_cv_stack_grow_dir" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_stack_grow_dir" >&5
-+echo "${ECHO_T}$rb_cv_stack_grow_dir" >&6
- cat >>confdefs.h <<_ACEOF
- #define STACK_GROW_DIRECTION $rb_cv_stack_grow_dir
- _ACEOF
-@@ -15391,9 +14698,9 @@
- if test x"$enable_pthread" = xyes; then
- for pthread_lib in pthread pthreads c c_r; do
- as_ac_Lib=`echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
--echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6; }
--if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
-+echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -15405,54 +14712,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char pthread_kill ();
- int
- main ()
- {
--return pthread_kill ();
-+pthread_kill ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_Lib=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_Lib=no"
-+eval "$as_ac_Lib=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--ac_res=`eval echo '${'$as_ac_Lib'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- rb_with_pthread=yes
- else
-@@ -15492,9 +14800,9 @@
- for ac_func in nanosleep
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15520,60 +14828,67 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -15584,8 +14899,8 @@
-
- if test x"$ac_cv_func_nanosleep" = xno; then
-
--{ echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
--echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
-+echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6
- if test "${ac_cv_lib_rt_nanosleep+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15598,53 +14913,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char nanosleep ();
- int
- main ()
- {
--return nanosleep ();
-+nanosleep ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_rt_nanosleep=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_rt_nanosleep=no
-+ac_cv_lib_rt_nanosleep=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
--echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
-+echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6
- if test $ac_cv_lib_rt_nanosleep = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBRT 1
-@@ -15669,9 +14986,9 @@
- for ac_func in getcontext setcontext
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15697,60 +15014,67 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -15765,9 +15089,10 @@
- DEFAULT_KCODE="KCODE_NONE"
-
-
--# Check whether --with-default-kcode was given.
-+# Check whether --with-default-kcode or --without-default-kcode was given.
- if test "${with_default_kcode+set}" = set; then
-- withval=$with_default_kcode; case $withval in
-+ withval="$with_default_kcode"
-+ case $withval in
- utf8) DEFAULT_KCODE="KCODE_UTF8";;
- euc) DEFAULT_KCODE="KCODE_EUC";;
- sjis) DEFAULT_KCODE="KCODE_SJIS";;
-@@ -15775,28 +15100,27 @@
- *) { echo "$as_me:$LINENO: WARNING: $withval is not valid kcode; ignored" >&5
- echo "$as_me: WARNING: $withval is not valid kcode; ignored" >&2;};;
- esac
--fi
--
-+fi;
- cat >>confdefs.h <<_ACEOF
- #define DEFAULT_KCODE $DEFAULT_KCODE
- _ACEOF
-
-
-
--# Check whether --with-dln-a-out was given.
-+# Check whether --with-dln-a-out or --without-dln-a-out was given.
- if test "${with_dln_a_out+set}" = set; then
-- withval=$with_dln_a_out;
-+ withval="$with_dln_a_out"
-+
- case $withval in
- yes) with_dln_a_out=yes;;
- *) with_dln_a_out=no;;
- esac
- else
- with_dln_a_out=no
--fi
-+fi;
-
--
--{ echo "$as_me:$LINENO: checking whether ELF binaries are produced" >&5
--echo $ECHO_N "checking whether ELF binaries are produced... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking whether ELF binaries are produced" >&5
-+echo $ECHO_N "checking whether ELF binaries are produced... $ECHO_C" >&6
- if test "${rb_cv_binary_elf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15828,22 +15152,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15856,13 +15171,11 @@
- ( exit $ac_status )
- rb_cv_binary_elf=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_binary_elf" >&5
--echo "${ECHO_T}$rb_cv_binary_elf" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_binary_elf" >&5
-+echo "${ECHO_T}$rb_cv_binary_elf" >&6
-
- if test "$rb_cv_binary_elf" = yes; then
- cat >>confdefs.h <<\_ACEOF
-@@ -15884,13 +15197,13 @@
-
-
- STATIC=
--: ${LIBPATHFLAG=' -L"%s"'}
-+: ${LIBPATHFLAG=' -L%s'}
- : ${PATHFLAG=''}
-
- if test "$with_dln_a_out" != yes; then
- rb_cv_dlopen=unknown
-- { echo "$as_me:$LINENO: checking whether OS depend dynamic link works" >&5
--echo $ECHO_N "checking whether OS depend dynamic link works... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether OS depend dynamic link works" >&5
-+echo $ECHO_N "checking whether OS depend dynamic link works... $ECHO_C" >&6
- if test "$GCC" = yes; then
- case "$target_os" in
- nextstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
-@@ -15949,7 +15262,7 @@
- rb_cv_dlopen=yes ;;
- interix*) : ${LDSHARED="$CC -shared"}
- XLDFLAGS="$XLDFLAGS -Wl,-E"
-- LIBPATHFLAG=" -L'%1\$-s'"
-+ LIBPATHFLAG=" -L%1\$-s"
- rb_cv_dlopen=yes ;;
- freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
- if test "$rb_cv_binary_elf" = yes; then
-@@ -15979,15 +15292,12 @@
- rb_cv_dlopen=yes ;;
- aix*) if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -shared'}
-- DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
-- LDFLAGS='-Wl,-brtl'
-- XLDFLAGS='-Wl,-bE:ruby.imp'
- else
- : ${LDSHARED='/usr/ccs/bin/ld'}
-- DLDFLAGS='-G -eInit_$(TARGET)'
-- LDFLAGS='-brtl'
-- XLDFLAGS='-bE:ruby.imp'
-- fi
-+ fi
-+ DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
-+ LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
-+ XLDFLAGS="${linker_flag}-bE:ruby.imp"
- : ${ARCHFILE="ruby.imp"}
- TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
- TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-@@ -16026,23 +15336,19 @@
- ;;
- *) : ${LDSHARED='ld'} ;;
- esac
-- { echo "$as_me:$LINENO: result: $rb_cv_dlopen" >&5
--echo "${ECHO_T}$rb_cv_dlopen" >&6; }
-+ echo "$as_me:$LINENO: result: $rb_cv_dlopen" >&5
-+echo "${ECHO_T}$rb_cv_dlopen" >&6
-
-- # Check whether --enable-rpath was given.
-+ # Check whether --enable-rpath or --disable-rpath was given.
- if test "${enable_rpath+set}" = set; then
-- enableval=$enable_rpath; enable_rpath=$enableval
-+ enableval="$enable_rpath"
-+ enable_rpath=$enableval
- else
- enable_rpath="$rb_cv_binary_elf"
--fi
--
-+fi;
- if test "$enable_rpath" = yes; then
-- LIBPATHFLAG=" -L'%1\$-s'"
-- if test "$GCC" = yes; then
-- RPATHFLAG=" -Wl,-R'%1\$-s'"
-- else
-- RPATHFLAG=" -R'%1\$-s'"
-- fi
-+ LIBPATHFLAG=" -L%1\$-s"
-+ RPATHFLAG=" ${linker_flag}-R%1\$-s"
- fi
- fi
-
-@@ -16056,8 +15362,8 @@
- if test "$ac_cv_header_a_out_h" = yes; then
- if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
- cat confdefs.h > config.h
-- { echo "$as_me:$LINENO: checking whether matz's dln works" >&5
--echo $ECHO_N "checking whether matz's dln works... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether matz's dln works" >&5
-+echo $ECHO_N "checking whether matz's dln works... $ECHO_C" >&6
- if test "${rb_cv_dln_a_out+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16080,34 +15386,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- rb_cv_dln_a_out=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- rb_cv_dln_a_out=no
-+rb_cv_dln_a_out=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_dln_a_out" >&5
--echo "${ECHO_T}$rb_cv_dln_a_out" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_dln_a_out" >&5
-+echo "${ECHO_T}$rb_cv_dln_a_out" >&6
- if test "$rb_cv_dln_a_out" = yes; then
- dln_a_out_works=yes
- cat >>confdefs.h <<\_ACEOF
-@@ -16174,21 +15483,21 @@
-
- EXTSTATIC=
-
--# Check whether --with-static-linked-ext was given.
-+# Check whether --with-static-linked-ext or --without-static-linked-ext was given.
- if test "${with_static_linked_ext+set}" = set; then
-- withval=$with_static_linked_ext; case $withval in
-+ withval="$with_static_linked_ext"
-+ case $withval in
- yes) STATIC=
- EXTSTATIC=static;;
- *) ;;
- esac
--fi
--
-+fi;
-
- case "$target_os" in
- human*)
-
--{ echo "$as_me:$LINENO: checking for _harderr in -lsignal" >&5
--echo $ECHO_N "checking for _harderr in -lsignal... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for _harderr in -lsignal" >&5
-+echo $ECHO_N "checking for _harderr in -lsignal... $ECHO_C" >&6
- if test "${ac_cv_lib_signal__harderr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16201,53 +15510,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char _harderr ();
- int
- main ()
- {
--return _harderr ();
-+_harderr ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_signal__harderr=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_signal__harderr=no
-+ac_cv_lib_signal__harderr=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_signal__harderr" >&5
--echo "${ECHO_T}$ac_cv_lib_signal__harderr" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_signal__harderr" >&5
-+echo "${ECHO_T}$ac_cv_lib_signal__harderr" >&6
- if test $ac_cv_lib_signal__harderr = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSIGNAL 1
-@@ -16258,8 +15569,8 @@
- fi
-
-
--{ echo "$as_me:$LINENO: checking for hmemset in -lhmem" >&5
--echo $ECHO_N "checking for hmemset in -lhmem... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for hmemset in -lhmem" >&5
-+echo $ECHO_N "checking for hmemset in -lhmem... $ECHO_C" >&6
- if test "${ac_cv_lib_hmem_hmemset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16272,53 +15583,55 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char hmemset ();
- int
- main ()
- {
--return hmemset ();
-+hmemset ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_lib_hmem_hmemset=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_hmem_hmemset=no
-+ac_cv_lib_hmem_hmemset=no
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_hmem_hmemset" >&5
--echo "${ECHO_T}$ac_cv_lib_hmem_hmemset" >&6; }
-+echo "$as_me:$LINENO: result: $ac_cv_lib_hmem_hmemset" >&5
-+echo "${ECHO_T}$ac_cv_lib_hmem_hmemset" >&6
- if test $ac_cv_lib_hmem_hmemset = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBHMEM 1
-@@ -16333,9 +15646,9 @@
- for ac_func in select gettimeofday
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16361,60 +15674,67 @@
-
- #undef $ac_func
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
-+/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
- int
- main ()
- {
--return $ac_func ();
-+return f != $ac_func;
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_var=no"
-+eval "$as_ac_var=no"
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
-- { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -16423,8 +15743,8 @@
- fi
- done
-
-- { echo "$as_me:$LINENO: checking whether PD libc _dtos18 fail to convert big number" >&5
--echo $ECHO_N "checking whether PD libc _dtos18 fail to convert big number... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether PD libc _dtos18 fail to convert big number" >&5
-+echo $ECHO_N "checking whether PD libc _dtos18 fail to convert big number... $ECHO_C" >&6
- if test "${rb_cv_missing__dtos18+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16448,22 +15768,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16476,21 +15787,19 @@
- ( exit $ac_status )
- rb_cv_missing__dtos18=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_missing__dtos18" >&5
--echo "${ECHO_T}$rb_cv_missing__dtos18" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_missing__dtos18" >&5
-+echo "${ECHO_T}$rb_cv_missing__dtos18" >&6
- if test "$rb_cv_missing__dtos18" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define MISSING__DTOS18 1
- _ACEOF
-
- fi
-- { echo "$as_me:$LINENO: checking whether PD libc fconvert fail to round" >&5
--echo $ECHO_N "checking whether PD libc fconvert fail to round... $ECHO_C" >&6; }
-+ echo "$as_me:$LINENO: checking whether PD libc fconvert fail to round" >&5
-+echo $ECHO_N "checking whether PD libc fconvert fail to round... $ECHO_C" >&6
- if test "${rb_cv_missing_fconvert+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16515,22 +15824,13 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16543,23 +15843,23 @@
- ( exit $ac_status )
- rb_cv_missing_fconvert=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
--
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_missing_fconvert" >&5
--echo "${ECHO_T}$rb_cv_missing_fconvert" >&6; }
-+echo "$as_me:$LINENO: result: $rb_cv_missing_fconvert" >&5
-+echo "${ECHO_T}$rb_cv_missing_fconvert" >&6
- if test "$rb_cv_missing_fconvert" = yes; then
- cat >>confdefs.h <<\_ACEOF
- #define MISSING_FCONVERT 1
- _ACEOF
-
- fi
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "x68.o.$ac_objext" | \
-+ *" x68.o.$ac_objext" | \
-+ "x68.o.$ac_objext "* | \
- *" x68.o.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS x68.o.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS x68.o.$ac_objext" ;;
- esac
-
- CFLAGS="$CFLAGS -fansi-only"
-@@ -16569,10 +15869,12 @@
- setup=Setup.x68
- ;;
- os2-emx)
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "os2.$ac_objext" | \
-+ *" os2.$ac_objext" | \
-+ "os2.$ac_objext "* | \
- *" os2.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS os2.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS os2.$ac_objext" ;;
- esac
-
- setup=Setup.emx
-@@ -16633,11 +15935,11 @@
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
- ENABLE_SHARED=no
-
--# Check whether --enable-shared was given.
-+# Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
-- enableval=$enable_shared; enable_shared=$enableval
--fi
--
-+ enableval="$enable_shared"
-+ enable_shared=$enableval
-+fi;
- if test "$enable_shared" = 'yes'; then
- LIBRUBY='$(LIBRUBY_SO)'
- LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
-@@ -16692,12 +15994,7 @@
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
- ;;
- aix*)
-- if test "$GCC" = yes; then
-- LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
-- else
-- LIBRUBY_DLDFLAGS='-G -bnoentry'
-- fi
-- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
-+ LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
- LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
- SOLIBS='-lm -lc'
- ;;
-@@ -16715,31 +16012,27 @@
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
- ;;
- interix*)
-- LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
-+ LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
- ;;
- *)
- ;;
- esac
- fi
- if test "$enable_rpath" = yes; then
-- if test "$GCC" = yes; then
-- LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-- else
-- LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-- fi
-+ LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
- fi
-
--XLDFLAGS="$XLDFLAGS -L."
-+LDFLAGS="-L. $LDFLAGS"
-
-
- RDOCTARGET=""
--# Check whether --enable-install-doc was given.
-+# Check whether --enable-install-doc or --disable-install-doc was given.
- if test "${enable_install_doc+set}" = set; then
-- enableval=$enable_install_doc; install_doc=$enableval
-+ enableval="$enable_install_doc"
-+ install_doc=$enableval
- else
- install_doc=no
--fi
--
-+fi;
- if test "$install_doc" != no; then
- RDOCTARGET="install-doc"
- fi
-@@ -16802,10 +16095,12 @@
- LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
- LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
- fi
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "strftime.$ac_objext" | \
-+ *" strftime.$ac_objext" | \
-+ "strftime.$ac_objext "* | \
- *" strftime.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS strftime.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS strftime.$ac_objext" ;;
- esac
-
- ;;
-@@ -16815,10 +16110,12 @@
- LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
- LIBRUBY='lib$(LIBRUBY_SO).a'
- fi
-- case " $LIBOBJS " in
-+ case $LIBOBJS in
-+ "win32.$ac_objext" | \
-+ *" win32.$ac_objext" | \
-+ "win32.$ac_objext "* | \
- *" win32.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS win32.$ac_objext"
-- ;;
-+ *) LIBOBJS="$LIBOBJS win32.$ac_objext" ;;
- esac
-
- COMMON_LIBS=m
-@@ -16907,13 +16204,13 @@
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-
-
--# Check whether --with-sitedir was given.
-+# Check whether --with-sitedir or --without-sitedir was given.
- if test "${with_sitedir+set}" = set; then
-- withval=$with_sitedir; sitedir=$withval
-+ withval="$with_sitedir"
-+ sitedir=$withval
- else
- sitedir='${prefix}/lib/ruby/site_ruby'
--fi
--
-+fi;
- SITE_DIR=`eval echo \\"${sitedir}\\"`
- case "$target_os" in
- cygwin*|mingw*|*djgpp*|os2-emx*)
-@@ -16979,11 +16276,11 @@
-
-
-
--# Check whether --with-search-path was given.
-+# Check whether --with-search-path or --without-search-path was given.
- if test "${with_search_path+set}" = set; then
-- withval=$with_search_path; search_path=$withval
--fi
--
-+ withval="$with_search_path"
-+ search_path=$withval
-+fi;
- if test "$search_path" != ""; then
- cat >>confdefs.h <<_ACEOF
- #define RUBY_SEARCH_PATH "$search_path"
-@@ -16992,9 +16289,10 @@
- fi
-
-
--# Check whether --with-mantype was given.
-+# Check whether --with-mantype or --without-mantype was given.
- if test "${with_mantype+set}" = set; then
-- withval=$with_mantype;
-+ withval="$with_mantype"
-+
- case "$withval" in
- man|doc)
- MANTYPE=$withval
-@@ -17006,15 +16304,14 @@
- ;;
- esac
-
--fi
--
-+fi;
- if test -z "$MANTYPE"; then
- for ac_prog in nroff awf
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_NROFF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17030,28 +16327,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
--IFS=$as_save_IFS
-
- ;;
- esac
- fi
- NROFF=$ac_cv_path_NROFF
-+
- if test -n "$NROFF"; then
-- { echo "$as_me:$LINENO: result: $NROFF" >&5
--echo "${ECHO_T}$NROFF" >&6; }
-+ echo "$as_me:$LINENO: result: $NROFF" >&5
-+echo "${ECHO_T}$NROFF" >&6
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--
- test -n "$NROFF" && break
- done
- test -n "$NROFF" || NROFF="/bin/false"
-@@ -17072,9 +16368,9 @@
- fi
- : > confdefs.h
-
--ac_config_files="$ac_config_files $FIRSTMAKEFILE"
-+ ac_config_files="$ac_config_files $FIRSTMAKEFILE"
-
--ac_config_files="$ac_config_files Makefile"
-+ ac_config_files="$ac_config_files Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -17094,58 +16390,39 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, we kill variables containing newlines.
-+# So, don't put newlines in cache variables' values.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--(
-- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-- eval ac_val=\$$ac_var
-- case $ac_val in #(
-- *${as_nl}*)
-- case $ac_var in #(
-- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-- esac
-- case $ac_var in #(
-- _ | IFS | as_nl) ;; #(
-- *) $as_unset $ac_var ;;
-- esac ;;
-- esac
-- done
--
-+{
- (set) 2>&1 |
-- case $as_nl`(ac_space=' '; set) 2>&1` in #(
-- *${as_nl}ac_space=\ *)
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-- ;; #(
-+ ;;
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
-- esac |
-- sort
--) |
-+ esac;
-+} |
- sed '
-- /^ac_cv_env_/b end
- t clear
-- :clear
-+ : clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-- :end' >>confcache
--if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-- if test -w "$cache_file"; then
-- test "x$cache_file" != "x/dev/null" &&
-- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ : end' >>confcache
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
-+ if test -w $cache_file; then
-+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
- cat confcache >$cache_file
- else
-- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+ echo "not updating unwritable cache $cache_file"
- fi
- fi
- rm -f confcache
-@@ -17154,48 +16431,63 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/;
-+s/:*\${srcdir}:*/:/;
-+s/:*@srcdir@:*/:/;
-+s/^\([^=]*=[ ]*\):*/\1/;
-+s/:*$//;
-+s/^[^=]*=[ ]*$//;
-+}'
-+fi
-+
- # Transform confdefs.h into DEFS.
- # Protect against shell expansion while executing Makefile rules.
- # Protect against Makefile macro expansion.
- #
- # If the first sed substitution is executed (which looks for macros that
--# take arguments), then branch to the quote section. Otherwise,
-+# take arguments), then we branch to the quote section. Otherwise,
- # look for a macro that doesn't take arguments.
--ac_script='
-+cat >confdef2opt.sed <<\_ACEOF
- t clear
--:clear
--s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
-+: clear
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
- t quote
--s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
- t quote
--b any
--:quote
--s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
--s/\[/\\&/g
--s/\]/\\&/g
--s/\$/$$/g
--H
--:any
--${
-- g
-- s/^\n//
-- s/\n/ /g
-- p
--}
--'
--DEFS=`sed -n "$ac_script" confdefs.h`
-+d
-+: quote
-+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-+s,\[,\\&,g
-+s,\],\\&,g
-+s,\$,$$,g
-+p
-+_ACEOF
-+# We use echo to avoid assuming a particular line-breaking character.
-+# The extra dot is to prevent the shell from consuming trailing
-+# line-breaks from the sub-command output. A line-break within
-+# single-quotes doesn't work because, if this script is created in a
-+# platform that uses two characters for line-breaks (e.g., DOS), tr
-+# would break.
-+ac_LF_and_DOT=`echo; echo .`
-+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-+rm -f confdef2opt.sed
-
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-- ac_i=`echo "$ac_i" | sed "$ac_script"`
-- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-- # will be set to the directory where LIBOBJS objects are built.
-- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+ ac_i=`echo "$ac_i" |
-+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+ # 2. Add them.
-+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -17226,45 +16518,17 @@
- ## M4sh Initialization. ##
- ## --------------------- ##
-
--# Be more Bourne compatible
--DUALCASE=1; export DUALCASE # for MKS sh
-+# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
-- setopt NO_GLOB_SUBST
--else
-- case `(set -o) 2>/dev/null` in
-- *posix*) set -o posix ;;
--esac
--
--fi
--
--
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -17274,43 +16538,8 @@
- fi
-
-
--# IFS
--# We need space, tab and new line, in precisely that order. Quoting is
--# there to prevent editors from complaining about space-tab.
--# (If _AS_PATH_WALK were called with IFS unset, it would disable word
--# splitting by setting IFS to empty value.)
--as_nl='
--'
--IFS=" "" $as_nl"
--
--# Find who we are. Look in the path if we contain no directory separator.
--case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--# We did not find ourselves, most probably we were run as `sh COMMAND'
--# in which case we are not to be found in the path.
--if test "x$as_myself" = x; then
-- as_myself=$0
--fi
--if test ! -f "$as_myself"; then
-- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-- { (exit 1); exit 1; }
--fi
--
- # Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--done
-+$as_unset ENV MAIL MAILPATH
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -17324,19 +16553,18 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1 &&
-- test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -17344,120 +16572,159 @@
-
-
- # Name of the executable.
--as_me=`$as_basename -- "$0" ||
-+as_me=`$as_basename "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{
-- s//\1/
-- q
-- }
-- /^X\/\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\/\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'`
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-
--# CDPATH.
--$as_unset CDPATH
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-
-
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
-+ /*)
-+ if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line after each line using $LINENO; the second 'sed'
-- # does the real work. The second script uses 'N' to pair each
-- # line-number line with the line containing $LINENO, and appends
-- # trailing '-' during substitution so that $LINENO is not a special
-- # case at line end.
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # scripts with optimization help from Paolo Bonzini. Blame Lee
-- # E. McMahon (1931-1989) for sed's syntax. :-)
-- sed -n '
-- p
-- /[$]LINENO/=
-- ' <$as_myself |
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
- sed '
-- s/[$]LINENO.*/&-/
-- t lineno
-- b
-- :lineno
- N
-- :loop
-- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
- t loop
-- s/-\n.*//
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
- ' >$as_me.lineno &&
-- chmod +x "$as_me.lineno" ||
-- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ chmod +x $as_me.lineno ||
-+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensitive to this).
-- . "./$as_me.lineno"
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
- # Exit status is that of the last command.
- exit
- }
-
-
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-- as_dirname=dirname
--else
-- as_dirname=false
--fi
--
--ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
---n*)
-- case `echo 'x\c'` in
-- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-- *) ECHO_C='\c';;
-- esac;;
--*)
-- ECHO_N='-n';;
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1 &&
-- test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
--if test -d conf$$.dir; then
-- rm -f conf$$.dir/conf$$.file
--else
-- rm -f conf$$.dir
-- mkdir conf$$.dir
--fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s='ln -s'
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
--rmdir conf$$.dir 2>/dev/null
-+rm -f conf$$ conf$$.exe conf$$.file
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -17466,28 +16733,7 @@
- as_mkdir_p=false
- fi
-
--if test -x / >/dev/null 2>&1; then
-- as_test_x='test -x'
--else
-- if ls -dL / >/dev/null 2>&1; then
-- as_ls_L_option=L
-- else
-- as_ls_L_option=
-- fi
-- as_test_x='
-- eval sh -c '\''
-- if test -d "$1"; then
-- test -d "$1/.";
-- else
-- case $1 in
-- -*)set "./$1";;
-- esac;
-- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-- ???[sx]*):;;*)false;;esac;fi
-- '\'' sh
-- '
--fi
--as_executable_p=$as_test_x
-+as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -17496,14 +16742,31 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
- exec 6>&1
-
--# Save the log message, to keep $[0] and so on meaningful, and to
-+# Open the log real soon, to keep \$[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.
--ac_log="
-+# values after options handling. Logging --version etc. is OK.
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+} >&5
-+cat >&5 <<_CSEOF
-+
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.61. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17511,18 +16774,30 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--on `(hostname || uname -n) 2>/dev/null | sed 1q`
--"
--
-+_CSEOF
-+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-+echo >&5
- _ACEOF
-
--cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--config_files="$ac_config_files"
-+if test -n "$ac_config_files"; then
-+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-+fi
-
--_ACEOF
-+if test -n "$ac_config_headers"; then
-+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_links"; then
-+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_commands"; then
-+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-+fi
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -17530,7 +16805,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number and configuration settings, then exit
-+ -V, --version print version number, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -17541,21 +16816,19 @@
- $config_files
-
- Report bugs to <bug-autoconf@gnu.org>."
--
- _ACEOF
-+
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.61,
-- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.59,
-+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2006 Free Software Foundation, Inc.
-+Copyright (C) 2003 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--
--ac_pwd='$ac_pwd'
--srcdir='$srcdir'
--INSTALL='$INSTALL'
-+srcdir=$srcdir
-+INSTALL="$INSTALL"
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -17566,42 +16839,60 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "X$1" : 'X\([^=]*\)='`
-- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- *)
-+ -*)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-+ *) # This is not an option, so the user has probably given explicit
-+ # arguments.
-+ ac_option=$1
-+ ac_need_defaults=false;;
- esac
-
- case $ac_option in
- # Handling of the options.
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-- echo "$ac_cs_version"; exit ;;
-- --debug | --debu | --deb | --de | --d | -d )
-+ --version | --vers* | -V )
-+ echo "$ac_cs_version"; exit 0 ;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit 0 ;;
-+ --debug | --d* | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
-- --he | --h | --help | --hel | -h )
-- echo "$ac_cs_usage"; exit ;;
-+ --header | --heade | --head | --hea )
-+ $ac_shift
-+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+ ac_need_defaults=false;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2
-+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1"
-- ac_need_defaults=false ;;
-+ *) ac_config_targets="$ac_config_targets $1" ;;
-
- esac
- shift
-@@ -17617,48 +16908,36 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- CONFIG_SHELL=$SHELL
-- export CONFIG_SHELL
-- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
-- echo "$ac_log"
--} >&5
-
--_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS
-+# INIT-COMMANDS section.
- #
-+
- RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT
-
- _ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
--# Handling of arguments.
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
- for ac_config_target in $ac_config_targets
- do
-- case $ac_config_target in
-- "$FIRSTMAKEFILE") CONFIG_FILES="$CONFIG_FILES $FIRSTMAKEFILE" ;;
-- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--
-+ case "$ac_config_target" in
-+ # Handling of arguments.
-+ "$FIRSTMAKEFILE" ) CONFIG_FILES="$CONFIG_FILES $FIRSTMAKEFILE" ;;
-+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-
--
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used. Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -17668,494 +16947,392 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason against having it here, and in addition,
-+# simply because there is no reason to put it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Hook for its removal unless debugging.
--# Note that there is a small window in which the directory will not be cleaned:
--# after its creation but before its name has been assigned to `$tmp'.
-+# Create a temporary directory, and hook for its removal unless debugging.
- $debug ||
- {
-- tmp=
-- trap 'exit_status=$?
-- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
--' 0
-+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
-+
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./conf$$-$RANDOM
-- (umask 077 && mkdir "$tmp")
-+ tmp=./confstat$$-$RANDOM
-+ (umask 077 && mkdir $tmp)
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--#
--# Set up the sed scripts for CONFIG_FILES section.
--#
--
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
--if test -n "$CONFIG_FILES"; then
--
- _ACEOF
-
--
--
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
-- cat >conf$$subs.sed <<_ACEOF
--SHELL!$SHELL$ac_delim
--PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
--PACKAGE_NAME!$PACKAGE_NAME$ac_delim
--PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
--PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
--PACKAGE_STRING!$PACKAGE_STRING$ac_delim
--PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
--exec_prefix!$exec_prefix$ac_delim
--prefix!$prefix$ac_delim
--program_transform_name!$program_transform_name$ac_delim
--bindir!$bindir$ac_delim
--sbindir!$sbindir$ac_delim
--libexecdir!$libexecdir$ac_delim
--datarootdir!$datarootdir$ac_delim
--datadir!$datadir$ac_delim
--sysconfdir!$sysconfdir$ac_delim
--sharedstatedir!$sharedstatedir$ac_delim
--localstatedir!$localstatedir$ac_delim
--includedir!$includedir$ac_delim
--oldincludedir!$oldincludedir$ac_delim
--docdir!$docdir$ac_delim
--infodir!$infodir$ac_delim
--htmldir!$htmldir$ac_delim
--dvidir!$dvidir$ac_delim
--pdfdir!$pdfdir$ac_delim
--psdir!$psdir$ac_delim
--libdir!$libdir$ac_delim
--localedir!$localedir$ac_delim
--mandir!$mandir$ac_delim
--DEFS!$DEFS$ac_delim
--ECHO_C!$ECHO_C$ac_delim
--ECHO_N!$ECHO_N$ac_delim
--ECHO_T!$ECHO_T$ac_delim
--LIBS!$LIBS$ac_delim
--build_alias!$build_alias$ac_delim
--host_alias!$host_alias$ac_delim
--target_alias!$target_alias$ac_delim
--MAJOR!$MAJOR$ac_delim
--MINOR!$MINOR$ac_delim
--TEENY!$TEENY$ac_delim
--build!$build$ac_delim
--build_cpu!$build_cpu$ac_delim
--build_vendor!$build_vendor$ac_delim
--build_os!$build_os$ac_delim
--host!$host$ac_delim
--host_cpu!$host_cpu$ac_delim
--host_vendor!$host_vendor$ac_delim
--host_os!$host_os$ac_delim
--target!$target$ac_delim
--target_cpu!$target_cpu$ac_delim
--target_vendor!$target_vendor$ac_delim
--target_os!$target_os$ac_delim
--CC!$CC$ac_delim
--CFLAGS!$CFLAGS$ac_delim
--LDFLAGS!$LDFLAGS$ac_delim
--CPPFLAGS!$CPPFLAGS$ac_delim
--ac_ct_CC!$ac_ct_CC$ac_delim
--EXEEXT!$EXEEXT$ac_delim
--OBJEXT!$OBJEXT$ac_delim
--CPP!$CPP$ac_delim
--GREP!$GREP$ac_delim
--EGREP!$EGREP$ac_delim
--GNU_LD!$GNU_LD$ac_delim
--CPPOUTFILE!$CPPOUTFILE$ac_delim
--OUTFLAG!$OUTFLAG$ac_delim
--YACC!$YACC$ac_delim
--YFLAGS!$YFLAGS$ac_delim
--RANLIB!$RANLIB$ac_delim
--AR!$AR$ac_delim
--AS!$AS$ac_delim
--ASFLAGS!$ASFLAGS$ac_delim
--NM!$NM$ac_delim
--WINDRES!$WINDRES$ac_delim
--DLLWRAP!$DLLWRAP$ac_delim
--OBJDUMP!$OBJDUMP$ac_delim
--LN_S!$LN_S$ac_delim
--SET_MAKE!$SET_MAKE$ac_delim
--INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
--INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
--INSTALL_DATA!$INSTALL_DATA$ac_delim
--RM!$RM$ac_delim
--CP!$CP$ac_delim
--MAKEDIRS!$MAKEDIRS$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--ALLOCA!$ALLOCA$ac_delim
--DLDFLAGS!$DLDFLAGS$ac_delim
--ARCH_FLAG!$ARCH_FLAG$ac_delim
--STATIC!$STATIC$ac_delim
--CCDLFLAGS!$CCDLFLAGS$ac_delim
--LDSHARED!$LDSHARED$ac_delim
--DLEXT!$DLEXT$ac_delim
--DLEXT2!$DLEXT2$ac_delim
--LIBEXT!$LIBEXT$ac_delim
--LINK_SO!$LINK_SO$ac_delim
--LIBPATHFLAG!$LIBPATHFLAG$ac_delim
--RPATHFLAG!$RPATHFLAG$ac_delim
--LIBPATHENV!$LIBPATHENV$ac_delim
--_ACEOF
--
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-- break
-- elif $ac_last_try; then
-- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
-- else
-- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-- fi
--done
--
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
-- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-- ac_eof=`expr $ac_eof + 1`
--fi
--
- cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--CEOF$ac_eof
--_ACEOF
--
-
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
-- cat >conf$$subs.sed <<_ACEOF
--TRY_LINK!$TRY_LINK$ac_delim
--STRIP!$STRIP$ac_delim
--EXTSTATIC!$EXTSTATIC$ac_delim
--setup!$setup$ac_delim
--MINIRUBY!$MINIRUBY$ac_delim
--PREP!$PREP$ac_delim
--RUNRUBY!$RUNRUBY$ac_delim
--EXTOUT!$EXTOUT$ac_delim
--ARCHFILE!$ARCHFILE$ac_delim
--RDOCTARGET!$RDOCTARGET$ac_delim
--XCFLAGS!$XCFLAGS$ac_delim
--XLDFLAGS!$XLDFLAGS$ac_delim
--LIBRUBY_LDSHARED!$LIBRUBY_LDSHARED$ac_delim
--LIBRUBY_DLDFLAGS!$LIBRUBY_DLDFLAGS$ac_delim
--RUBY_INSTALL_NAME!$RUBY_INSTALL_NAME$ac_delim
--rubyw_install_name!$rubyw_install_name$ac_delim
--RUBYW_INSTALL_NAME!$RUBYW_INSTALL_NAME$ac_delim
--RUBY_SO_NAME!$RUBY_SO_NAME$ac_delim
--LIBRUBY_A!$LIBRUBY_A$ac_delim
--LIBRUBY_SO!$LIBRUBY_SO$ac_delim
--LIBRUBY_ALIASES!$LIBRUBY_ALIASES$ac_delim
--LIBRUBY!$LIBRUBY$ac_delim
--LIBRUBYARG!$LIBRUBYARG$ac_delim
--LIBRUBYARG_STATIC!$LIBRUBYARG_STATIC$ac_delim
--LIBRUBYARG_SHARED!$LIBRUBYARG_SHARED$ac_delim
--SOLIBS!$SOLIBS$ac_delim
--DLDLIBS!$DLDLIBS$ac_delim
--ENABLE_SHARED!$ENABLE_SHARED$ac_delim
--MAINLIBS!$MAINLIBS$ac_delim
--COMMON_LIBS!$COMMON_LIBS$ac_delim
--COMMON_MACROS!$COMMON_MACROS$ac_delim
--COMMON_HEADERS!$COMMON_HEADERS$ac_delim
--EXPORT_PREFIX!$EXPORT_PREFIX$ac_delim
--MINIOBJS!$MINIOBJS$ac_delim
--MAKEFILES!$MAKEFILES$ac_delim
--arch!$arch$ac_delim
--sitearch!$sitearch$ac_delim
--sitedir!$sitedir$ac_delim
--configure_args!$configure_args$ac_delim
--NROFF!$NROFF$ac_delim
--MANTYPE!$MANTYPE$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
-+#
-+# CONFIG_FILES section.
-+#
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
-- break
-- elif $ac_last_try; then
-- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-- { (exit 1); exit 1; }; }
-- else
-- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "\$CONFIG_FILES"; then
-+ # Protect against being on the right side of a sed subst in config.status.
-+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-+s,@SHELL@,$SHELL,;t t
-+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-+s,@exec_prefix@,$exec_prefix,;t t
-+s,@prefix@,$prefix,;t t
-+s,@program_transform_name@,$program_transform_name,;t t
-+s,@bindir@,$bindir,;t t
-+s,@sbindir@,$sbindir,;t t
-+s,@libexecdir@,$libexecdir,;t t
-+s,@datadir@,$datadir,;t t
-+s,@sysconfdir@,$sysconfdir,;t t
-+s,@sharedstatedir@,$sharedstatedir,;t t
-+s,@localstatedir@,$localstatedir,;t t
-+s,@libdir@,$libdir,;t t
-+s,@includedir@,$includedir,;t t
-+s,@oldincludedir@,$oldincludedir,;t t
-+s,@infodir@,$infodir,;t t
-+s,@mandir@,$mandir,;t t
-+s,@build_alias@,$build_alias,;t t
-+s,@host_alias@,$host_alias,;t t
-+s,@target_alias@,$target_alias,;t t
-+s,@DEFS@,$DEFS,;t t
-+s,@ECHO_C@,$ECHO_C,;t t
-+s,@ECHO_N@,$ECHO_N,;t t
-+s,@ECHO_T@,$ECHO_T,;t t
-+s,@LIBS@,$LIBS,;t t
-+s,@MAJOR@,$MAJOR,;t t
-+s,@MINOR@,$MINOR,;t t
-+s,@TEENY@,$TEENY,;t t
-+s,@build@,$build,;t t
-+s,@build_cpu@,$build_cpu,;t t
-+s,@build_vendor@,$build_vendor,;t t
-+s,@build_os@,$build_os,;t t
-+s,@host@,$host,;t t
-+s,@host_cpu@,$host_cpu,;t t
-+s,@host_vendor@,$host_vendor,;t t
-+s,@host_os@,$host_os,;t t
-+s,@target@,$target,;t t
-+s,@target_cpu@,$target_cpu,;t t
-+s,@target_vendor@,$target_vendor,;t t
-+s,@target_os@,$target_os,;t t
-+s,@CC@,$CC,;t t
-+s,@ac_ct_CC@,$ac_ct_CC,;t t
-+s,@CFLAGS@,$CFLAGS,;t t
-+s,@LDFLAGS@,$LDFLAGS,;t t
-+s,@CPPFLAGS@,$CPPFLAGS,;t t
-+s,@EXEEXT@,$EXEEXT,;t t
-+s,@OBJEXT@,$OBJEXT,;t t
-+s,@CPP@,$CPP,;t t
-+s,@EGREP@,$EGREP,;t t
-+s,@GNU_LD@,$GNU_LD,;t t
-+s,@CPPOUTFILE@,$CPPOUTFILE,;t t
-+s,@OUTFLAG@,$OUTFLAG,;t t
-+s,@YACC@,$YACC,;t t
-+s,@RANLIB@,$RANLIB,;t t
-+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+s,@AR@,$AR,;t t
-+s,@ac_ct_AR@,$ac_ct_AR,;t t
-+s,@AS@,$AS,;t t
-+s,@ac_ct_AS@,$ac_ct_AS,;t t
-+s,@ASFLAGS@,$ASFLAGS,;t t
-+s,@NM@,$NM,;t t
-+s,@ac_ct_NM@,$ac_ct_NM,;t t
-+s,@WINDRES@,$WINDRES,;t t
-+s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
-+s,@DLLWRAP@,$DLLWRAP,;t t
-+s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t
-+s,@OBJDUMP@,$OBJDUMP,;t t
-+s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
-+s,@LN_S@,$LN_S,;t t
-+s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@RM@,$RM,;t t
-+s,@CP@,$CP,;t t
-+s,@MAKEDIRS@,$MAKEDIRS,;t t
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@ALLOCA@,$ALLOCA,;t t
-+s,@DLDFLAGS@,$DLDFLAGS,;t t
-+s,@ARCH_FLAG@,$ARCH_FLAG,;t t
-+s,@STATIC@,$STATIC,;t t
-+s,@CCDLFLAGS@,$CCDLFLAGS,;t t
-+s,@LDSHARED@,$LDSHARED,;t t
-+s,@DLEXT@,$DLEXT,;t t
-+s,@DLEXT2@,$DLEXT2,;t t
-+s,@LIBEXT@,$LIBEXT,;t t
-+s,@LINK_SO@,$LINK_SO,;t t
-+s,@LIBPATHFLAG@,$LIBPATHFLAG,;t t
-+s,@RPATHFLAG@,$RPATHFLAG,;t t
-+s,@LIBPATHENV@,$LIBPATHENV,;t t
-+s,@TRY_LINK@,$TRY_LINK,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@EXTSTATIC@,$EXTSTATIC,;t t
-+s,@setup@,$setup,;t t
-+s,@MINIRUBY@,$MINIRUBY,;t t
-+s,@PREP@,$PREP,;t t
-+s,@RUNRUBY@,$RUNRUBY,;t t
-+s,@EXTOUT@,$EXTOUT,;t t
-+s,@ARCHFILE@,$ARCHFILE,;t t
-+s,@RDOCTARGET@,$RDOCTARGET,;t t
-+s,@XCFLAGS@,$XCFLAGS,;t t
-+s,@XLDFLAGS@,$XLDFLAGS,;t t
-+s,@LIBRUBY_LDSHARED@,$LIBRUBY_LDSHARED,;t t
-+s,@LIBRUBY_DLDFLAGS@,$LIBRUBY_DLDFLAGS,;t t
-+s,@RUBY_INSTALL_NAME@,$RUBY_INSTALL_NAME,;t t
-+s,@rubyw_install_name@,$rubyw_install_name,;t t
-+s,@RUBYW_INSTALL_NAME@,$RUBYW_INSTALL_NAME,;t t
-+s,@RUBY_SO_NAME@,$RUBY_SO_NAME,;t t
-+s,@LIBRUBY_A@,$LIBRUBY_A,;t t
-+s,@LIBRUBY_SO@,$LIBRUBY_SO,;t t
-+s,@LIBRUBY_ALIASES@,$LIBRUBY_ALIASES,;t t
-+s,@LIBRUBY@,$LIBRUBY,;t t
-+s,@LIBRUBYARG@,$LIBRUBYARG,;t t
-+s,@LIBRUBYARG_STATIC@,$LIBRUBYARG_STATIC,;t t
-+s,@LIBRUBYARG_SHARED@,$LIBRUBYARG_SHARED,;t t
-+s,@SOLIBS@,$SOLIBS,;t t
-+s,@DLDLIBS@,$DLDLIBS,;t t
-+s,@ENABLE_SHARED@,$ENABLE_SHARED,;t t
-+s,@MAINLIBS@,$MAINLIBS,;t t
-+s,@COMMON_LIBS@,$COMMON_LIBS,;t t
-+s,@COMMON_MACROS@,$COMMON_MACROS,;t t
-+s,@COMMON_HEADERS@,$COMMON_HEADERS,;t t
-+s,@EXPORT_PREFIX@,$EXPORT_PREFIX,;t t
-+s,@MINIOBJS@,$MINIOBJS,;t t
-+s,@MAKEFILES@,$MAKEFILES,;t t
-+s,@arch@,$arch,;t t
-+s,@sitearch@,$sitearch,;t t
-+s,@sitedir@,$sitedir,;t t
-+s,@configure_args@,$configure_args,;t t
-+s,@NROFF@,$NROFF,;t t
-+s,@MANTYPE@,$MANTYPE,;t t
-+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-+CEOF
-+
-+_ACEOF
-+
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-+ # Split the substitutions into bite-sized pieces for seds with
-+ # small command number limits, like on Digital OSF/1 and HP-UX.
-+ ac_max_sed_lines=48
-+ ac_sed_frag=1 # Number of current file.
-+ ac_beg=1 # First line for current file.
-+ ac_end=$ac_max_sed_lines # Line after last line for current file.
-+ ac_more_lines=:
-+ ac_sed_cmds=
-+ while $ac_more_lines; do
-+ if test $ac_beg -gt 1; then
-+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ else
-+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ fi
-+ if test ! -s $tmp/subs.frag; then
-+ ac_more_lines=false
-+ else
-+ # The purpose of the label and of the branching condition is to
-+ # speed up the sed processing (if there are no `@' at all, there
-+ # is no need to browse any of the substitutions).
-+ # These are the two extra sed commands mentioned above.
-+ (echo ':t
-+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+ else
-+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+ fi
-+ ac_sed_frag=`expr $ac_sed_frag + 1`
-+ ac_beg=$ac_end
-+ ac_end=`expr $ac_end + $ac_max_sed_lines`
-+ fi
-+ done
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds=cat
- fi
--done
--
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
-- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-- ac_eof=`expr $ac_eof + 1`
--fi
-+fi # test -n "$CONFIG_FILES"
-
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
--CEOF$ac_eof
--_ACEOF
--
--
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
--s/:*\$(srcdir):*/:/
--s/:*\${srcdir}:*/:/
--s/:*@srcdir@:*/:/
--s/^\([^=]*=[ ]*\):*/\1/
--s/:*$//
--s/^[^=]*=[ ]*$//
--}'
--fi
--
- cat >>$CONFIG_STATUS <<\_ACEOF
--fi # test -n "$CONFIG_FILES"
--
--
--for ac_tag in :F $CONFIG_FILES
--do
-- case $ac_tag in
-- :[FHLC]) ac_mode=$ac_tag; continue;;
-- esac
-- case $ac_mode$ac_tag in
-- :[FHL]*:*);;
-- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
--echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-- { (exit 1); exit 1; }; };;
-- :[FH]-) ac_tag=-:-;;
-- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-- esac
-- ac_save_IFS=$IFS
-- IFS=:
-- set x $ac_tag
-- IFS=$ac_save_IFS
-- shift
-- ac_file=$1
-- shift
--
-- case $ac_mode in
-- :L) ac_source=$1;;
-- :[FH])
-- ac_file_inputs=
-- for ac_f
-- do
-- case $ac_f in
-- -) ac_f="$tmp/stdin";;
-- *) # Look for the file first in the build tree, then in the source tree
-- # (if the path is not absolute). The absolute path cannot be DOS-style,
-- # because $ac_f cannot contain `:'.
-- test -f "$ac_f" ||
-- case $ac_f in
-- [\\/$]*) false;;
-- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-- esac ||
-- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-- { (exit 1); exit 1; }; };;
-- esac
-- ac_file_inputs="$ac_file_inputs $ac_f"
-- done
--
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- configure_input="Generated from "`IFS=:
-- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-- if test x"$ac_file" != x-; then
-- configure_input="$ac_file. $configure_input"
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- fi
--
-- case $ac_tag in
-- *:-:* | *:-) cat >"$tmp/stdin";;
-- esac
-- ;;
-+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ * ) ac_file_in=$ac_file.in ;;
- esac
-
-- ac_dir=`$as_dirname -- "$ac_file" ||
-+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)[^/].*/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'`
-- { as_dir="$ac_dir"
-- case $as_dir in #(
-- -*) as_dir=./$as_dir;;
-- esac
-- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
- as_dirs=
-- while :; do
-- case $as_dir in #(
-- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-- *) as_qdir=$as_dir;;
-- esac
-- as_dirs="'$as_qdir' $as_dirs"
-- as_dir=`$as_dirname -- "$as_dir" ||
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)[^/].*/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'`
-- test -d "$as_dir" && break
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
- done
-- test -z "$as_dirs" || eval "mkdir $as_dirs"
-- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-+
- ac_builddir=.
-
--case "$ac_dir" in
--.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
--*)
-+if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A ".." for each directory in $ac_dir_suffix.
-- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-- case $ac_top_builddir_sub in
-- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-- esac ;;
--esac
--ac_abs_top_builddir=$ac_pwd
--ac_abs_builddir=$ac_pwd$ac_dir_suffix
--# for backward compatibility:
--ac_top_builddir=$ac_top_build_prefix
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-
- case $srcdir in
-- .) # We are building in place.
-+ .) # No --srcdir option. We are building in place.
- ac_srcdir=.
-- ac_top_srcdir=$ac_top_builddir_sub
-- ac_abs_top_srcdir=$ac_pwd ;;
-- [\\/]* | ?:[\\/]* ) # Absolute name.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir
-- ac_abs_top_srcdir=$srcdir ;;
-- *) # Relative name.
-- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_build_prefix$srcdir
-- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
-- case $ac_mode in
-- :F)
-- #
-- # CONFIG_FILE
-- #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
--_ACEOF
-
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If the template does not know about datarootdir, expand it.
--# FIXME: This hack should be removed a few years after 2.60.
--ac_datarootdir_hack=; ac_datarootdir_seen=
--
--case `sed -n '/datarootdir/ {
-- p
-- q
--}
--/@datadir@/p
--/@docdir@/p
--/@infodir@/p
--/@localedir@/p
--/@mandir@/p
--' $ac_file_inputs` in
--*datarootdir*) ac_datarootdir_seen=yes;;
--*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
--echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
--_ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-- ac_datarootdir_hack='
-- s&@datadir@&$datadir&g
-- s&@docdir@&$docdir&g
-- s&@infodir@&$infodir&g
-- s&@localedir@&$localedir&g
-- s&@mandir@&$mandir&g
-- s&\\\${datarootdir}&$datarootdir&g' ;;
--esac
--_ACEOF
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ if test x"$ac_file" = x-; then
-+ configure_input=
-+ else
-+ configure_input="$ac_file. "
-+ fi
-+ configure_input=$configure_input"Generated from `echo $ac_file_in |
-+ sed 's,.*/,,'` by configure."
-+
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ echo "$f";;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-
--# Neutralize VPATH when `$srcdir' = `.'.
--# Shell code in configure.ac might set extrasub.
--# FIXME: do we really want to maintain this feature?
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
- $extrasub
-@@ -18163,49 +17340,38 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s&@configure_input@&$configure_input&;t t
--s&@top_builddir@&$ac_top_builddir_sub&;t t
--s&@srcdir@&$ac_srcdir&;t t
--s&@abs_srcdir@&$ac_abs_srcdir&;t t
--s&@top_srcdir@&$ac_top_srcdir&;t t
--s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
--s&@builddir@&$ac_builddir&;t t
--s&@abs_builddir@&$ac_abs_builddir&;t t
--s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
--s&@INSTALL@&$ac_INSTALL&;t t
--$ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
--
--test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined. Please make sure it is defined." >&5
--echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined. Please make sure it is defined." >&2;}
-+s,@configure_input@,$configure_input,;t t
-+s,@srcdir@,$ac_srcdir,;t t
-+s,@abs_srcdir@,$ac_abs_srcdir,;t t
-+s,@top_srcdir@,$ac_top_srcdir,;t t
-+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-+s,@builddir@,$ac_builddir,;t t
-+s,@abs_builddir@,$ac_abs_builddir,;t t
-+s,@top_builddir@,$ac_top_builddir,;t t
-+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-+s,@INSTALL@,$ac_INSTALL,;t t
-+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-+ rm -f $tmp/stdin
-+ if test x"$ac_file" != x-; then
-+ mv $tmp/out $ac_file
-+ else
-+ cat $tmp/out
-+ rm -f $tmp/out
-+ fi
-
-- rm -f "$tmp/stdin"
-+ # Run the commands associated with the file.
- case $ac_file in
-- -) cat "$tmp/out"; rm -f "$tmp/out";;
-- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-- esac
-- ;;
--
--
--
-- esac
--
--
-- case $ac_file$ac_mode in
-- "Makefile":F) {
-+ Makefile ) {
-+ sed '/^MISSING/s/\$U\././g' Makefile
- echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
- test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
- sed 's/{\$([^(){}]*)[^{}]*}//g' ${srcdir}/common.mk
--} >> Makefile ;;
--
-+ } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile ;;
- esac
--done # for ac_tag
-+done
-+_ACEOF
-
-+cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-diff -ur ruby-1.8.6/configure.in ruby/configure.in
---- ruby-1.8.6/configure.in 2007-02-28 06:23:42.000000000 -0700
-+++ ruby/configure.in 2007-04-20 01:04:35.000000000 -0600
-@@ -149,6 +149,11 @@
- fi
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
-+if test "$GCC" = yes; then
-+ linker_flag=-Wl,
-+else
-+ linker_flag=
-+fi
-
- RUBY_PROG_GNU_LD
- RUBY_CPPOUTFILE
-@@ -959,7 +964,7 @@
- AC_SUBST(LIBEXT)dnl
-
- STATIC=
--: ${LIBPATHFLAG=' -L"%s"'}
-+: ${LIBPATHFLAG=' -L%s'}
- : ${PATHFLAG=''}
-
- if test "$with_dln_a_out" != yes; then
-@@ -1023,7 +1028,7 @@
- rb_cv_dlopen=yes ;;
- interix*) : ${LDSHARED="$CC -shared"}
- XLDFLAGS="$XLDFLAGS -Wl,-E"
-- LIBPATHFLAG=" -L'%1\$-s'"
-+ LIBPATHFLAG=" -L%1\$-s"
- rb_cv_dlopen=yes ;;
- freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
- if test "$rb_cv_binary_elf" = yes; then
-@@ -1053,15 +1058,12 @@
- rb_cv_dlopen=yes ;;
- aix*) if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -shared'}
-- DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
-- LDFLAGS='-Wl,-brtl'
-- XLDFLAGS='-Wl,-bE:ruby.imp'
- else
- : ${LDSHARED='/usr/ccs/bin/ld'}
-- DLDFLAGS='-G -eInit_$(TARGET)'
-- LDFLAGS='-brtl'
-- XLDFLAGS='-bE:ruby.imp'
-- fi
-+ fi
-+ DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
-+ LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
-+ XLDFLAGS="${linker_flag}-bE:ruby.imp"
- : ${ARCHFILE="ruby.imp"}
- TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
- TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-@@ -1106,12 +1108,8 @@
- [ --disable-rpath embed run path into extension libraries.],
- [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
- if test "$enable_rpath" = yes; then
-- LIBPATHFLAG=" -L'%1\$-s'"
-- if test "$GCC" = yes; then
-- RPATHFLAG=" -Wl,-R'%1\$-s'"
-- else
-- RPATHFLAG=" -R'%1\$-s'"
-- fi
-+ LIBPATHFLAG=" -L%1\$-s"
-+ RPATHFLAG=" ${linker_flag}-R%1\$-s"
- fi
- fi
- AC_SUBST(LINK_SO)
-@@ -1361,12 +1359,7 @@
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
- ;;
- aix*)
-- if test "$GCC" = yes; then
-- LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
-- else
-- LIBRUBY_DLDFLAGS='-G -bnoentry'
-- fi
-- LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
-+ LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
- LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
- SOLIBS='-lm -lc'
- ;;
-@@ -1384,21 +1377,17 @@
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
- ;;
- interix*)
-- LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
-+ LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
- ;;
- *)
- ;;
- esac
- fi
- if test "$enable_rpath" = yes; then
-- if test "$GCC" = yes; then
-- LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-- else
-- LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-- fi
-+ LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
- fi
-
--XLDFLAGS="$XLDFLAGS -L."
-+LDFLAGS="-L. $LDFLAGS"
- AC_SUBST(ARCHFILE)
-
- dnl build rdoc index if requested
-@@ -1650,8 +1639,10 @@
-
- AC_CONFIG_FILES($FIRSTMAKEFILE)
- AC_CONFIG_FILES(Makefile, [{
-+ sed '/^MISSING/s/\$U\././g' Makefile
- echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
- test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
- sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
--} >> Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
-+ } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
-+[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
- AC_OUTPUT
-diff -ur ruby-1.8.6/defines.h ruby/defines.h
---- ruby-1.8.6/defines.h 2007-02-24 10:52:08.000000000 -0700
-+++ ruby/defines.h 2007-02-24 10:49:36.000000000 -0700
-@@ -3,7 +3,7 @@
- defines.h -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Wed May 18 00:21:44 JST 1994
-
- ************************************************/
-diff -ur ruby-1.8.6/dir.c ruby/dir.c
---- ruby-1.8.6/dir.c 2007-02-24 00:55:06.000000000 -0700
-+++ ruby/dir.c 2007-04-23 18:33:09.000000000 -0600
-@@ -2,8 +2,8 @@
-
- dir.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Wed Jan 5 09:51:01 JST 1994
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -958,13 +958,19 @@
- #define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
- #define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
-
-+/*
-+ * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
-+ * is not a directory.
-+ */
-+#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
-+
- /* System call with warning */
- static int
- do_stat(const char *path, struct stat *pst, int flags)
-
- {
- int ret = stat(path, pst);
-- if (ret < 0 && errno != ENOENT)
-+ if (ret < 0 && !to_be_ignored(errno))
- sys_warning(path);
-
- return ret;
-@@ -974,7 +980,7 @@
- do_lstat(const char *path, struct stat *pst, int flags)
- {
- int ret = lstat(path, pst);
-- if (ret < 0 && errno != ENOENT)
-+ if (ret < 0 && !to_be_ignored(errno))
- sys_warning(path);
-
- return ret;
-@@ -984,7 +990,7 @@
- do_opendir(const char *path, int flags)
- {
- DIR *dirp = opendir(path);
-- if (dirp == NULL && errno != ENOENT && errno != ENOTDIR)
-+ if (dirp == NULL && !to_be_ignored(errno))
- sys_warning(path);
-
- return dirp;
-diff -ur ruby-1.8.6/distruby.rb ruby/distruby.rb
---- ruby-1.8.6/distruby.rb 2007-02-28 06:23:42.000000000 -0700
-+++ ruby/distruby.rb 2007-03-20 01:37:34.000000000 -0600
-@@ -7,7 +7,9 @@
- dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
- tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
- end
--tarname = dirname + '.tar.gz'
-+tgzname = dirname + '.tar.gz'
-+tbzname = dirname + '.tar.bz2'
-+zipname = dirname + '.zip'
- repos = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
-
- STDERR.puts 'exporting sources...'
-@@ -21,16 +23,24 @@
- system 'bison', '-y', '-o', 'parse.c', 'parse.y'
- end
-
--STDERR.puts 'generating tarball...'
--system 'tar', 'chofzp', tarname, dirname
--
--open tarname, 'rb' do |fp|
-- require 'digest/md5'
-- require 'digest/sha1'
-- str = fp.read
-- md5 = Digest::MD5.hexdigest str
-- sha = Digest::SHA1.hexdigest str
-- printf "MD5(%s)= %s\nSHA1(%s)= %s\n", tarname, md5, tarname, sha
-+STDERR.puts 'generating tarballs...'
-+ENV['GZIP'] = '-9'
-+system 'tar', 'chofzp', tgzname, dirname
-+system 'tar', 'chojfp', tbzname, dirname
-+system 'zip', '-q9r', zipname, dirname
-+
-+require 'digest/md5'
-+require 'digest/sha2'
-+for name in [tgzname, tbzname, zipname] do
-+ open name, 'rb' do |fp|
-+ str = fp.read
-+ md5 = Digest::MD5.hexdigest str
-+ sha = Digest::SHA256.hexdigest str
-+ printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
-+ name, md5,
-+ name, sha,
-+ name, str.size
-+ end
- end
-
-
-diff -ur ruby-1.8.6/env.h ruby/env.h
---- ruby-1.8.6/env.h 2007-03-03 00:30:46.000000000 -0700
-+++ ruby/env.h 2007-03-03 00:28:54.000000000 -0700
-@@ -3,7 +3,7 @@
- env.h -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Mon Jul 11 11:53:03 JST 1994
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/error.c ruby/error.c
---- ruby-1.8.6/error.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/error.c 2007-04-04 09:42:16.000000000 -0600
-@@ -2,8 +2,8 @@
-
- error.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Mon Aug 9 16:11:34 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -1083,7 +1083,7 @@
- rb_notimplement()
- {
- rb_raise(rb_eNotImpError,
-- "the %s() function is unimplemented on this machine",
-+ "%s() function is unimplemented on this machine",
- rb_id2name(ruby_frame->last_func));
- }
-
-diff -ur ruby-1.8.6/eval.c ruby/eval.c
---- ruby-1.8.6/eval.c 2007-03-11 01:31:53.000000000 -0700
-+++ ruby/eval.c 2007-04-19 21:16:21.000000000 -0600
-@@ -2,8 +2,8 @@
-
- eval.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Thu Jun 10 14:22:17 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -243,8 +243,8 @@
- #define SCOPE_SET(f) (scope_vmode=(f))
- #define SCOPE_TEST(f) (scope_vmode&(f))
-
--VALUE (*ruby_sandbox_save)(struct thread *) = NULL;
--VALUE (*ruby_sandbox_restore)(struct thread *) = NULL;
-+VALUE (*ruby_sandbox_save)_((rb_thread_t));
-+VALUE (*ruby_sandbox_restore)_((rb_thread_t));
- NODE* ruby_current_node;
- int ruby_safe_level = 0;
- /* safe-level:
-@@ -1073,8 +1073,11 @@
- ruby_scope = _scope; \
- scope_vmode = SCOPE_PUBLIC
-
--rb_thread_t curr_thread = 0;
--rb_thread_t main_thread;
-+rb_thread_t rb_curr_thread;
-+rb_thread_t rb_main_thread;
-+#define main_thread rb_main_thread
-+#define curr_thread rb_curr_thread
-+
- static void scope_dup _((struct SCOPE *));
-
- #define POP_SCOPE() \
-@@ -1562,11 +1565,14 @@
- int ex;
- {
- int state;
-- volatile VALUE err = ruby_errinfo;
-+ volatile VALUE errs[2];
-+ int nerr;
-
-+ errs[1] = ruby_errinfo;
- ruby_safe_level = 0;
-- Init_stack((void*)&state);
-+ Init_stack((void *)&state);
- ruby_finalize_0();
-+ errs[0] = ruby_errinfo;
- PUSH_TAG(PROT_NONE);
- PUSH_ITER(ITER_NOT);
- if ((state = EXEC_TAG()) == 0) {
-@@ -1577,21 +1583,25 @@
- ex = state;
- }
- POP_ITER();
-- ruby_errinfo = err;
-+ ruby_errinfo = errs[1];
- ex = error_handle(ex);
- ruby_finalize_1();
- POP_TAG();
-
-- if (err) {
-+ for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
-+ VALUE err = errs[nerr];
-+
-+ if (!RTEST(err)) continue;
-+
- if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
-- VALUE st = rb_iv_get(err, "status");
-- return NUM2INT(st);
-+ return sysexit_status(err);
- }
- else if (rb_obj_is_kind_of(err, rb_eSignal)) {
- VALUE sig = rb_iv_get(err, "signo");
- ruby_default_signal(NUM2INT(sig));
- }
- }
-+
- return ex;
- }
-
-@@ -4998,8 +5008,10 @@
- CHECK_INTS;
- goto redo;
- case TAG_NEXT:
-- state = 0;
-- result = prot_tag->retval;
-+ if (!lambda) {
-+ state = 0;
-+ result = prot_tag->retval;
-+ }
- break;
- case TAG_BREAK:
- if (TAG_DST()) {
-@@ -7017,7 +7029,8 @@
- return Qfalse;
- }
- else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
-- return Qfalse; /* may be overriden by .rb file */
-+ if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
-+ return Qfalse;
- }
- }
- if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
-@@ -8597,6 +8610,7 @@
- proc_jump_error(TAG_RETRY, Qnil); /* xxx */
- JUMP_TAG(state);
- break;
-+ case TAG_NEXT:
- case TAG_BREAK:
- if (!pcall && result != Qundef) {
- proc_jump_error(state, result);
-@@ -9827,8 +9841,6 @@
- # endif
- #endif
-
--/* typedef struct thread * rb_thread_t; */
--
- #define THREAD_RAISED 0x200 /* temporary flag */
- #define THREAD_TERMINATING 0x400 /* persistent flag */
- #define THREAD_NO_ENSURE 0x800 /* persistent flag */
-@@ -9851,7 +9863,7 @@
-
- int safe;
-
-- enum thread_status status;
-+ enum rb_thread_status status;
- int wait_for;
- int fd;
- fd_set readfds;
-@@ -9953,7 +9965,7 @@
-
- static const char *
- thread_status_name(status)
-- enum thread_status status;
-+ enum rb_thread_status status;
- {
- switch (status) {
- case THREAD_RUNNABLE:
-@@ -11011,7 +11023,7 @@
- rb_thread_t th;
- double limit;
- {
-- enum thread_status last_status = THREAD_RUNNABLE;
-+ enum rb_thread_status last_status = THREAD_RUNNABLE;
-
- if (rb_thread_critical) rb_thread_deadlock();
- if (!rb_thread_dead(th)) {
-@@ -11394,7 +11406,7 @@
- VALUE
- rb_thread_stop()
- {
-- enum thread_status last_status = THREAD_RUNNABLE;
-+ enum rb_thread_status last_status = THREAD_RUNNABLE;
-
- rb_thread_critical = 0;
- if (curr_thread == curr_thread->next) {
-@@ -11658,7 +11670,7 @@
- #endif
-
- #define THREAD_ALLOC(th) do {\
-- th = ALLOC(struct thread);\
-+ th = ALLOC(struct rb_thread);\
- \
- th->next = 0;\
- th->prev = 0;\
-@@ -11823,7 +11835,7 @@
- volatile rb_thread_t th_save = th;
- volatile VALUE thread = th->thread;
- struct BLOCK *volatile saved_block = 0;
-- enum thread_status status;
-+ enum rb_thread_status status;
- int state;
-
- if (OBJ_FROZEN(curr_thread->thgroup)) {
-diff -ur ruby-1.8.6/ext/bigdecimal/bigdecimal.c ruby/ext/bigdecimal/bigdecimal.c
---- ruby-1.8.6/ext/bigdecimal/bigdecimal.c 2007-02-27 04:51:55.000000000 -0700
-+++ ruby/ext/bigdecimal/bigdecimal.c 2007-03-13 23:35:31.000000000 -0600
-@@ -3921,7 +3921,7 @@
- /* get integer part */
- i = 0;
- sign = 1;
-- if(ni > 0) {
-+ if(ni >= 0) {
- if(int_chr[0] == '-') {
- sign = -1;
- ++i;
-diff -ur ruby-1.8.6/ext/digest/digest.c ruby/ext/digest/digest.c
---- ruby-1.8.6/ext/digest/digest.c 2007-02-28 11:42:47.000000000 -0700
-+++ ruby/ext/digest/digest.c 2007-02-28 11:30:51.000000000 -0700
-@@ -9,7 +9,7 @@
- Copyright (C) 2001-2006 Akinori MUSHA
-
- $RoughId: digest.c,v 1.16 2001/07/13 15:38:27 knu Exp $
-- $Id$
-+ $Id$
-
- ************************************************/
-
-diff -ur ruby-1.8.6/ext/digest/lib/md5.rb ruby/ext/digest/lib/md5.rb
---- ruby-1.8.6/ext/digest/lib/md5.rb 2007-03-06 03:12:12.000000000 -0700
-+++ ruby/ext/digest/lib/md5.rb 2007-03-06 03:09:51.000000000 -0700
-@@ -1,7 +1,7 @@
- # just for compatibility; requiring "md5" is obsoleted
- #
- # $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
--# $Id$
-+# $Id$
-
- require 'digest/md5'
-
-diff -ur ruby-1.8.6/ext/digest/lib/sha1.rb ruby/ext/digest/lib/sha1.rb
---- ruby-1.8.6/ext/digest/lib/sha1.rb 2007-03-06 03:12:12.000000000 -0700
-+++ ruby/ext/digest/lib/sha1.rb 2007-03-06 03:09:51.000000000 -0700
-@@ -1,7 +1,7 @@
- # just for compatibility; requiring "sha1" is obsoleted
- #
- # $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
--# $Id$
-+# $Id$
-
- require 'digest/sha1'
-
-diff -ur ruby-1.8.6/ext/digest/rmd160/rmd160ossl.c ruby/ext/digest/rmd160/rmd160ossl.c
---- ruby-1.8.6/ext/digest/rmd160/rmd160ossl.c 2007-02-27 04:51:55.000000000 -0700
-+++ ruby/ext/digest/rmd160/rmd160ossl.c 2007-02-27 03:38:32.000000000 -0700
-@@ -1,4 +1,4 @@
--/* $Id$ */
-+/* $Id$ */
-
- #include "defs.h"
- #include "rmd160ossl.h"
-diff -ur ruby-1.8.6/ext/digest/sha1/sha1ossl.c ruby/ext/digest/sha1/sha1ossl.c
---- ruby-1.8.6/ext/digest/sha1/sha1ossl.c 2007-02-27 04:51:55.000000000 -0700
-+++ ruby/ext/digest/sha1/sha1ossl.c 2007-02-27 03:38:32.000000000 -0700
-@@ -1,4 +1,4 @@
--/* $Id$ */
-+/* $Id$ */
-
- #include "defs.h"
- #include "sha1ossl.h"
-diff -ur ruby-1.8.6/ext/dl/dl.c ruby/ext/dl/dl.c
---- ruby-1.8.6/ext/dl/dl.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/ext/dl/dl.c 2007-03-16 06:52:07.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- */
-
- #include <ruby.h>
-@@ -459,7 +459,7 @@
- VALUE val0;
-
- val0 = rb_check_array_type(v);
-- if(NIL_P(TYPE(val0))) {
-+ if(NIL_P(val0)) {
- rb_raise(rb_eDLTypeError, "an array is expected.");
- }
- v = val0;
-diff -ur ruby-1.8.6/ext/dl/ptr.c ruby/ext/dl/ptr.c
---- ruby-1.8.6/ext/dl/ptr.c 2007-03-11 10:24:34.000000000 -0600
-+++ ruby/ext/dl/ptr.c 2007-03-17 00:01:02.000000000 -0600
-@@ -1,5 +1,5 @@
- /* -*- C -*-
-- * $Id$
-+ * $Id$
- */
-
- #include <ruby.h>
-@@ -344,7 +344,7 @@
- n = data->size / sizeof(void*);
- break;
- case 'S': case 's':
-- for (n=0; ((void**)(data->ptr))[n]; n++) {};
-+ n = data->size / sizeof(char*);
- break;
- default:
- n = 0;
-diff -ur ruby-1.8.6/ext/dl/sym.c ruby/ext/dl/sym.c
---- ruby-1.8.6/ext/dl/sym.c 2007-03-11 10:24:34.000000000 -0600
-+++ ruby/ext/dl/sym.c 2007-03-11 10:09:50.000000000 -0600
-@@ -1,5 +1,5 @@
- /* -*- C -*-
-- * $Id$
-+ * $Id$
- */
-
- #include <ruby.h>
-diff -ur ruby-1.8.6/ext/etc/etc.c ruby/ext/etc/etc.c
---- ruby-1.8.6/ext/etc/etc.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/ext/etc/etc.c 2007-03-16 03:35:23.000000000 -0600
-@@ -2,8 +2,8 @@
-
- etc.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Tue Mar 22 18:39:19 JST 1994
-
- ************************************************/
-@@ -337,7 +337,7 @@
- struct group *grp;
-
- rb_secure(4);
-- gid = getgid();
-+ gid = PW_VAL2GID(id);
- grp = getgrgid(gid);
- if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
- return setup_group(grp);
-diff -ur ruby-1.8.6/ext/extmk.rb ruby/ext/extmk.rb
---- ruby-1.8.6/ext/extmk.rb 2007-02-19 02:28:43.000000000 -0700
-+++ ruby/ext/extmk.rb 2007-04-23 07:13:53.000000000 -0600
-@@ -324,6 +324,7 @@
- $ruby = '$(topdir)/miniruby' + EXEEXT
- end
- $ruby << " -I'$(topdir)' -I'$(hdrdir)/lib'"
-+$ruby << " -I'#{$extout}'" if $extout
- $config_h = '$(topdir)/config.h'
-
- MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
-diff -ur ruby-1.8.6/ext/nkf/nkf.c ruby/ext/nkf/nkf.c
---- ruby-1.8.6/ext/nkf/nkf.c 2007-02-27 04:51:55.000000000 -0700
-+++ ruby/ext/nkf/nkf.c 2007-02-27 03:38:32.000000000 -0700
-@@ -3,11 +3,11 @@
- *
- * original nkf2.x is maintained at http://sourceforge.jp/projects/nkf/
- *
-- * $Id$
-+ * $Id$
- *
- */
-
--#define RUBY_NKF_REVISION "$Revision$"
-+#define RUBY_NKF_REVISION "$Revision$"
- #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
-
- #include "ruby.h"
-diff -ur ruby-1.8.6/ext/nkf/nkf-utf8/nkf.c ruby/ext/nkf/nkf-utf8/nkf.c
---- ruby-1.8.6/ext/nkf/nkf-utf8/nkf.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/ext/nkf/nkf-utf8/nkf.c 2007-02-19 01:29:08.000000000 -0700
-@@ -39,7 +39,7 @@
- ** E-Mail: furukawa@tcp-ip.or.jp
- ** \e$B$^$G8fO"Mm$r$*4j$$$7$^$9!#\e(B
- ***********************************************************************/
--/* $Id$ */
-+/* $Id$ */
- #define NKF_VERSION "2.0.8"
- #define NKF_RELEASE_DATE "2007-01-28"
- #include "config.h"
-diff -ur ruby-1.8.6/ext/openssl/extconf.rb ruby/ext/openssl/extconf.rb
---- ruby-1.8.6/ext/openssl/extconf.rb 2007-02-28 06:23:42.000000000 -0700
-+++ ruby/ext/openssl/extconf.rb 2007-02-28 02:36:06.000000000 -0700
-@@ -11,7 +11,7 @@
- (See the file 'LICENCE'.)
-
- = Version
-- $Id$
-+ $Id$
- =end
-
- require "mkmf"
-diff -ur ruby-1.8.6/ext/openssl/ossl_asn1.c ruby/ext/openssl/ossl_asn1.c
---- ruby-1.8.6/ext/openssl/ossl_asn1.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_asn1.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' team members
- * Copyright (C) 2003
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_bn.c ruby/ext/openssl/ossl_bn.c
---- ruby-1.8.6/ext/openssl/ossl_bn.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_bn.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Technorama team <oss-ruby@technorama.net>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_cipher.c ruby/ext/openssl/ossl_cipher.c
---- ruby-1.8.6/ext/openssl/ossl_cipher.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_cipher.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_digest.c ruby/ext/openssl/ossl_digest.c
---- ruby-1.8.6/ext/openssl/ossl_digest.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_digest.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_hmac.c ruby/ext/openssl/ossl_hmac.c
---- ruby-1.8.6/ext/openssl/ossl_hmac.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_hmac.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_pkey.c ruby/ext/openssl/ossl_pkey.c
---- ruby-1.8.6/ext/openssl/ossl_pkey.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_pkey.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_pkey_dh.c ruby/ext/openssl/ossl_pkey_dh.c
---- ruby-1.8.6/ext/openssl/ossl_pkey_dh.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_pkey_dh.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_pkey_dsa.c ruby/ext/openssl/ossl_pkey_dsa.c
---- ruby-1.8.6/ext/openssl/ossl_pkey_dsa.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_pkey_dsa.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_pkey_rsa.c ruby/ext/openssl/ossl_pkey_rsa.c
---- ruby-1.8.6/ext/openssl/ossl_pkey_rsa.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_pkey_rsa.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_rand.c ruby/ext/openssl/ossl_rand.c
---- ruby-1.8.6/ext/openssl/ossl_rand.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_rand.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
-diff -ur ruby-1.8.6/ext/openssl/ossl_ssl.c ruby/ext/openssl/ossl_ssl.c
---- ruby-1.8.6/ext/openssl/ossl_ssl.c 2007-03-11 22:12:32.000000000 -0600
-+++ ruby/ext/openssl/ossl_ssl.c 2007-03-11 22:07:08.000000000 -0600
-@@ -1,5 +1,5 @@
- /*
-- * $Id$
-+ * $Id$
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2000-2002 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
-diff -ur ruby-1.8.6/ext/pty/expect_sample.rb ruby/ext/pty/expect_sample.rb
---- ruby-1.8.6/ext/pty/expect_sample.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/ext/pty/expect_sample.rb 2007-04-16 07:57:13.000000000 -0600
-@@ -37,9 +37,9 @@
- w_f.print "dir\n"
- end
-
-- r_f.expect("> ") do |output|
-+ r_f.expect(/[^\-]> /) do |output|
- for x in output[0].split("\n")
-- if x =~ /(ruby.*\.tar\.gz)/ then
-+ if x =~ /(ruby.*?\.tar\.gz)/ then
- fnames.push $1
- end
- end
-diff -ur ruby-1.8.6/ext/socket/socket.c ruby/ext/socket/socket.c
---- ruby-1.8.6/ext/socket/socket.c 2007-02-19 02:34:19.000000000 -0700
-+++ ruby/ext/socket/socket.c 2007-04-25 07:35:47.000000000 -0600
-@@ -2,8 +2,8 @@
-
- socket.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Thu Mar 31 12:21:29 JST 1994
-
- Copyright (C) 1993-2001 Yukihiro Matsumoto
-@@ -625,7 +625,7 @@
- rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
- }
- #endif
-- if (alen) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
-+ if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
- return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
- else
- return rb_assoc_new(str, Qnil);
-@@ -691,7 +691,7 @@
- return str;
-
- case RECV_IP:
-- if (alen) /* connection-oriented socket may not return a from result */
-+ if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
- addr = ipaddr((struct sockaddr*)buf);
- break;
-
-@@ -1956,7 +1956,7 @@
- #if FD_PASSING_BY_MSG_CONTROL
- struct {
- struct cmsghdr hdr;
-- int fd;
-+ char pad[8+sizeof(int)+8];
- } cmsg;
- #endif
-
-@@ -1986,12 +1986,13 @@
-
- #if FD_PASSING_BY_MSG_CONTROL
- msg.msg_control = (caddr_t)&cmsg;
-- msg.msg_controllen = CMSG_SPACE(sizeof(int));
-+ msg.msg_controllen = CMSG_LEN(sizeof(int));
- msg.msg_flags = 0;
-+ MEMZERO((char*)&cmsg, char, sizeof(cmsg));
- cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
- cmsg.hdr.cmsg_level = SOL_SOCKET;
- cmsg.hdr.cmsg_type = SCM_RIGHTS;
-- cmsg.fd = fd;
-+ *(int *)CMSG_DATA(&cmsg.hdr) = fd;
- #else
- msg.msg_accrights = (caddr_t)&fd;
- msg.msg_accrightslen = sizeof(fd);
-@@ -2037,7 +2038,7 @@
- #if FD_PASSING_BY_MSG_CONTROL
- struct {
- struct cmsghdr hdr;
-- int fd;
-+ char pad[8+sizeof(int)+8];
- } cmsg;
- #endif
-
-@@ -2066,7 +2067,7 @@
- cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
- cmsg.hdr.cmsg_level = SOL_SOCKET;
- cmsg.hdr.cmsg_type = SCM_RIGHTS;
-- cmsg.fd = -1;
-+ *(int *)CMSG_DATA(&cmsg.hdr) = -1;
- #else
- msg.msg_accrights = (caddr_t)&fd;
- msg.msg_accrightslen = sizeof(fd);
-@@ -2079,22 +2080,22 @@
- #if FD_PASSING_BY_MSG_CONTROL
- if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
- rb_raise(rb_eSocket,
-- "file descriptor was not passed (msg_controllen : %d != %d)",
-+ "file descriptor was not passed (msg_controllen=%d, %d expected)",
- msg.msg_controllen, CMSG_SPACE(sizeof(int)));
- }
-- if (cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)) {
-+ if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
- rb_raise(rb_eSocket,
-- "file descriptor was not passed (cmsg_len : %d != %d)",
-- cmsg.hdr.cmsg_len, CMSG_SPACE(0) + sizeof(int));
-+ "file descriptor was not passed (cmsg_len=%d, %d expected)",
-+ cmsg.hdr.cmsg_len, CMSG_LEN(sizeof(int)));
- }
- if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
- rb_raise(rb_eSocket,
-- "file descriptor was not passed (cmsg_level : %d != %d)",
-+ "file descriptor was not passed (cmsg_level=%d, %d expected)",
- cmsg.hdr.cmsg_level, SOL_SOCKET);
- }
- if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
- rb_raise(rb_eSocket,
-- "file descriptor was not passed (cmsg_type : %d != %d)",
-+ "file descriptor was not passed (cmsg_type=%d, %d expected)",
- cmsg.hdr.cmsg_type, SCM_RIGHTS);
- }
- #else
-@@ -2106,7 +2107,7 @@
- #endif
-
- #if FD_PASSING_BY_MSG_CONTROL
-- fd = cmsg.fd;
-+ fd = *(int *)CMSG_DATA(&cmsg.hdr);
- #endif
-
- if (klass == Qnil)
-diff -ur ruby-1.8.6/ext/stringio/stringio.c ruby/ext/stringio/stringio.c
---- ruby-1.8.6/ext/stringio/stringio.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/ext/stringio/stringio.c 2007-04-16 01:48:50.000000000 -0600
-@@ -2,8 +2,8 @@
-
- stringio.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- $RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
- created at: Tue Feb 19 04:10:38 JST 2002
-
-@@ -645,6 +645,9 @@
-
- rb_scan_args(argc, argv, "11", NULL, &whence);
- offset = NUM2LONG(argv[0]);
-+ if (CLOSED(ptr)) {
-+ rb_raise(rb_eIOError, "closed stream");
-+ }
- switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
- case 0:
- break;
-@@ -655,7 +658,7 @@
- offset += RSTRING(ptr->string)->len;
- break;
- default:
-- rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence));
-+ error_inval("invalid whence");
- }
- if (offset < 0) {
- error_inval(0);
-diff -ur ruby-1.8.6/ext/thread/thread.c ruby/ext/thread/thread.c
---- ruby-1.8.6/ext/thread/thread.c 2007-03-03 03:08:06.000000000 -0700
-+++ ruby/ext/thread/thread.c 2007-03-20 16:26:18.000000000 -0600
-@@ -163,13 +163,18 @@
- remove_one(List *list, VALUE value)
- {
- Entry **ref;
-+ Entry *prev;
- Entry *entry;
-
-- for (ref = &list->entries, entry = list->entries;
-+ for (ref = &list->entries, prev = NULL, entry = list->entries;
- entry != NULL;
-- ref = &entry->next, entry = entry->next) {
-+ ref = &entry->next, prev = entry, entry = entry->next) {
- if (entry->value == value) {
- *ref = entry->next;
-+ list->size--;
-+ if (!entry->next) {
-+ list->last_entry = prev;
-+ }
- recycle_entries(list, entry, entry);
- break;
- }
-@@ -390,7 +395,7 @@
- *
- */
-
--static void
-+static VALUE
- lock_mutex(Mutex *mutex)
- {
- VALUE current;
-@@ -405,6 +410,7 @@
- mutex->owner = current;
-
- rb_thread_critical = 0;
-+ return Qnil;
- }
-
- static VALUE
-@@ -429,8 +435,13 @@
- VALUE waking;
-
- if (!RTEST(mutex->owner)) {
-- return Qundef;
-+ rb_raise(rb_eThreadError, "not owner");
- }
-+
-+ if (mutex->owner != rb_thread_current()) {
-+ rb_raise(rb_eThreadError, "not owner");
-+ }
-+
- mutex->owner = Qnil;
- waking = wake_one(&mutex->waiting);
-
-@@ -623,18 +634,12 @@
- wait_condvar(ConditionVariable *condvar, Mutex *mutex)
- {
- rb_thread_critical = 1;
-- if (!RTEST(mutex->owner)) {
-- rb_thread_critical = 0;
-- return;
-- }
-- if (mutex->owner != rb_thread_current()) {
-+ if (rb_thread_current() != mutex->owner) {
- rb_thread_critical = 0;
-- rb_raise(rb_eThreadError, "Not owner");
-+ rb_raise(rb_eThreadError, "not owner of the synchronization mutex");
- }
-- mutex->owner = Qnil;
-- wait_list(&condvar->waiting);
--
-- lock_mutex(mutex);
-+ unlock_mutex_inner(mutex);
-+ rb_ensure(wait_list, (VALUE)&condvar->waiting, lock_mutex, (VALUE)mutex);
- }
-
- static VALUE
-diff -ur ruby-1.8.6/ext/win32ole/win32ole.c ruby/ext/win32ole/win32ole.c
---- ruby-1.8.6/ext/win32ole/win32ole.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/ext/win32ole/win32ole.c 2007-02-19 01:29:08.000000000 -0700
-@@ -12,7 +12,7 @@
- */
-
- /*
-- $Date$
-+ $Date$
- modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
- */
-
-diff -ur ruby-1.8.6/file.c ruby/file.c
---- ruby-1.8.6/file.c 2007-03-04 07:51:31.000000000 -0700
-+++ ruby/file.c 2007-03-24 08:40:08.000000000 -0600
-@@ -2,8 +2,8 @@
-
- file.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Mon Nov 15 12:24:34 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -2433,7 +2433,7 @@
- return last;
- }
-
--char *
-+static char *
- chompdirsep(path)
- const char *path;
- {
-diff -ur ruby-1.8.6/gc.c ruby/gc.c
---- ruby-1.8.6/gc.c 2007-03-03 00:30:46.000000000 -0700
-+++ ruby/gc.c 2007-03-03 00:28:54.000000000 -0700
-@@ -3,7 +3,7 @@
- gc.c -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Tue Oct 5 09:44:46 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/intern.h ruby/intern.h
---- ruby-1.8.6/intern.h 2007-03-11 01:31:53.000000000 -0700
-+++ ruby/intern.h 2007-03-10 20:09:30.000000000 -0700
-@@ -2,8 +2,8 @@
-
- intern.h -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Thu Jun 10 14:22:17 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/io.c ruby/io.c
---- ruby-1.8.6/io.c 2007-02-12 23:21:47.000000000 -0700
-+++ ruby/io.c 2007-04-04 09:42:16.000000000 -0600
-@@ -2,8 +2,8 @@
-
- io.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Fri Oct 15 18:08:59 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -1052,7 +1052,7 @@
- #endif
- }
-
--long
-+static long
- io_fread(ptr, len, fptr)
- char *ptr;
- long len;
-@@ -3026,11 +3026,29 @@
- {
- int modef = rb_io_mode_flags(mode);
- OpenFile *fptr;
--
- #if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
- FILE *f;
-+#else
-+ int pid;
-+#ifdef _WIN32
-+ FILE *fpr, *fpw;
-+#else
-+ int pr[2], pw[2];
-+#endif
-+#endif
-+ volatile int doexec;
-
- if (!pname) pname = StringValueCStr(pstr);
-+ doexec = (strcmp("-", pname) != 0);
-+
-+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32)
-+ if (!doexec) {
-+ rb_raise(rb_eNotImpError,
-+ "fork() function is unimplemented on this machine");
-+ }
-+#endif
-+
-+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
- f = popen(pname, mode);
-
- if (!f) rb_sys_fail(pname);
-@@ -3052,10 +3070,6 @@
- }
- #else
- #ifdef _WIN32
-- int pid;
-- FILE *fpr, *fpw;
--
-- if (!pname) pname = StringValueCStr(pstr);
- retry:
- pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
- if (pid == -1) { /* exec failed */
-@@ -3085,16 +3099,10 @@
- return (VALUE)port;
- }
- #else
-- int pid, pr[2], pw[2];
-- volatile int doexec;
--
-- if (!pname) pname = StringValueCStr(pstr);
--
- if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
- ((modef & FMODE_WRITABLE) && pipe(pw) == -1))
- rb_sys_fail(pname);
-
-- doexec = (strcmp("-", pname) != 0);
- if (!doexec) {
- fflush(stdin); /* is it really needed? */
- fflush(stdout);
-diff -ur ruby-1.8.6/lib/cgi.rb ruby/lib/cgi.rb
---- ruby-1.8.6/lib/cgi.rb 2007-03-12 11:55:03.000000000 -0600
-+++ ruby/lib/cgi.rb 2007-03-12 11:54:39.000000000 -0600
-@@ -284,7 +284,7 @@
- # Standard internet newline sequence
- EOL = CR + LF
-
-- REVISION = '$Id$' #:nodoc:
-+ REVISION = '$Id$' #:nodoc:
-
- NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM)
-
-diff -ur ruby-1.8.6/lib/date/format.rb ruby/lib/date/format.rb
---- ruby-1.8.6/lib/date/format.rb 2007-02-24 01:09:04.000000000 -0700
-+++ ruby/lib/date/format.rb 2007-04-14 18:20:12.000000000 -0600
-@@ -1,5 +1,5 @@
- # format.rb: Written by Tadayoshi Funaba 1999-2007
--# $Id$
-+# $Id$
-
- require 'rational'
-
-@@ -40,16 +40,33 @@
- 'r' => -5*3600, 's' => -6*3600, 't' => -7*3600, 'u' => -8*3600,
- 'v' => -9*3600, 'w' =>-10*3600, 'x' =>-11*3600, 'y' =>-12*3600,
- 'z' => 0*3600,
-- 'utc' => 0*3600, 'wet' => 0*3600, 'bst' => 1*3600, 'wat' => -1*3600,
-- 'at' => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
-- 'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
-- 'ahst'=>-10*3600, 'nt' =>-11*3600, 'idlw'=>-12*3600, 'cet' => 1*3600,
-- 'met' => 1*3600, 'mewt'=> 1*3600, 'mest'=> 2*3600, 'mesz'=> 2*3600,
-- 'swt' => 1*3600, 'sst' => 2*3600, 'fwt' => 1*3600, 'fst' => 2*3600,
-- 'eet' => 2*3600, 'bt' => 3*3600, 'zp4' => 4*3600, 'zp5' => 5*3600,
-- 'zp6' => 6*3600, 'wast'=> 7*3600, 'wadt'=> 8*3600, 'cct' => 8*3600,
-- 'jst' => 9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
-- 'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600,
-+
-+ 'utc' => 0*3600, 'wet' => 0*3600,
-+ 'at' => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
-+ 'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
-+ 'nst' => -(3*3600+1800),
-+ 'ast' => -4*3600, 'clt' => -4*3600,
-+ 'akdt'=> -8*3600, 'ydt' => -8*3600,
-+ 'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
-+ 'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
-+ 'nt' =>-11*3600,
-+ 'idlw'=>-12*3600,
-+ 'bst' => 1*3600, 'cet' => 1*3600, 'fwt' => 1*3600, 'met' => 1*3600,
-+ 'mewt'=> 1*3600, 'mez' => 1*3600, 'swt' => 1*3600, 'wat' => 1*3600,
-+ 'west'=> 1*3600,
-+ 'cest'=> 2*3600, 'eet' => 2*3600, 'fst' => 2*3600, 'mest'=> 2*3600,
-+ 'mesz'=> 2*3600, 'sast'=> 2*3600, 'sst' => 2*3600,
-+ 'bt' => 3*3600, 'eat' => 3*3600, 'eest'=> 3*3600, 'msk' => 3*3600,
-+ 'msd' => 4*3600, 'zp4' => 4*3600,
-+ 'zp5' => 5*3600, 'ist' => (5*3600+1800),
-+ 'zp6' => 6*3600,
-+ 'wast'=> 7*3600,
-+ 'cct' => 8*3600, 'sgt' => 8*3600, 'wadt'=> 8*3600,
-+ 'jst' => 9*3600, 'kst' => 9*3600,
-+ 'east'=> 10*3600, 'gst' => 10*3600,
-+ 'eadt'=> 11*3600,
-+ 'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
-+ 'nzdt'=> 13*3600,
-
- 'afghanistan' => 16200, 'alaskan' => -32400,
- 'arab' => 10800, 'arabian' => 14400,
-@@ -842,23 +859,16 @@
- end
- end
-
-- def self._parse_sla_ja(str, e) # :nodoc:
-- if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
-- s3e(e, $1, $2, $3)
-- true
-- end
-- end
--
-- def self._parse_sla_eu(str, e) # :nodoc:
-- if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
-- s3e(e, $3, $2, $1)
-+ def self._parse_sla(str, e) # :nodoc:
-+ if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
-+ s3e(e, $3, $1, $2)
- true
- end
- end
-
-- def self._parse_sla_us(str, e) # :nodoc:
-- if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
-- s3e(e, $3, $1, $2)
-+ def self._parse_dot(str, e) # :nodoc:
-+ if str.sub!(%r|('?-?\d+)\.\s*('?\d+)[^\d]\s*('?-?\d+)|n, ' ') # '
-+ s3e(e, $1, $2, $3)
- true
- end
- end
-@@ -952,7 +962,7 @@
- private_class_method :_parse_day, :_parse_time, :_parse_beat,
- :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
- :_parse_jis, :_parse_vms,
-- :_parse_sla_ja, :_parse_sla_eu, :_parse_sla_us,
-+ :_parse_sla, :_parse_dot,
- :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
-
- def self._parse(str, comp=false)
-@@ -972,7 +982,8 @@
- _parse_iso(str, e) ||
- _parse_jis(str, e) ||
- _parse_vms(str, e) ||
-- _parse_sla_us(str, e) ||
-+ _parse_sla(str, e) ||
-+ _parse_dot(str, e) ||
- _parse_iso2(str, e) ||
- _parse_year(str, e) ||
- _parse_mon(str, e) ||
-diff -ur ruby-1.8.6/lib/matrix.rb ruby/lib/matrix.rb
---- ruby-1.8.6/lib/matrix.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/lib/matrix.rb 2007-03-19 20:29:09.000000000 -0600
-@@ -590,15 +590,21 @@
- a = src.to_a
-
- for k in 0..size
-- if (akk = a[k][k]) == 0
-- i = k
-- begin
-- Matrix.Raise ErrNotRegular if (i += 1) > size
-- end while a[i][k] == 0
-+ i = k
-+ akk = a[k][k].abs
-+ for j in (k+1)..size
-+ v = a[j][k].abs
-+ if v > akk
-+ i = j
-+ akk = v
-+ end
-+ end
-+ Matrix.Raise ErrNotRegular if akk == 0
-+ if i != k
- a[i], a[k] = a[k], a[i]
- @rows[i], @rows[k] = @rows[k], @rows[i]
-- akk = a[k][k]
- end
-+ akk = a[k][k]
-
- for i in 0 .. size
- next if i == k
-diff -ur ruby-1.8.6/lib/mkmf.rb ruby/lib/mkmf.rb
---- ruby-1.8.6/lib/mkmf.rb 2007-02-28 06:23:42.000000000 -0700
-+++ ruby/lib/mkmf.rb 2007-04-23 07:08:29.000000000 -0600
-@@ -291,7 +291,12 @@
-
- def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
- libpath.map{|x|
-- (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote
-+ case x
-+ when "$(topdir)", /\A\./
-+ LIBPATHFLAG
-+ else
-+ LIBPATHFLAG+RPATHFLAG
-+ end % x.quote
- }.join
- end
-
-@@ -1425,6 +1430,7 @@
- $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
- $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
- $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
-+ $DEFLIBPATH.unshift(".")
- $LIBPATH = []
- $INSTALLFILES = nil
-
-@@ -1516,8 +1522,8 @@
- if CONFIG["DLEXT"] == $OBJEXT
- "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
- else
-- "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$@ " \
-- "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
-+ "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
-+ "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
- end
- LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
- RPATHFLAG = config_string('RPATHFLAG') || ''
-diff -ur ruby-1.8.6/lib/monitor.rb ruby/lib/monitor.rb
---- ruby-1.8.6/lib/monitor.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/lib/monitor.rb 2007-04-18 23:52:49.000000000 -0600
-@@ -105,14 +105,17 @@
- return false
- ensure
- Thread.critical = true
-- if timer && timer.alive?
-- Thread.kill(timer)
-+ begin
-+ if timer && timer.alive?
-+ Thread.kill(timer)
-+ end
-+ if @waiters.include?(Thread.current) # interrupted?
-+ @waiters.delete(Thread.current)
-+ end
-+ @monitor.instance_eval {mon_enter_for_cond(count)}
-+ ensure
-+ Thread.critical = false
- end
-- if @waiters.include?(Thread.current) # interrupted?
-- @waiters.delete(Thread.current)
-- end
-- @monitor.instance_eval {mon_enter_for_cond(count)}
-- Thread.critical = false
- end
- end
-
-@@ -210,6 +213,7 @@
- Thread.critical = true
- mon_acquire(@mon_entering_queue)
- @mon_count += 1
-+ ensure
- Thread.critical = false
- end
-
-@@ -299,8 +303,9 @@
- def mon_exit_for_cond
- count = @mon_count
- @mon_count = 0
-- mon_release
- return count
-+ ensure
-+ mon_release
- end
- end
-
-diff -ur ruby-1.8.6/lib/net/imap.rb ruby/lib/net/imap.rb
---- ruby-1.8.6/lib/net/imap.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/lib/net/imap.rb 2007-04-08 18:29:48.000000000 -0600
-@@ -284,7 +284,11 @@
-
- # Disconnects from the server.
- def disconnect
-- @sock.shutdown unless @usessl
-+ if SSL::SSLSocket === @sock
-+ @sock.io.shutdown
-+ else
-+ @sock.shutdown
-+ end
- @receiver_thread.join
- @sock.close
- end
-diff -ur ruby-1.8.6/lib/net/protocol.rb ruby/lib/net/protocol.rb
---- ruby-1.8.6/lib/net/protocol.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/lib/net/protocol.rb 2007-03-18 20:39:22.000000000 -0600
-@@ -11,7 +11,7 @@
- # modify this program under the same terms as Ruby itself,
- # Ruby Distribute License or GNU General Public License.
- #
--# $Id$
-+# $Id$
- #++
- #
- # WARNING: This file is going to remove.
-@@ -128,9 +128,11 @@
-
- private
-
-+ BUFSIZE = 1024 * 16
-+
- def rbuf_fill
- timeout(@read_timeout) {
-- @rbuf << @io.sysread(1024)
-+ @rbuf << @io.sysread(BUFSIZE)
- }
- end
-
-diff -ur ruby-1.8.6/lib/optparse.rb ruby/lib/optparse.rb
---- ruby-1.8.6/lib/optparse.rb 2007-02-19 23:53:16.000000000 -0700
-+++ ruby/lib/optparse.rb 2007-04-19 21:26:19.000000000 -0600
-@@ -203,7 +203,7 @@
- #
- class OptionParser
- # :stopdoc:
-- RCSID = %w$Id$[1..-1].each {|s| s.freeze}.freeze
-+ RCSID = %w$Id$[1..-1].each {|s| s.freeze}.freeze
- Version = (RCSID[1].split('.').collect {|s| s.to_i}.extend(Comparable).freeze if RCSID[1])
- LastModified = (Time.gm(*RCSID[2, 2].join('-').scan(/\d+/).collect {|s| s.to_i}) if RCSID[2])
- Release = RCSID[2]
-@@ -1077,7 +1077,7 @@
- # directly specified pattern(any object possible to match)
- if !(String === o) and o.respond_to?(:match)
- pattern = notwice(o, pattern, 'pattern')
-- conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
-+ conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
- next
- end
-
-@@ -1090,7 +1090,7 @@
- when CompletingHash
- when nil
- pattern = CompletingHash.new
-- conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
-+ conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
- else
- raise ArgumentError, "argument pattern given twice"
- end
-diff -ur ruby-1.8.6/lib/set.rb ruby/lib/set.rb
---- ruby-1.8.6/lib/set.rb 2007-03-03 09:06:45.000000000 -0700
-+++ ruby/lib/set.rb 2007-03-03 09:06:02.000000000 -0700
-@@ -9,7 +9,7 @@
- # All rights reserved. You can redistribute and/or modify it under the same
- # terms as Ruby.
- #
--# $Id$
-+# $Id$
- #
- # == Overview
- #
-diff -ur ruby-1.8.6/lib/shell/process-controller.rb ruby/lib/shell/process-controller.rb
---- ruby-1.8.6/lib/shell/process-controller.rb 2007-03-06 03:12:12.000000000 -0700
-+++ ruby/lib/shell/process-controller.rb 2007-03-06 02:59:25.000000000 -0700
-@@ -1,8 +1,8 @@
- #
- # shell/process-controller.rb -
- # $Release Version: 0.6.0 $
--# $Revision$
--# $Date$
-+# $Revision$
-+# $Date$
- # by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
- #
- # --
-diff -ur ruby-1.8.6/lib/uri/ftp.rb ruby/lib/uri/ftp.rb
---- ruby-1.8.6/lib/uri/ftp.rb 2007-02-15 04:36:28.000000000 -0700
-+++ ruby/lib/uri/ftp.rb 2007-02-15 04:36:01.000000000 -0700
-@@ -3,7 +3,7 @@
- #
- # Author:: Akira Yamada <akira@ruby-lang.org>
- # License:: You can redistribute it and/or modify it under the same term as Ruby.
--# Revision:: $Id$
-+# Revision:: $Id$
- #
-
- require 'uri/generic'
-diff -ur ruby-1.8.6/lib/xmlrpc/client.rb ruby/lib/xmlrpc/client.rb
---- ruby-1.8.6/lib/xmlrpc/client.rb 2007-02-22 20:47:59.000000000 -0700
-+++ ruby/lib/xmlrpc/client.rb 2007-02-22 20:45:55.000000000 -0700
-@@ -268,7 +268,7 @@
-
-
- = History
-- $Id$
-+ $Id$
-
- =end
-
-diff -ur ruby-1.8.6/lib/xmlrpc/create.rb ruby/lib/xmlrpc/create.rb
---- ruby-1.8.6/lib/xmlrpc/create.rb 2007-02-22 20:47:59.000000000 -0700
-+++ ruby/lib/xmlrpc/create.rb 2007-02-22 20:45:55.000000000 -0700
-@@ -3,7 +3,7 @@
- #
- # Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
- #
--# $Id$
-+# $Id$
- #
-
- require "date"
-diff -ur ruby-1.8.6/lib/yaml/tag.rb ruby/lib/yaml/tag.rb
---- ruby-1.8.6/lib/yaml/tag.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/lib/yaml/tag.rb 2007-04-26 11:06:54.000000000 -0600
-@@ -1,5 +1,5 @@
- # -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
--# $Id$
-+# $Id$
- #
- # = yaml/tag.rb: methods for associating a taguri to a class.
- #
-@@ -51,12 +51,11 @@
- end
-
- class Module
-- # :stopdoc:
-
- # Adds a taguri _tag_ to a class, used when dumping or loading the class
- # in YAML. See YAML::tag_class for detailed information on typing and
- # taguris.
-- def yaml_as( tag, sc = true )
-+ def yaml_as( tag, sc = true ) # :nodoc:
- verbose, $VERBOSE = $VERBOSE, nil
- class_eval <<-"end;", __FILE__, __LINE__+1
- attr_writer :taguri
-@@ -80,12 +79,12 @@
- end
- # Transforms the subclass name into a name suitable for display
- # in a subclassed tag.
-- def yaml_tag_class_name
-+ def yaml_tag_class_name # :nodoc:
- self.name
- end
- # Transforms the subclass name found in the tag into a Ruby
- # constant name.
-- def yaml_tag_read_class( name )
-+ def yaml_tag_read_class( name ) # :nodoc:
- name
- end
- end
-diff -ur ruby-1.8.6/marshal.c ruby/marshal.c
---- ruby-1.8.6/marshal.c 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/marshal.c 2007-03-20 08:08:05.000000000 -0600
-@@ -2,8 +2,8 @@
-
- marshal.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Thu Apr 27 16:30:01 JST 1995
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -373,8 +373,8 @@
- {
- char *path;
-
-- if (FL_TEST(klass, FL_SINGLETON)) {
-- if (check && RCLASS(klass)->m_tbl->num_entries ||
-+ if (check && FL_TEST(klass, FL_SINGLETON)) {
-+ if (RCLASS(klass)->m_tbl->num_entries ||
- (RCLASS(klass)->iv_tbl && RCLASS(klass)->iv_tbl->num_entries > 1)) {
- rb_raise(rb_eTypeError, "singleton can't be dumped");
- }
-@@ -652,13 +652,13 @@
- {
- VALUE v;
-
-- w_class(TYPE_DATA, obj, arg, Qtrue);
- if (!rb_respond_to(obj, s_dump_data)) {
- rb_raise(rb_eTypeError,
- "no marshal_dump is defined for class %s",
- rb_obj_classname(obj));
- }
- v = rb_funcall(obj, s_dump_data, 0);
-+ w_class(TYPE_DATA, obj, arg, Qtrue);
- w_object(v, arg, limit);
- }
- break;
-diff -ur ruby-1.8.6/misc/inf-ruby.el ruby/misc/inf-ruby.el
---- ruby-1.8.6/misc/inf-ruby.el 2007-03-11 04:05:02.000000000 -0600
-+++ ruby/misc/inf-ruby.el 2007-03-11 04:01:15.000000000 -0600
-@@ -1,8 +1,8 @@
- ;;; -*-Emacs-Lisp-*-
- ;;;
--;;; $Id$
-+;;; $Id$
- ;;; $Author$
--;;; $Date$
-+;;; $Date$
- ;;;
- ;;; Inferior Ruby Mode - ruby process in a buffer.
- ;;; adapted from cmuscheme.el
-diff -ur ruby-1.8.6/misc/ruby-mode.el ruby/misc/ruby-mode.el
---- ruby-1.8.6/misc/ruby-mode.el 2007-03-11 04:05:02.000000000 -0600
-+++ ruby/misc/ruby-mode.el 2007-03-11 04:01:15.000000000 -0600
-@@ -2,11 +2,11 @@
- ;;; ruby-mode.el -
- ;;;
- ;;; $Author$
--;;; $Date$
-+;;; $Date$
- ;;; created at: Fri Feb 4 14:49:13 JST 1994
- ;;;
-
--(defconst ruby-mode-revision "$Revision$")
-+(defconst ruby-mode-revision "$Revision$")
-
- (defconst ruby-mode-version
- (progn
-Only in ruby/misc: ruby-style.el
-diff -ur ruby-1.8.6/NEWS ruby/NEWS
---- ruby-1.8.6/NEWS 2007-03-06 03:12:12.000000000 -0700
-+++ ruby/NEWS 2007-03-17 13:28:37.000000000 -0600
-@@ -1,7 +1,7 @@
- = NEWS
-
- This document is a list of user visible feature changes made between
--releases excluding bug fixes.
-+releases except for bug fixes.
-
- Note that each entry is kept so brief that no reason behind or
- reference information is supplied with. For a full list of changes
-@@ -29,6 +29,11 @@
-
- * Support for autoloading.
-
-+ require 'digest'
-+
-+ # autoloads digest/md5
-+ md = Digest::MD5.digest("string")
-+
- * See below for new features and compatibility issues.
-
- * nkf
-@@ -63,9 +68,8 @@
-
- * New digest class methods: file
-
-- * New digest instance methods: clone, reset, new,
-- inspect, digest_length (alias size or length),
-- block_length()
-+ * New digest instance methods: clone, reset, new, inspect,
-+ digest_length (alias size or length), block_length()
-
- * New library: digest/bubblebabble
-
-@@ -77,9 +81,9 @@
-
- * thread
-
-- * Replaced with much faster mutex implementation in C.
-- The former implementation is available with a
-- configure option `--disable-fastthread'.
-+ * Replaced with much faster mutex implementation in C. The former
-+ implementation, which is slow but considered to be stable, is
-+ available with a configure option `--disable-fastthread'.
-
- * webrick
-
-@@ -92,17 +96,17 @@
- * String#intern now raises SecurityError when $SAFE level is greater
- than zero.
-
--* fileutils
-+* date
-
-- * A minor implementation change breaks Rake <=0.7.1.
-- Updating Rake to 0.7.2 fixes the problem.
-+ * Time#to_date and Time#to_datetime are added as private methods.
-+ They cause name conflict error in ActiveSupport 1.4.1 and prior,
-+ which comes with Rails 1.2.2 and prior. Updating ActiveSupport
-+ and/or Rails to the latest versions fixes the problem.
-
- * digest
-
-- * The constructor does no longer take an initial
-- string to feed; digest() and hexdigest() now do,
-- instead. The following examples show how to
-- migrate:
-+ * The constructor does no longer take an initial string to feed.
-+ The following examples show how to migrate:
-
- # Before
- md = Digest::MD5.new("string")
-@@ -113,3 +117,8 @@
- hd = Digest::MD5.new("string").hexdigest
- # After (works with any version)
- hd = Digest::MD5.hexdigest("string")
-+
-+* fileutils
-+
-+ * A minor implementation change breaks Rake <=0.7.1.
-+ Updating Rake to 0.7.2 or higher fixes the problem.
-diff -ur ruby-1.8.6/node.h ruby/node.h
---- ruby-1.8.6/node.h 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/node.h 2007-03-24 08:40:08.000000000 -0600
-@@ -2,8 +2,8 @@
-
- node.h -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Fri May 28 15:14:02 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -338,8 +338,8 @@
- #define NOEX_PUBLIC 0
- #define NOEX_NOSUPER 1
- #define NOEX_PRIVATE 2
--#define NOEX_PROTECTED 4
--#define NOEX_MASK 6
-+#define NOEX_PROTECTED 4
-+#define NOEX_MASK 6
-
- #define NOEX_UNDEF NOEX_NOSUPER
-
-@@ -390,17 +390,17 @@
- typedef jmp_buf rb_jmpbuf_t;
- #endif
-
--enum thread_status {
-+enum rb_thread_status {
- THREAD_TO_KILL,
- THREAD_RUNNABLE,
- THREAD_STOPPED,
- THREAD_KILLED,
- };
-
--typedef struct thread * rb_thread_t;
-+typedef struct rb_thread *rb_thread_t;
-
--struct thread {
-- struct thread *next, *prev;
-+struct rb_thread {
-+ rb_thread_t next, prev;
- rb_jmpbuf_t context;
- #if (defined _WIN32 && !defined _WIN32_WCE) || defined __CYGWIN__
- unsigned long win32_exception_list;
-@@ -441,7 +441,7 @@
-
- int safe;
-
-- enum thread_status status;
-+ enum rb_thread_status status;
- int wait_for;
- int fd;
- fd_set readfds;
-@@ -455,17 +455,17 @@
- int priority;
- VALUE thgroup;
-
-- st_table *locals;
-+ struct st_table *locals;
-
- VALUE thread;
-
- VALUE sandbox;
- };
-
--extern VALUE (*ruby_sandbox_save)(struct thread *);
--extern VALUE (*ruby_sandbox_restore)(struct thread *);
--extern rb_thread_t curr_thread;
--extern rb_thread_t main_thread;
-+extern VALUE (*ruby_sandbox_save)_((rb_thread_t));
-+extern VALUE (*ruby_sandbox_restore)_((rb_thread_t));
-+extern rb_thread_t rb_curr_thread;
-+extern rb_thread_t rb_main_thread;
-
- #if defined(__cplusplus)
- } /* extern "C" { */
-diff -ur ruby-1.8.6/numeric.c ruby/numeric.c
---- ruby-1.8.6/numeric.c 2007-02-22 21:24:16.000000000 -0700
-+++ ruby/numeric.c 2007-02-22 21:04:14.000000000 -0700
-@@ -3,7 +3,7 @@
- numeric.c -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Fri Aug 13 18:33:09 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/object.c ruby/object.c
---- ruby-1.8.6/object.c 2007-03-03 00:09:24.000000000 -0700
-+++ ruby/object.c 2007-03-03 00:07:44.000000000 -0700
-@@ -3,7 +3,7 @@
- object.c -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Thu Jul 15 12:01:24 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/pack.c ruby/pack.c
---- ruby-1.8.6/pack.c 2007-02-28 05:05:21.000000000 -0700
-+++ ruby/pack.c 2007-02-28 05:05:06.000000000 -0700
-@@ -3,7 +3,7 @@
- pack.c -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Thu Feb 10 15:17:05 JST 1994
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/parse.c ruby/parse.c
---- ruby-1.8.6/parse.c 2007-03-12 13:19:06.000000000 -0600
-+++ ruby/parse.c 2007-04-28 13:00:48.000000000 -0600
-@@ -1,9 +1,7 @@
--/* A Bison parser, made by GNU Bison 2.3. */
-+/* A Bison parser, made by GNU Bison 1.875d. */
-
--/* Skeleton implementation for Bison's Yacc-like parsers in C
--
-- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-- Free Software Foundation, Inc.
-+/* Skeleton parser for Yacc-like parsing with Bison,
-+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -17,24 +15,16 @@
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- Boston, MA 02110-1301, USA. */
--
--/* As a special exception, you may create a larger work that contains
-- part or all of the Bison parser skeleton and distribute that work
-- under terms of your choice, so long as that work isn't itself a
-- parser generator using the skeleton or a modified version thereof
-- as a parser skeleton. Alternatively, if you modify or redistribute
-- the parser skeleton itself, you may (at your option) remove this
-- special exception, which will cause the skeleton and the resulting
-- Bison output files to be licensed under the GNU General Public
-- License without this special exception.
-+ Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
-
-- This special exception was added by the Free Software Foundation in
-- version 2.2 of Bison. */
-+/* As a special exception, when this file is copied by Bison into a
-+ Bison output file, you may use that output file without restriction.
-+ This special exception was added by the Free Software Foundation
-+ in version 1.24 of Bison. */
-
--/* C LALR(1) parser skeleton written by Richard Stallman, by
-- simplifying the original so-called "semantic" parser. */
-+/* Written by Richard Stallman by simplifying the original so called
-+ ``semantic'' parser. */
-
- /* All symbols defined below should begin with yy or YY, to avoid
- infringing on user name space. This should be done even for local
-@@ -46,9 +36,6 @@
- /* Identify Bison output. */
- #define YYBISON 1
-
--/* Bison version. */
--#define YYBISON_VERSION "2.3"
--
- /* Skeleton name. */
- #define YYSKELETON_NAME "yacc.c"
-
-@@ -170,7 +157,6 @@
- tLAST_TOKEN = 359
- };
- #endif
--/* Tokens. */
- #define kCLASS 258
- #define kMODULE 259
- #define kDEF 260
-@@ -488,23 +474,16 @@
- # define YYERROR_VERBOSE 0
- #endif
-
--/* Enabling the token table. */
--#ifndef YYTOKEN_TABLE
--# define YYTOKEN_TABLE 0
--#endif
--
--#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
--typedef union YYSTYPE
-+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
- #line 209 "parse.y"
--{
-+typedef union YYSTYPE {
- NODE *node;
- ID id;
- int num;
- struct RVarmap *vars;
--}
--/* Line 187 of yacc.c. */
--#line 507 "parse.c"
-- YYSTYPE;
-+} YYSTYPE;
-+/* Line 191 of yacc.c. */
-+#line 487 "parse.c"
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
- # define YYSTYPE_IS_DECLARED 1
- # define YYSTYPE_IS_TRIVIAL 1
-@@ -515,171 +494,56 @@
- /* Copy the second part of user declarations. */
-
-
--/* Line 216 of yacc.c. */
--#line 520 "parse.c"
-+/* Line 214 of yacc.c. */
-+#line 499 "parse.c"
-
--#ifdef short
--# undef short
--#endif
--
--#ifdef YYTYPE_UINT8
--typedef YYTYPE_UINT8 yytype_uint8;
--#else
--typedef unsigned char yytype_uint8;
--#endif
--
--#ifdef YYTYPE_INT8
--typedef YYTYPE_INT8 yytype_int8;
--#elif (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--typedef signed char yytype_int8;
--#else
--typedef short int yytype_int8;
--#endif
--
--#ifdef YYTYPE_UINT16
--typedef YYTYPE_UINT16 yytype_uint16;
--#else
--typedef unsigned short int yytype_uint16;
--#endif
--
--#ifdef YYTYPE_INT16
--typedef YYTYPE_INT16 yytype_int16;
--#else
--typedef short int yytype_int16;
--#endif
-+#if ! defined (yyoverflow) || YYERROR_VERBOSE
-
--#ifndef YYSIZE_T
--# ifdef __SIZE_TYPE__
--# define YYSIZE_T __SIZE_TYPE__
--# elif defined size_t
--# define YYSIZE_T size_t
--# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
--# define YYSIZE_T size_t
--# else
--# define YYSIZE_T unsigned int
--# endif
--#endif
--
--#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
--
--#ifndef YY_
--# if YYENABLE_NLS
--# if ENABLE_NLS
--# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
--# define YY_(msgid) dgettext ("bison-runtime", msgid)
--# endif
-+# ifndef YYFREE
-+# define YYFREE free
- # endif
--# ifndef YY_
--# define YY_(msgid) msgid
-+# ifndef YYMALLOC
-+# define YYMALLOC malloc
- # endif
--#endif
--
--/* Suppress unused-variable warnings by "using" E. */
--#if ! defined lint || defined __GNUC__
--# define YYUSE(e) ((void) (e))
--#else
--# define YYUSE(e) /* empty */
--#endif
--
--/* Identity function, used to suppress warnings about constant conditions. */
--#ifndef lint
--# define YYID(n) (n)
--#else
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static int
--YYID (int i)
--#else
--static int
--YYID (i)
-- int i;
--#endif
--{
-- return i;
--}
--#endif
--
--#if ! defined yyoverflow || YYERROR_VERBOSE
-
- /* The parser invokes alloca or malloc; define the necessary symbols. */
-
- # ifdef YYSTACK_USE_ALLOCA
- # if YYSTACK_USE_ALLOCA
-+# define YYSTACK_ALLOC alloca
-+# endif
-+# else
-+# if defined (alloca) || defined (_ALLOCA_H)
-+# define YYSTACK_ALLOC alloca
-+# else
- # ifdef __GNUC__
- # define YYSTACK_ALLOC __builtin_alloca
--# elif defined __BUILTIN_VA_ARG_INCR
--# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
--# elif defined _AIX
--# define YYSTACK_ALLOC __alloca
--# elif defined _MSC_VER
--# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
--# define alloca _alloca
--# else
--# define YYSTACK_ALLOC alloca
--# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--# ifndef _STDLIB_H
--# define _STDLIB_H 1
--# endif
--# endif
- # endif
- # endif
- # endif
-
- # ifdef YYSTACK_ALLOC
-- /* Pacify GCC's `empty if-body' warning. */
--# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
--# ifndef YYSTACK_ALLOC_MAXIMUM
-- /* The OS might guarantee only one guard page at the bottom of the stack,
-- and a page size can be as small as 4096 bytes. So we cannot safely
-- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
-- to allow for a few compiler-allocated temporary stack slots. */
--# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
--# endif
-+ /* Pacify GCC's `empty if-body' warning. */
-+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
- # else
--# define YYSTACK_ALLOC YYMALLOC
--# define YYSTACK_FREE YYFREE
--# ifndef YYSTACK_ALLOC_MAXIMUM
--# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
--# endif
--# if (defined __cplusplus && ! defined _STDLIB_H \
-- && ! ((defined YYMALLOC || defined malloc) \
-- && (defined YYFREE || defined free)))
-+# if defined (__STDC__) || defined (__cplusplus)
- # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--# ifndef _STDLIB_H
--# define _STDLIB_H 1
--# endif
--# endif
--# ifndef YYMALLOC
--# define YYMALLOC malloc
--# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
--# endif
--# endif
--# ifndef YYFREE
--# define YYFREE free
--# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--void free (void *); /* INFRINGES ON USER NAME SPACE */
--# endif
-+# define YYSIZE_T size_t
- # endif
-+# define YYSTACK_ALLOC YYMALLOC
-+# define YYSTACK_FREE YYFREE
- # endif
--#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
-
-
--#if (! defined yyoverflow \
-- && (! defined __cplusplus \
-- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-+#if (! defined (yyoverflow) \
-+ && (! defined (__cplusplus) \
-+ || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
-
- /* A type that is properly aligned for any stack member. */
- union yyalloc
- {
-- yytype_int16 yyss;
-+ short int yyss;
- YYSTYPE yyvs;
- };
-
-@@ -689,24 +553,24 @@
- /* The size of an array large to enough to hold all stacks, each with
- N elements. */
- # define YYSTACK_BYTES(N) \
-- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-+ ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
- + YYSTACK_GAP_MAXIMUM)
-
- /* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
- # ifndef YYCOPY
--# if defined __GNUC__ && 1 < __GNUC__
-+# if defined (__GNUC__) && 1 < __GNUC__
- # define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
- # else
- # define YYCOPY(To, From, Count) \
- do \
- { \
-- YYSIZE_T yyi; \
-+ register YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
-- while (YYID (0))
-+ while (0)
- # endif
- # endif
-
-@@ -724,33 +588,39 @@
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
-- while (YYID (0))
-+ while (0)
-+
-+#endif
-
-+#if defined (__STDC__) || defined (__cplusplus)
-+ typedef signed char yysigned_char;
-+#else
-+ typedef short int yysigned_char;
- #endif
-
--/* YYFINAL -- State number of the termination state. */
-+/* YYFINAL -- State number of the termination state. */
- #define YYFINAL 3
- /* YYLAST -- Last index in YYTABLE. */
- #define YYLAST 9550
-
--/* YYNTOKENS -- Number of terminals. */
-+/* YYNTOKENS -- Number of terminals. */
- #define YYNTOKENS 132
--/* YYNNTS -- Number of nonterminals. */
-+/* YYNNTS -- Number of nonterminals. */
- #define YYNNTS 144
--/* YYNRULES -- Number of rules. */
-+/* YYNRULES -- Number of rules. */
- #define YYNRULES 501
--/* YYNRULES -- Number of states. */
-+/* YYNRULES -- Number of states. */
- #define YYNSTATES 895
-
- /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
- #define YYUNDEFTOK 2
- #define YYMAXUTOK 359
-
--#define YYTRANSLATE(YYX) \
-+#define YYTRANSLATE(YYX) \
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
- /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
--static const yytype_uint8 yytranslate[] =
-+static const unsigned char yytranslate[] =
- {
- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 130, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-@@ -793,7 +663,7 @@
- #if YYDEBUG
- /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
--static const yytype_uint16 yyprhs[] =
-+static const unsigned short int yyprhs[] =
- {
- 0, 0, 3, 4, 7, 12, 15, 17, 19, 23,
- 26, 27, 32, 36, 40, 44, 47, 51, 55, 59,
-@@ -848,8 +718,8 @@
- 1541, 1544
- };
-
--/* YYRHS -- A `-1'-separated list of the rules' RHS. */
--static const yytype_int16 yyrhs[] =
-+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-+static const short int yyrhs[] =
- {
- 133, 0, -1, -1, 134, 136, -1, 136, 219, 203,
- 222, -1, 137, 270, -1, 275, -1, 138, -1, 137,
-@@ -1009,7 +879,7 @@
- };
-
- /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
--static const yytype_uint16 yyrline[] =
-+static const unsigned short int yyrline[] =
- {
- 0, 346, 346, 346, 371, 391, 398, 399, 403, 407,
- 413, 413, 417, 421, 428, 433, 437, 446, 455, 467,
-@@ -1065,9 +935,9 @@
- };
- #endif
-
--#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
--/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
-+#if YYDEBUG || YYERROR_VERBOSE
-+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
- static const char *const yytname[] =
- {
- "$end", "error", "$undefined", "kCLASS", "kMODULE", "kDEF", "kUNDEF",
-@@ -1119,7 +989,7 @@
- # ifdef YYPRINT
- /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
--static const yytype_uint16 yytoknum[] =
-+static const unsigned short int yytoknum[] =
- {
- 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
-@@ -1139,7 +1009,7 @@
- # endif
-
- /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
--static const yytype_uint16 yyr1[] =
-+static const unsigned short int yyr1[] =
- {
- 0, 132, 134, 133, 135, 136, 137, 137, 137, 137,
- 139, 138, 138, 138, 138, 138, 138, 138, 138, 138,
-@@ -1195,7 +1065,7 @@
- };
-
- /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
--static const yytype_uint8 yyr2[] =
-+static const unsigned char yyr2[] =
- {
- 0, 2, 0, 2, 4, 2, 1, 1, 3, 2,
- 0, 4, 3, 3, 3, 2, 3, 3, 3, 3,
-@@ -1253,7 +1123,7 @@
- /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
--static const yytype_uint16 yydefact[] =
-+static const unsigned short int yydefact[] =
- {
- 2, 0, 0, 1, 0, 0, 0, 0, 0, 278,
- 0, 0, 490, 299, 302, 0, 323, 324, 325, 326,
-@@ -1347,8 +1217,8 @@
- 245, 0, 250, 501, 251
- };
-
--/* YYDEFGOTO[NTERM-NUM]. */
--static const yytype_int16 yydefgoto[] =
-+/* YYDEFGOTO[NTERM-NUM]. */
-+static const short int yydefgoto[] =
- {
- -1, 1, 2, 377, 378, 62, 63, 424, 255, 64,
- 209, 65, 66, 540, 678, 823, 67, 68, 263, 69,
-@@ -1370,7 +1240,7 @@
- /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
- #define YYPACT_NINF -654
--static const yytype_int16 yypact[] =
-+static const short int yypact[] =
- {
- -654, 73, 2254, -654, 5471, 7939, 8236, 3906, 5121, -654,
- 6810, 6810, 3777, -654, -654, 8038, 5677, 5677, -654, -654,
-@@ -1465,7 +1335,7 @@
- };
-
- /* YYPGOTO[NTERM-NUM]. */
--static const yytype_int16 yypgoto[] =
-+static const short int yypgoto[] =
- {
- -654, -654, -654, -360, 431, -654, 59, -654, -654, 958,
- 44, 23, -654, -569, -654, -654, 1, -6, -183, 22,
-@@ -1489,7 +1359,7 @@
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
- #define YYTABLE_NINF -502
--static const yytype_int16 yytable[] =
-+static const short int yytable[] =
- {
- 235, 235, 188, 188, 235, 523, 390, 238, 238, 225,
- 551, 238, 240, 240, 187, 248, 240, 234, 234, 419,
-@@ -2449,7 +2319,7 @@
- 341
- };
-
--static const yytype_int16 yycheck[] =
-+static const short int yycheck[] =
- {
- 16, 17, 7, 8, 20, 343, 215, 16, 17, 15,
- 370, 20, 16, 17, 7, 22, 20, 16, 17, 247,
-@@ -3411,7 +3281,7 @@
-
- /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
--static const yytype_uint16 yystos[] =
-+static const unsigned short int yystos[] =
- {
- 0, 133, 134, 0, 1, 3, 4, 5, 6, 7,
- 11, 12, 16, 18, 19, 20, 21, 22, 23, 24,
-@@ -3505,6 +3375,22 @@
- 179, 91, 179, 167, 179
- };
-
-+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-+# define YYSIZE_T __SIZE_TYPE__
-+#endif
-+#if ! defined (YYSIZE_T) && defined (size_t)
-+# define YYSIZE_T size_t
-+#endif
-+#if ! defined (YYSIZE_T)
-+# if defined (__STDC__) || defined (__cplusplus)
-+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-+# define YYSIZE_T size_t
-+# endif
-+#endif
-+#if ! defined (YYSIZE_T)
-+# define YYSIZE_T unsigned int
-+#endif
-+
- #define yyerrok (yyerrstatus = 0)
- #define yyclearin (yychar = YYEMPTY)
- #define YYEMPTY (-2)
-@@ -3530,63 +3416,30 @@
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
-- YYPOPSTACK (1); \
-+ YYPOPSTACK; \
- goto yybackup; \
- } \
- else \
-- { \
-- yyerror (YY_("syntax error: cannot back up")); \
-+ { \
-+ yyerror ("syntax error: cannot back up");\
- YYERROR; \
- } \
--while (YYID (0))
--
-+while (0)
-
- #define YYTERROR 1
- #define YYERRCODE 256
-
-+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-+ are run). */
-
--/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-- If N is 0, then set CURRENT to the empty location which ends
-- the previous symbol: RHS[0] (always defined). */
--
--#define YYRHSLOC(Rhs, K) ((Rhs)[K])
- #ifndef YYLLOC_DEFAULT
--# define YYLLOC_DEFAULT(Current, Rhs, N) \
-- do \
-- if (YYID (N)) \
-- { \
-- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
-- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
-- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
-- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
-- } \
-- else \
-- { \
-- (Current).first_line = (Current).last_line = \
-- YYRHSLOC (Rhs, 0).last_line; \
-- (Current).first_column = (Current).last_column = \
-- YYRHSLOC (Rhs, 0).last_column; \
-- } \
-- while (YYID (0))
--#endif
--
--
--/* YY_LOCATION_PRINT -- Print the location on the stream.
-- This macro was not mandated originally: define only if we know
-- we won't break user code: when these are the locations we know. */
--
--#ifndef YY_LOCATION_PRINT
--# if YYLTYPE_IS_TRIVIAL
--# define YY_LOCATION_PRINT(File, Loc) \
-- fprintf (File, "%d.%d-%d.%d", \
-- (Loc).first_line, (Loc).first_column, \
-- (Loc).last_line, (Loc).last_column)
--# else
--# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
--# endif
-+# define YYLLOC_DEFAULT(Current, Rhs, N) \
-+ ((Current).first_line = (Rhs)[1].first_line, \
-+ (Current).first_column = (Rhs)[1].first_column, \
-+ (Current).last_line = (Rhs)[N].last_line, \
-+ (Current).last_column = (Rhs)[N].last_column)
- #endif
-
--
- /* YYLEX -- calling `yylex' with the right arguments. */
-
- #ifdef YYLEX_PARAM
-@@ -3607,96 +3460,42 @@
- do { \
- if (yydebug) \
- YYFPRINTF Args; \
--} while (YYID (0))
-+} while (0)
-
--# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
--do { \
-- if (yydebug) \
-- { \
-- YYFPRINTF (stderr, "%s ", Title); \
-- yy_symbol_print (stderr, \
-- Type, Value); \
-- YYFPRINTF (stderr, "\n"); \
-- } \
--} while (YYID (0))
--
--
--/*--------------------------------.
--| Print this symbol on YYOUTPUT. |
--`--------------------------------*/
--
--/*ARGSUSED*/
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
--#else
--static void
--yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-- FILE *yyoutput;
-- int yytype;
-- YYSTYPE const * const yyvaluep;
--#endif
--{
-- if (!yyvaluep)
-- return;
--# ifdef YYPRINT
-- if (yytype < YYNTOKENS)
-- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
--# else
-- YYUSE (yyoutput);
--# endif
-- switch (yytype)
-- {
-- default:
-- break;
-- }
--}
--
--
--/*--------------------------------.
--| Print this symbol on YYOUTPUT. |
--`--------------------------------*/
--
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
--#else
--static void
--yy_symbol_print (yyoutput, yytype, yyvaluep)
-- FILE *yyoutput;
-- int yytype;
-- YYSTYPE const * const yyvaluep;
--#endif
--{
-- if (yytype < YYNTOKENS)
-- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-- else
-- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-+# define YYDSYMPRINT(Args) \
-+do { \
-+ if (yydebug) \
-+ yysymprint Args; \
-+} while (0)
-
-- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-- YYFPRINTF (yyoutput, ")");
--}
-+# define YYDSYMPRINTF(Title, Token, Value, Location) \
-+do { \
-+ if (yydebug) \
-+ { \
-+ YYFPRINTF (stderr, "%s ", Title); \
-+ yysymprint (stderr, \
-+ Token, Value); \
-+ YYFPRINTF (stderr, "\n"); \
-+ } \
-+} while (0)
-
- /*------------------------------------------------------------------.
- | yy_stack_print -- Print the state stack from its BOTTOM up to its |
- | TOP (included). |
- `------------------------------------------------------------------*/
-
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
-+#if defined (__STDC__) || defined (__cplusplus)
- static void
--yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-+yy_stack_print (short int *bottom, short int *top)
- #else
- static void
- yy_stack_print (bottom, top)
-- yytype_int16 *bottom;
-- yytype_int16 *top;
-+ short int *bottom;
-+ short int *top;
- #endif
- {
- YYFPRINTF (stderr, "Stack now");
-- for (; bottom <= top; ++bottom)
-+ for (/* Nothing. */; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
- YYFPRINTF (stderr, "\n");
- }
-@@ -3705,52 +3504,45 @@
- do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
--} while (YYID (0))
-+} while (0)
-
-
- /*------------------------------------------------.
- | Report that the YYRULE is going to be reduced. |
- `------------------------------------------------*/
-
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
-+#if defined (__STDC__) || defined (__cplusplus)
- static void
--yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-+yy_reduce_print (int yyrule)
- #else
- static void
--yy_reduce_print (yyvsp, yyrule)
-- YYSTYPE *yyvsp;
-+yy_reduce_print (yyrule)
- int yyrule;
- #endif
- {
-- int yynrhs = yyr2[yyrule];
- int yyi;
-- unsigned long int yylno = yyrline[yyrule];
-- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-- yyrule - 1, yylno);
-- /* The symbols being reduced. */
-- for (yyi = 0; yyi < yynrhs; yyi++)
-- {
-- fprintf (stderr, " $%d = ", yyi + 1);
-- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-- &(yyvsp[(yyi + 1) - (yynrhs)])
-- );
-- fprintf (stderr, "\n");
-- }
-+ unsigned int yylno = yyrline[yyrule];
-+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-+ yyrule - 1, yylno);
-+ /* Print the symbols being reduced, and their result. */
-+ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-+ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
- }
-
- # define YY_REDUCE_PRINT(Rule) \
- do { \
- if (yydebug) \
-- yy_reduce_print (yyvsp, Rule); \
--} while (YYID (0))
-+ yy_reduce_print (Rule); \
-+} while (0)
-
- /* Nonzero means print parse trace. It is left uninitialized so that
- multiple parsers can coexist. */
- int yydebug;
- #else /* !YYDEBUG */
- # define YYDPRINTF(Args)
--# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-+# define YYDSYMPRINT(Args)
-+# define YYDSYMPRINTF(Title, Token, Value, Location)
- # define YY_STACK_PRINT(Bottom, Top)
- # define YY_REDUCE_PRINT(Rule)
- #endif /* !YYDEBUG */
-@@ -3765,9 +3557,13 @@
- if the built-in stack extension method is used).
-
- Do not make this value too large; the results are undefined if
-- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
- evaluated with infinite-precision integer arithmetic. */
-
-+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-+# undef YYMAXDEPTH
-+#endif
-+
- #ifndef YYMAXDEPTH
- # define YYMAXDEPTH 10000
- #endif
-@@ -3777,47 +3573,45 @@
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined (__GLIBC__) && defined (_STRING_H)
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
- static YYSIZE_T
-+# if defined (__STDC__) || defined (__cplusplus)
- yystrlen (const char *yystr)
--#else
--static YYSIZE_T
-+# else
- yystrlen (yystr)
-- const char *yystr;
--#endif
-+ const char *yystr;
-+# endif
- {
-- YYSIZE_T yylen;
-- for (yylen = 0; yystr[yylen]; yylen++)
-+ register const char *yys = yystr;
-+
-+ while (*yys++ != '\0')
- continue;
-- return yylen;
-+
-+ return yys - yystr - 1;
- }
- # endif
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
- YYDEST. */
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
- static char *
-+# if defined (__STDC__) || defined (__cplusplus)
- yystpcpy (char *yydest, const char *yysrc)
--#else
--static char *
-+# else
- yystpcpy (yydest, yysrc)
-- char *yydest;
-- const char *yysrc;
--#endif
-+ char *yydest;
-+ const char *yysrc;
-+# endif
- {
-- char *yyd = yydest;
-- const char *yys = yysrc;
-+ register char *yyd = yydest;
-+ register const char *yys = yysrc;
-
- while ((*yyd++ = *yys++) != '\0')
- continue;
-@@ -3827,192 +3621,70 @@
- # endif
- # endif
-
--# ifndef yytnamerr
--/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-- quotes and backslashes, so that it's suitable for yyerror. The
-- heuristic is that double-quoting is unnecessary unless the string
-- contains an apostrophe, a comma, or backslash (other than
-- backslash-backslash). YYSTR is taken from yytname. If YYRES is
-- null, do not copy; instead, return the length of what the result
-- would have been. */
--static YYSIZE_T
--yytnamerr (char *yyres, const char *yystr)
--{
-- if (*yystr == '"')
-- {
-- YYSIZE_T yyn = 0;
-- char const *yyp = yystr;
--
-- for (;;)
-- switch (*++yyp)
-- {
-- case '\'':
-- case ',':
-- goto do_not_strip_quotes;
--
-- case '\\':
-- if (*++yyp != '\\')
-- goto do_not_strip_quotes;
-- /* Fall through. */
-- default:
-- if (yyres)
-- yyres[yyn] = *yyp;
-- yyn++;
-- break;
--
-- case '"':
-- if (yyres)
-- yyres[yyn] = '\0';
-- return yyn;
-- }
-- do_not_strip_quotes: ;
-- }
-+#endif /* !YYERROR_VERBOSE */
-
-- if (! yyres)
-- return yystrlen (yystr);
-+\f
-
-- return yystpcpy (yyres, yystr) - yyres;
--}
--# endif
-+#if YYDEBUG
-+/*--------------------------------.
-+| Print this symbol on YYOUTPUT. |
-+`--------------------------------*/
-
--/* Copy into YYRESULT an error message about the unexpected token
-- YYCHAR while in state YYSTATE. Return the number of bytes copied,
-- including the terminating null byte. If YYRESULT is null, do not
-- copy anything; just return the number of bytes that would be
-- copied. As a special case, return 0 if an ordinary "syntax error"
-- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
-- size calculation. */
--static YYSIZE_T
--yysyntax_error (char *yyresult, int yystate, int yychar)
-+#if defined (__STDC__) || defined (__cplusplus)
-+static void
-+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-+#else
-+static void
-+yysymprint (yyoutput, yytype, yyvaluep)
-+ FILE *yyoutput;
-+ int yytype;
-+ YYSTYPE *yyvaluep;
-+#endif
- {
-- int yyn = yypact[yystate];
-+ /* Pacify ``unused variable'' warnings. */
-+ (void) yyvaluep;
-
-- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-- return 0;
-- else
-+ if (yytype < YYNTOKENS)
- {
-- int yytype = YYTRANSLATE (yychar);
-- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-- YYSIZE_T yysize = yysize0;
-- YYSIZE_T yysize1;
-- int yysize_overflow = 0;
-- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-- int yyx;
--
--# if 0
-- /* This is so xgettext sees the translatable formats that are
-- constructed on the fly. */
-- YY_("syntax error, unexpected %s");
-- YY_("syntax error, unexpected %s, expecting %s");
-- YY_("syntax error, unexpected %s, expecting %s or %s");
-- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-+# ifdef YYPRINT
-+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
- # endif
-- char *yyfmt;
-- char const *yyf;
-- static char const yyunexpected[] = "syntax error, unexpected %s";
-- static char const yyexpecting[] = ", expecting %s";
-- static char const yyor[] = " or %s";
-- char yyformat[sizeof yyunexpected
-- + sizeof yyexpecting - 1
-- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-- * (sizeof yyor - 1))];
-- char const *yyprefix = yyexpecting;
--
-- /* Start YYX at -YYN if negative to avoid negative indexes in
-- YYCHECK. */
-- int yyxbegin = yyn < 0 ? -yyn : 0;
--
-- /* Stay within bounds of both yycheck and yytname. */
-- int yychecklim = YYLAST - yyn + 1;
-- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-- int yycount = 1;
--
-- yyarg[0] = yytname[yytype];
-- yyfmt = yystpcpy (yyformat, yyunexpected);
--
-- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-- {
-- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-- {
-- yycount = 1;
-- yysize = yysize0;
-- yyformat[sizeof yyunexpected - 1] = '\0';
-- break;
-- }
-- yyarg[yycount++] = yytname[yyx];
-- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-- yysize_overflow |= (yysize1 < yysize);
-- yysize = yysize1;
-- yyfmt = yystpcpy (yyfmt, yyprefix);
-- yyprefix = yyor;
-- }
--
-- yyf = YY_(yyformat);
-- yysize1 = yysize + yystrlen (yyf);
-- yysize_overflow |= (yysize1 < yysize);
-- yysize = yysize1;
--
-- if (yysize_overflow)
-- return YYSIZE_MAXIMUM;
-+ }
-+ else
-+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-- if (yyresult)
-- {
-- /* Avoid sprintf, as that infringes on the user's name space.
-- Don't have undefined behavior even if the translation
-- produced a string with the wrong number of "%s"s. */
-- char *yyp = yyresult;
-- int yyi = 0;
-- while ((*yyp = *yyf) != '\0')
-- {
-- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-- {
-- yyp += yytnamerr (yyp, yyarg[yyi++]);
-- yyf += 2;
-- }
-- else
-- {
-- yyp++;
-- yyf++;
-- }
-- }
-- }
-- return yysize;
-+ switch (yytype)
-+ {
-+ default:
-+ break;
- }
-+ YYFPRINTF (yyoutput, ")");
- }
--#endif /* YYERROR_VERBOSE */
--\f
-
-+#endif /* ! YYDEBUG */
- /*-----------------------------------------------.
- | Release the memory associated to this symbol. |
- `-----------------------------------------------*/
-
--/*ARGSUSED*/
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
-+#if defined (__STDC__) || defined (__cplusplus)
- static void
--yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-+yydestruct (int yytype, YYSTYPE *yyvaluep)
- #else
- static void
--yydestruct (yymsg, yytype, yyvaluep)
-- const char *yymsg;
-+yydestruct (yytype, yyvaluep)
- int yytype;
- YYSTYPE *yyvaluep;
- #endif
- {
-- YYUSE (yyvaluep);
--
-- if (!yymsg)
-- yymsg = "Deleting";
-- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-+ /* Pacify ``unused variable'' warnings. */
-+ (void) yyvaluep;
-
- switch (yytype)
- {
-
- default:
-- break;
-+ break;
- }
- }
- \f
-@@ -4020,13 +3692,13 @@
- /* Prevent warnings from -Wmissing-prototypes. */
-
- #ifdef YYPARSE_PARAM
--#if defined __STDC__ || defined __cplusplus
-+# if defined (__STDC__) || defined (__cplusplus)
- int yyparse (void *YYPARSE_PARAM);
--#else
-+# else
- int yyparse ();
--#endif
-+# endif
- #else /* ! YYPARSE_PARAM */
--#if defined __STDC__ || defined __cplusplus
-+#if defined (__STDC__) || defined (__cplusplus)
- int yyparse (void);
- #else
- int yyparse ();
-@@ -4035,10 +3707,10 @@
-
-
-
--/* The look-ahead symbol. */
-+/* The lookahead symbol. */
- int yychar;
-
--/* The semantic value of the look-ahead symbol. */
-+/* The semantic value of the lookahead symbol. */
- YYSTYPE yylval;
-
- /* Number of syntax errors so far. */
-@@ -4051,18 +3723,14 @@
- `----------*/
-
- #ifdef YYPARSE_PARAM
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--int
--yyparse (void *YYPARSE_PARAM)
--#else
--int
--yyparse (YYPARSE_PARAM)
-- void *YYPARSE_PARAM;
--#endif
-+# if defined (__STDC__) || defined (__cplusplus)
-+int yyparse (void *YYPARSE_PARAM)
-+# else
-+int yyparse (YYPARSE_PARAM)
-+ void *YYPARSE_PARAM;
-+# endif
- #else /* ! YYPARSE_PARAM */
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
-+#if defined (__STDC__) || defined (__cplusplus)
- int
- yyparse (void)
- #else
-@@ -4073,19 +3741,13 @@
- #endif
- {
-
-- int yystate;
-- int yyn;
-+ register int yystate;
-+ register int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
-- /* Look-ahead token as an internal (translated) token number. */
-+ /* Lookahead token as an internal (translated) token number. */
- int yytoken = 0;
--#if YYERROR_VERBOSE
-- /* Buffer for error messages, and its allocated size. */
-- char yymsgbuf[128];
-- char *yymsg = yymsgbuf;
-- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
--#endif
-
- /* Three stacks and their tools:
- `yyss': related to states,
-@@ -4096,18 +3758,18 @@
- to reallocate them elsewhere. */
-
- /* The state stack. */
-- yytype_int16 yyssa[YYINITDEPTH];
-- yytype_int16 *yyss = yyssa;
-- yytype_int16 *yyssp;
-+ short int yyssa[YYINITDEPTH];
-+ short int *yyss = yyssa;
-+ register short int *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
-- YYSTYPE *yyvsp;
-+ register YYSTYPE *yyvsp;
-
-
-
--#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-+#define YYPOPSTACK (yyvsp--, yyssp--)
-
- YYSIZE_T yystacksize = YYINITDEPTH;
-
-@@ -4116,9 +3778,9 @@
- YYSTYPE yyval;
-
-
-- /* The number of symbols on the RHS of the reduced rule.
-- Keep to zero when no symbol should be popped. */
-- int yylen = 0;
-+ /* When reducing, the number of symbols on the RHS of the reduced
-+ rule. */
-+ int yylen;
-
- YYDPRINTF ((stderr, "Starting parse\n"));
-
-@@ -4135,6 +3797,7 @@
- yyssp = yyss;
- yyvsp = yyvs;
-
-+
- goto yysetstate;
-
- /*------------------------------------------------------------.
-@@ -4142,7 +3805,8 @@
- `------------------------------------------------------------*/
- yynewstate:
- /* In all cases, when you get here, the value and location stacks
-- have just been pushed. So pushing a state here evens the stacks. */
-+ have just been pushed. so pushing a state here evens the stacks.
-+ */
- yyssp++;
-
- yysetstate:
-@@ -4155,18 +3819,18 @@
-
- #ifdef yyoverflow
- {
-- /* Give user a chance to reallocate the stack. Use copies of
-+ /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
-- yytype_int16 *yyss1 = yyss;
-+ short int *yyss1 = yyss;
-
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
-- yyoverflow (YY_("memory exhausted"),
-+ yyoverflow ("parser stack overflow",
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
-
-@@ -4177,21 +3841,21 @@
- }
- #else /* no yyoverflow */
- # ifndef YYSTACK_RELOCATE
-- goto yyexhaustedlab;
-+ goto yyoverflowlab;
- # else
- /* Extend the stack our own way. */
- if (YYMAXDEPTH <= yystacksize)
-- goto yyexhaustedlab;
-+ goto yyoverflowlab;
- yystacksize *= 2;
- if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
-
- {
-- yytype_int16 *yyss1 = yyss;
-+ short int *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
-- goto yyexhaustedlab;
-+ goto yyoverflowlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
-@@ -4222,17 +3886,19 @@
- `-----------*/
- yybackup:
-
-- /* Do appropriate processing given the current state. Read a
-- look-ahead token if we need one and don't already have one. */
-+/* Do appropriate processing given the current state. */
-+/* Read a lookahead token if we need one and don't already have one. */
-+/* yyresume: */
-+
-+ /* First try to decide what to do without reference to lookahead token. */
-
-- /* First try to decide what to do without reference to look-ahead token. */
- yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
- goto yydefault;
-
-- /* Not known => get a look-ahead token if don't already have one. */
-+ /* Not known => get a lookahead token if don't already have one. */
-
-- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
-+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
- if (yychar == YYEMPTY)
- {
- YYDPRINTF ((stderr, "Reading a token: "));
-@@ -4247,7 +3913,7 @@
- else
- {
- yytoken = YYTRANSLATE (yychar);
-- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-+ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
- }
-
- /* If the proper action on seeing token YYTOKEN is to reduce or to
-@@ -4267,21 +3933,22 @@
- if (yyn == YYFINAL)
- YYACCEPT;
-
-- /* Count tokens shifted since error; after three, turn off error
-- status. */
-- if (yyerrstatus)
-- yyerrstatus--;
--
-- /* Shift the look-ahead token. */
-- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-+ /* Shift the lookahead token. */
-+ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-- /* Discard the shifted token unless it is eof. */
-+ /* Discard the token being shifted unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
-- yystate = yyn;
- *++yyvsp = yylval;
-
-+
-+ /* Count tokens shifted since error; after three, turn off error
-+ status. */
-+ if (yyerrstatus)
-+ yyerrstatus--;
-+
-+ yystate = yyn;
- goto yynewstate;
-
-
-@@ -4323,93 +3990,93 @@
- top_local_init();
- if (ruby_class == rb_cObject) class_nest = 0;
- else class_nest = 1;
-- }
-+ ;}
- break;
-
- case 3:
- #line 353 "parse.y"
- {
-- if ((yyvsp[(2) - (2)].node) && !compile_for_eval) {
-+ if (yyvsp[0].node && !compile_for_eval) {
- /* last expression should not be void */
-- if (nd_type((yyvsp[(2) - (2)].node)) != NODE_BLOCK) void_expr((yyvsp[(2) - (2)].node));
-+ if (nd_type(yyvsp[0].node) != NODE_BLOCK) void_expr(yyvsp[0].node);
- else {
-- NODE *node = (yyvsp[(2) - (2)].node);
-+ NODE *node = yyvsp[0].node;
- while (node->nd_next) {
- node = node->nd_next;
- }
- void_expr(node->nd_head);
- }
- }
-- ruby_eval_tree = block_append(ruby_eval_tree, (yyvsp[(2) - (2)].node));
-+ ruby_eval_tree = block_append(ruby_eval_tree, yyvsp[0].node);
- top_local_setup();
- class_nest = 0;
-- }
-+ ;}
- break;
-
- case 4:
- #line 375 "parse.y"
- {
-- (yyval.node) = (yyvsp[(1) - (4)].node);
-- if ((yyvsp[(2) - (4)].node)) {
-- (yyval.node) = NEW_RESCUE((yyvsp[(1) - (4)].node), (yyvsp[(2) - (4)].node), (yyvsp[(3) - (4)].node));
-+ yyval.node = yyvsp[-3].node;
-+ if (yyvsp[-2].node) {
-+ yyval.node = NEW_RESCUE(yyvsp[-3].node, yyvsp[-2].node, yyvsp[-1].node);
- }
-- else if ((yyvsp[(3) - (4)].node)) {
-+ else if (yyvsp[-1].node) {
- rb_warn("else without rescue is useless");
-- (yyval.node) = block_append((yyval.node), (yyvsp[(3) - (4)].node));
-+ yyval.node = block_append(yyval.node, yyvsp[-1].node);
- }
-- if ((yyvsp[(4) - (4)].node)) {
-- (yyval.node) = NEW_ENSURE((yyval.node), (yyvsp[(4) - (4)].node));
-+ if (yyvsp[0].node) {
-+ yyval.node = NEW_ENSURE(yyval.node, yyvsp[0].node);
- }
-- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
-- }
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 5:
- #line 392 "parse.y"
- {
-- void_stmts((yyvsp[(1) - (2)].node));
-- (yyval.node) = (yyvsp[(1) - (2)].node);
-- }
-+ void_stmts(yyvsp[-1].node);
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 7:
- #line 400 "parse.y"
- {
-- (yyval.node) = newline_node((yyvsp[(1) - (1)].node));
-- }
-+ yyval.node = newline_node(yyvsp[0].node);
-+ ;}
- break;
-
- case 8:
- #line 404 "parse.y"
- {
-- (yyval.node) = block_append((yyvsp[(1) - (3)].node), newline_node((yyvsp[(3) - (3)].node)));
-- }
-+ yyval.node = block_append(yyvsp[-2].node, newline_node(yyvsp[0].node));
-+ ;}
- break;
-
- case 9:
- #line 408 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 10:
- #line 413 "parse.y"
-- {lex_state = EXPR_FNAME;}
-+ {lex_state = EXPR_FNAME;;}
- break;
-
- case 11:
- #line 414 "parse.y"
- {
-- (yyval.node) = NEW_ALIAS((yyvsp[(2) - (4)].node), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = NEW_ALIAS(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 12:
- #line 418 "parse.y"
- {
-- (yyval.node) = NEW_VALIAS((yyvsp[(2) - (3)].id), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = NEW_VALIAS(yyvsp[-1].id, yyvsp[0].id);
-+ ;}
- break;
-
- case 13:
-@@ -4417,85 +4084,85 @@
- {
- char buf[3];
-
-- sprintf(buf, "$%c", (char)(yyvsp[(3) - (3)].node)->nd_nth);
-- (yyval.node) = NEW_VALIAS((yyvsp[(2) - (3)].id), rb_intern(buf));
-- }
-+ sprintf(buf, "$%c", (char)yyvsp[0].node->nd_nth);
-+ yyval.node = NEW_VALIAS(yyvsp[-1].id, rb_intern(buf));
-+ ;}
- break;
-
- case 14:
- #line 429 "parse.y"
- {
- yyerror("can't make alias for the number variables");
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 15:
- #line 434 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 16:
- #line 438 "parse.y"
- {
-- (yyval.node) = NEW_IF(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 0);
-- fixpos((yyval.node), (yyvsp[(3) - (3)].node));
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- (yyval.node)->nd_else = (yyval.node)->nd_body;
-- (yyval.node)->nd_body = 0;
-+ yyval.node = NEW_IF(cond(yyvsp[0].node), yyvsp[-2].node, 0);
-+ fixpos(yyval.node, yyvsp[0].node);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ yyval.node->nd_else = yyval.node->nd_body;
-+ yyval.node->nd_body = 0;
- }
-- }
-+ ;}
- break;
-
- case 17:
- #line 447 "parse.y"
- {
-- (yyval.node) = NEW_UNLESS(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 0);
-- fixpos((yyval.node), (yyvsp[(3) - (3)].node));
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- (yyval.node)->nd_body = (yyval.node)->nd_else;
-- (yyval.node)->nd_else = 0;
-+ yyval.node = NEW_UNLESS(cond(yyvsp[0].node), yyvsp[-2].node, 0);
-+ fixpos(yyval.node, yyvsp[0].node);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ yyval.node->nd_body = yyval.node->nd_else;
-+ yyval.node->nd_else = 0;
- }
-- }
-+ ;}
- break;
-
- case 18:
- #line 456 "parse.y"
- {
-- if ((yyvsp[(1) - (3)].node) && nd_type((yyvsp[(1) - (3)].node)) == NODE_BEGIN) {
-- (yyval.node) = NEW_WHILE(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node)->nd_body, 0);
-+ if (yyvsp[-2].node && nd_type(yyvsp[-2].node) == NODE_BEGIN) {
-+ yyval.node = NEW_WHILE(cond(yyvsp[0].node), yyvsp[-2].node->nd_body, 0);
- }
- else {
-- (yyval.node) = NEW_WHILE(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 1);
-+ yyval.node = NEW_WHILE(cond(yyvsp[0].node), yyvsp[-2].node, 1);
- }
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- nd_set_type((yyval.node), NODE_UNTIL);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ nd_set_type(yyval.node, NODE_UNTIL);
- }
-- }
-+ ;}
- break;
-
- case 19:
- #line 468 "parse.y"
- {
-- if ((yyvsp[(1) - (3)].node) && nd_type((yyvsp[(1) - (3)].node)) == NODE_BEGIN) {
-- (yyval.node) = NEW_UNTIL(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node)->nd_body, 0);
-+ if (yyvsp[-2].node && nd_type(yyvsp[-2].node) == NODE_BEGIN) {
-+ yyval.node = NEW_UNTIL(cond(yyvsp[0].node), yyvsp[-2].node->nd_body, 0);
- }
- else {
-- (yyval.node) = NEW_UNTIL(cond((yyvsp[(3) - (3)].node)), (yyvsp[(1) - (3)].node), 1);
-+ yyval.node = NEW_UNTIL(cond(yyvsp[0].node), yyvsp[-2].node, 1);
- }
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- nd_set_type((yyval.node), NODE_WHILE);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ nd_set_type(yyval.node, NODE_WHILE);
- }
-- }
-+ ;}
- break;
-
- case 20:
- #line 480 "parse.y"
- {
-- (yyval.node) = NEW_RESCUE((yyvsp[(1) - (3)].node), NEW_RESBODY(0,(yyvsp[(3) - (3)].node),0), 0);
-- }
-+ yyval.node = NEW_RESCUE(yyvsp[-2].node, NEW_RESBODY(0,yyvsp[0].node,0), 0);
-+ ;}
- break;
-
- case 21:
-@@ -4505,17 +4172,17 @@
- yyerror("BEGIN in method");
- }
- local_push(0);
-- }
-+ ;}
- break;
-
- case 22:
- #line 491 "parse.y"
- {
- ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
-- NEW_PREEXE((yyvsp[(4) - (5)].node)));
-+ NEW_PREEXE(yyvsp[-1].node));
- local_pop();
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 23:
-@@ -4525,52 +4192,52 @@
- rb_warn("END in method; use at_exit");
- }
-
-- (yyval.node) = NEW_ITER(0, NEW_POSTEXE(), (yyvsp[(3) - (4)].node));
-- }
-+ yyval.node = NEW_ITER(0, NEW_POSTEXE(), yyvsp[-1].node);
-+ ;}
- break;
-
- case 24:
- #line 506 "parse.y"
- {
-- (yyval.node) = node_assign((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 25:
- #line 510 "parse.y"
- {
-- value_expr((yyvsp[(3) - (3)].node));
-- (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));
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-- }
-+ value_expr(yyvsp[0].node);
-+ yyvsp[-2].node->nd_value = (yyvsp[-2].node->nd_head) ? NEW_TO_ARY(yyvsp[0].node) : NEW_ARRAY(yyvsp[0].node);
-+ yyval.node = yyvsp[-2].node;
-+ ;}
- break;
-
- case 26:
- #line 516 "parse.y"
- {
-- value_expr((yyvsp[(3) - (3)].node));
-- if ((yyvsp[(1) - (3)].node)) {
-- ID vid = (yyvsp[(1) - (3)].node)->nd_vid;
-- if ((yyvsp[(2) - (3)].id) == tOROP) {
-- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
-- (yyval.node) = NEW_OP_ASGN_OR(gettable(vid), (yyvsp[(1) - (3)].node));
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-2].node) {
-+ ID vid = yyvsp[-2].node->nd_vid;
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-2].node->nd_value = yyvsp[0].node;
-+ yyval.node = NEW_OP_ASGN_OR(gettable(vid), yyvsp[-2].node);
- if (is_asgn_or_id(vid)) {
-- (yyval.node)->nd_aid = vid;
-+ yyval.node->nd_aid = vid;
- }
- }
-- else if ((yyvsp[(2) - (3)].id) == tANDOP) {
-- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
-- (yyval.node) = NEW_OP_ASGN_AND(gettable(vid), (yyvsp[(1) - (3)].node));
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-2].node->nd_value = yyvsp[0].node;
-+ yyval.node = NEW_OP_ASGN_AND(gettable(vid), yyvsp[-2].node);
- }
- else {
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-- (yyval.node)->nd_value = call_op(gettable(vid),(yyvsp[(2) - (3)].id),1,(yyvsp[(3) - (3)].node));
-+ yyval.node = yyvsp[-2].node;
-+ yyval.node->nd_value = call_op(gettable(vid),yyvsp[-1].id,1,yyvsp[0].node);
- }
- }
- else {
-- (yyval.node) = 0;
-+ yyval.node = 0;
- }
-- }
-+ ;}
- break;
-
- case 27:
-@@ -4578,384 +4245,384 @@
- {
- NODE *args;
-
-- value_expr((yyvsp[(6) - (6)].node));
-- if (!(yyvsp[(3) - (6)].node)) (yyvsp[(3) - (6)].node) = NEW_ZARRAY();
-- args = arg_concat((yyvsp[(6) - (6)].node), (yyvsp[(3) - (6)].node));
-- if ((yyvsp[(5) - (6)].id) == tOROP) {
-- (yyvsp[(5) - (6)].id) = 0;
-- }
-- else if ((yyvsp[(5) - (6)].id) == tANDOP) {
-- (yyvsp[(5) - (6)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN1((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].id), args);
-- fixpos((yyval.node), (yyvsp[(1) - (6)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (!yyvsp[-3].node) yyvsp[-3].node = NEW_ZARRAY();
-+ args = arg_concat(yyvsp[0].node, yyvsp[-3].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN1(yyvsp[-5].node, yyvsp[-1].id, args);
-+ fixpos(yyval.node, yyvsp[-5].node);
-+ ;}
- break;
-
- case 28:
- #line 557 "parse.y"
- {
-- value_expr((yyvsp[(5) - (5)].node));
-- if ((yyvsp[(4) - (5)].id) == tOROP) {
-- (yyvsp[(4) - (5)].id) = 0;
-- }
-- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
-- (yyvsp[(4) - (5)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 29:
- #line 569 "parse.y"
- {
-- value_expr((yyvsp[(5) - (5)].node));
-- if ((yyvsp[(4) - (5)].id) == tOROP) {
-- (yyvsp[(4) - (5)].id) = 0;
-- }
-- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
-- (yyvsp[(4) - (5)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 30:
- #line 581 "parse.y"
- {
-- value_expr((yyvsp[(5) - (5)].node));
-- if ((yyvsp[(4) - (5)].id) == tOROP) {
-- (yyvsp[(4) - (5)].id) = 0;
-- }
-- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
-- (yyvsp[(4) - (5)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 31:
- #line 593 "parse.y"
- {
-- rb_backref_error((yyvsp[(1) - (3)].node));
-- (yyval.node) = 0;
-- }
-+ rb_backref_error(yyvsp[-2].node);
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 32:
- #line 598 "parse.y"
- {
-- (yyval.node) = node_assign((yyvsp[(1) - (3)].node), NEW_SVALUE((yyvsp[(3) - (3)].node)));
-- }
-+ yyval.node = node_assign(yyvsp[-2].node, NEW_SVALUE(yyvsp[0].node));
-+ ;}
- break;
-
- case 33:
- #line 602 "parse.y"
- {
-- (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));
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-- }
-+ yyvsp[-2].node->nd_value = (yyvsp[-2].node->nd_head) ? NEW_TO_ARY(yyvsp[0].node) : NEW_ARRAY(yyvsp[0].node);
-+ yyval.node = yyvsp[-2].node;
-+ ;}
- break;
-
- case 34:
- #line 607 "parse.y"
- {
-- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-- }
-+ yyvsp[-2].node->nd_value = yyvsp[0].node;
-+ yyval.node = yyvsp[-2].node;
-+ ;}
- break;
-
- case 37:
- #line 616 "parse.y"
- {
-- (yyval.node) = logop(NODE_AND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 38:
- #line 620 "parse.y"
- {
-- (yyval.node) = logop(NODE_OR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 39:
- #line 624 "parse.y"
- {
-- (yyval.node) = NEW_NOT(cond((yyvsp[(2) - (2)].node)));
-- }
-+ yyval.node = NEW_NOT(cond(yyvsp[0].node));
-+ ;}
- break;
-
- case 40:
- #line 628 "parse.y"
- {
-- (yyval.node) = NEW_NOT(cond((yyvsp[(2) - (2)].node)));
-- }
-+ yyval.node = NEW_NOT(cond(yyvsp[0].node));
-+ ;}
- break;
-
- case 42:
- #line 635 "parse.y"
- {
-- value_expr((yyval.node));
-- (yyval.node) = (yyvsp[(1) - (1)].node);
-- }
-+ value_expr(yyval.node);
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 45:
- #line 644 "parse.y"
- {
-- (yyval.node) = NEW_RETURN(ret_args((yyvsp[(2) - (2)].node)));
-- }
-+ yyval.node = NEW_RETURN(ret_args(yyvsp[0].node));
-+ ;}
- break;
-
- case 46:
- #line 648 "parse.y"
- {
-- (yyval.node) = NEW_BREAK(ret_args((yyvsp[(2) - (2)].node)));
-- }
-+ yyval.node = NEW_BREAK(ret_args(yyvsp[0].node));
-+ ;}
- break;
-
- case 47:
- #line 652 "parse.y"
- {
-- (yyval.node) = NEW_NEXT(ret_args((yyvsp[(2) - (2)].node)));
-- }
-+ yyval.node = NEW_NEXT(ret_args(yyvsp[0].node));
-+ ;}
- break;
-
- case 49:
- #line 659 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ ;}
- break;
-
- case 50:
- #line 663 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ ;}
- break;
-
- case 51:
- #line 669 "parse.y"
- {
-- (yyval.vars) = dyna_push();
-- (yyvsp[(1) - (1)].num) = ruby_sourceline;
-- }
-+ yyval.vars = dyna_push();
-+ yyvsp[0].num = ruby_sourceline;
-+ ;}
- break;
-
- case 52:
- #line 673 "parse.y"
-- {(yyval.vars) = ruby_dyna_vars;}
-+ {yyval.vars = ruby_dyna_vars;;}
- break;
-
- case 53:
- #line 676 "parse.y"
- {
-- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
-- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
-- dyna_pop((yyvsp[(2) - (6)].vars));
-- }
-+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
-+ nd_set_line(yyval.node, yyvsp[-5].num);
-+ dyna_pop(yyvsp[-4].vars);
-+ ;}
- break;
-
- case 54:
- #line 684 "parse.y"
- {
-- (yyval.node) = new_fcall((yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = new_fcall(yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 55:
- #line 689 "parse.y"
- {
-- (yyval.node) = new_fcall((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].node));
-- if ((yyvsp[(3) - (3)].node)) {
-- if (nd_type((yyval.node)) == NODE_BLOCK_PASS) {
-+ yyval.node = new_fcall(yyvsp[-2].id, yyvsp[-1].node);
-+ if (yyvsp[0].node) {
-+ if (nd_type(yyval.node) == NODE_BLOCK_PASS) {
- rb_compile_error("both block arg and actual block given");
- }
-- (yyvsp[(3) - (3)].node)->nd_iter = (yyval.node);
-- (yyval.node) = (yyvsp[(3) - (3)].node);
-+ yyvsp[0].node->nd_iter = yyval.node;
-+ yyval.node = yyvsp[0].node;
- }
-- fixpos((yyval.node), (yyvsp[(2) - (3)].node));
-- }
-+ fixpos(yyval.node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 56:
- #line 701 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 57:
- #line 706 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].node));
-- if ((yyvsp[(5) - (5)].node)) {
-- if (nd_type((yyval.node)) == NODE_BLOCK_PASS) {
-+ yyval.node = new_call(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].node);
-+ if (yyvsp[0].node) {
-+ if (nd_type(yyval.node) == NODE_BLOCK_PASS) {
- rb_compile_error("both block arg and actual block given");
- }
-- (yyvsp[(5) - (5)].node)->nd_iter = (yyval.node);
-- (yyval.node) = (yyvsp[(5) - (5)].node);
-+ yyvsp[0].node->nd_iter = yyval.node;
-+ yyval.node = yyvsp[0].node;
- }
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 58:
- #line 718 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 59:
- #line 723 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].node));
-- if ((yyvsp[(5) - (5)].node)) {
-- if (nd_type((yyval.node)) == NODE_BLOCK_PASS) {
-+ yyval.node = new_call(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].node);
-+ if (yyvsp[0].node) {
-+ if (nd_type(yyval.node) == NODE_BLOCK_PASS) {
- rb_compile_error("both block arg and actual block given");
- }
-- (yyvsp[(5) - (5)].node)->nd_iter = (yyval.node);
-- (yyval.node) = (yyvsp[(5) - (5)].node);
-+ yyvsp[0].node->nd_iter = yyval.node;
-+ yyval.node = yyvsp[0].node;
- }
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 60:
- #line 735 "parse.y"
- {
-- (yyval.node) = new_super((yyvsp[(2) - (2)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = new_super(yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 61:
- #line 740 "parse.y"
- {
-- (yyval.node) = new_yield((yyvsp[(2) - (2)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = new_yield(yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 63:
- #line 748 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 65:
- #line 755 "parse.y"
- {
-- (yyval.node) = NEW_MASGN(NEW_LIST((yyvsp[(2) - (3)].node)), 0);
-- }
-+ yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-1].node), 0);
-+ ;}
- break;
-
- case 66:
- #line 761 "parse.y"
- {
-- (yyval.node) = NEW_MASGN((yyvsp[(1) - (1)].node), 0);
-- }
-+ yyval.node = NEW_MASGN(yyvsp[0].node, 0);
-+ ;}
- break;
-
- case 67:
- #line 765 "parse.y"
- {
-- (yyval.node) = NEW_MASGN(list_append((yyvsp[(1) - (2)].node),(yyvsp[(2) - (2)].node)), 0);
-- }
-+ yyval.node = NEW_MASGN(list_append(yyvsp[-1].node,yyvsp[0].node), 0);
-+ ;}
- break;
-
- case 68:
- #line 769 "parse.y"
- {
-- (yyval.node) = NEW_MASGN((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = NEW_MASGN(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 69:
- #line 773 "parse.y"
- {
-- (yyval.node) = NEW_MASGN((yyvsp[(1) - (2)].node), -1);
-- }
-+ yyval.node = NEW_MASGN(yyvsp[-1].node, -1);
-+ ;}
- break;
-
- case 70:
- #line 777 "parse.y"
- {
-- (yyval.node) = NEW_MASGN(0, (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = NEW_MASGN(0, yyvsp[0].node);
-+ ;}
- break;
-
- case 71:
- #line 781 "parse.y"
- {
-- (yyval.node) = NEW_MASGN(0, -1);
-- }
-+ yyval.node = NEW_MASGN(0, -1);
-+ ;}
- break;
-
- case 73:
- #line 788 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 74:
- #line 794 "parse.y"
- {
-- (yyval.node) = NEW_LIST((yyvsp[(1) - (2)].node));
-- }
-+ yyval.node = NEW_LIST(yyvsp[-1].node);
-+ ;}
- break;
-
- case 75:
- #line 798 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].node));
-- }
-+ yyval.node = list_append(yyvsp[-2].node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 76:
- #line 804 "parse.y"
- {
-- (yyval.node) = assignable((yyvsp[(1) - (1)].id), 0);
-- }
-+ yyval.node = assignable(yyvsp[0].id, 0);
-+ ;}
- break;
-
- case 77:
- #line 808 "parse.y"
- {
-- (yyval.node) = aryset((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].node));
-- }
-+ yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 78:
- #line 812 "parse.y"
- {
-- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 79:
- #line 816 "parse.y"
- {
-- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 80:
- #line 820 "parse.y"
- {
-- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 81:
-@@ -4963,8 +4630,8 @@
- {
- if (in_def || in_single)
- yyerror("dynamic constant assignment");
-- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id)));
-- }
-+ yyval.node = NEW_CDECL(0, 0, NEW_COLON2(yyvsp[-2].node, yyvsp[0].id));
-+ ;}
- break;
-
- case 82:
-@@ -4972,51 +4639,51 @@
- {
- if (in_def || in_single)
- yyerror("dynamic constant assignment");
-- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON3((yyvsp[(2) - (2)].id)));
-- }
-+ yyval.node = NEW_CDECL(0, 0, NEW_COLON3(yyvsp[0].id));
-+ ;}
- break;
-
- case 83:
- #line 836 "parse.y"
- {
-- rb_backref_error((yyvsp[(1) - (1)].node));
-- (yyval.node) = 0;
-- }
-+ rb_backref_error(yyvsp[0].node);
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 84:
- #line 843 "parse.y"
- {
-- (yyval.node) = assignable((yyvsp[(1) - (1)].id), 0);
-- }
-+ yyval.node = assignable(yyvsp[0].id, 0);
-+ ;}
- break;
-
- case 85:
- #line 847 "parse.y"
- {
-- (yyval.node) = aryset((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].node));
-- }
-+ yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 86:
- #line 851 "parse.y"
- {
-- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 87:
- #line 855 "parse.y"
- {
-- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 88:
- #line 859 "parse.y"
- {
-- (yyval.node) = attrset((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 89:
-@@ -5024,8 +4691,8 @@
- {
- if (in_def || in_single)
- yyerror("dynamic constant assignment");
-- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id)));
-- }
-+ yyval.node = NEW_CDECL(0, 0, NEW_COLON2(yyvsp[-2].node, yyvsp[0].id));
-+ ;}
- break;
-
- case 90:
-@@ -5033,1190 +4700,1190 @@
- {
- if (in_def || in_single)
- yyerror("dynamic constant assignment");
-- (yyval.node) = NEW_CDECL(0, 0, NEW_COLON3((yyvsp[(2) - (2)].id)));
-- }
-+ yyval.node = NEW_CDECL(0, 0, NEW_COLON3(yyvsp[0].id));
-+ ;}
- break;
-
- case 91:
- #line 875 "parse.y"
- {
-- rb_backref_error((yyvsp[(1) - (1)].node));
-- (yyval.node) = 0;
-- }
-+ rb_backref_error(yyvsp[0].node);
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 92:
- #line 882 "parse.y"
- {
- yyerror("class/module name must be CONSTANT");
-- }
-+ ;}
- break;
-
- case 94:
- #line 889 "parse.y"
- {
-- (yyval.node) = NEW_COLON3((yyvsp[(2) - (2)].id));
-- }
-+ yyval.node = NEW_COLON3(yyvsp[0].id);
-+ ;}
- break;
-
- case 95:
- #line 893 "parse.y"
- {
-- (yyval.node) = NEW_COLON2(0, (yyval.node));
-- }
-+ yyval.node = NEW_COLON2(0, yyval.node);
-+ ;}
- break;
-
- case 96:
- #line 897 "parse.y"
- {
-- (yyval.node) = NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 100:
- #line 906 "parse.y"
- {
- lex_state = EXPR_END;
-- (yyval.id) = (yyvsp[(1) - (1)].id);
-- }
-+ yyval.id = yyvsp[0].id;
-+ ;}
- break;
-
- case 101:
- #line 911 "parse.y"
- {
- lex_state = EXPR_END;
-- (yyval.id) = (yyvsp[(1) - (1)].id);
-- }
-+ yyval.id = yyvsp[0].id;
-+ ;}
- break;
-
- case 104:
- #line 922 "parse.y"
- {
-- (yyval.node) = NEW_LIT(ID2SYM((yyvsp[(1) - (1)].id)));
-- }
-+ yyval.node = NEW_LIT(ID2SYM(yyvsp[0].id));
-+ ;}
- break;
-
- case 106:
- #line 929 "parse.y"
- {
-- (yyval.node) = NEW_UNDEF((yyvsp[(1) - (1)].node));
-- }
-+ yyval.node = NEW_UNDEF(yyvsp[0].node);
-+ ;}
- break;
-
- case 107:
- #line 932 "parse.y"
-- {lex_state = EXPR_FNAME;}
-+ {lex_state = EXPR_FNAME;;}
- break;
-
- case 108:
- #line 933 "parse.y"
- {
-- (yyval.node) = block_append((yyvsp[(1) - (4)].node), NEW_UNDEF((yyvsp[(4) - (4)].node)));
-- }
-+ yyval.node = block_append(yyvsp[-3].node, NEW_UNDEF(yyvsp[0].node));
-+ ;}
- break;
-
- case 109:
- #line 938 "parse.y"
-- { (yyval.id) = '|'; }
-+ { yyval.id = '|'; ;}
- break;
-
- case 110:
- #line 939 "parse.y"
-- { (yyval.id) = '^'; }
-+ { yyval.id = '^'; ;}
- break;
-
- case 111:
- #line 940 "parse.y"
-- { (yyval.id) = '&'; }
-+ { yyval.id = '&'; ;}
- break;
-
- case 112:
- #line 941 "parse.y"
-- { (yyval.id) = tCMP; }
-+ { yyval.id = tCMP; ;}
- break;
-
- case 113:
- #line 942 "parse.y"
-- { (yyval.id) = tEQ; }
-+ { yyval.id = tEQ; ;}
- break;
-
- case 114:
- #line 943 "parse.y"
-- { (yyval.id) = tEQQ; }
-+ { yyval.id = tEQQ; ;}
- break;
-
- case 115:
- #line 944 "parse.y"
-- { (yyval.id) = tMATCH; }
-+ { yyval.id = tMATCH; ;}
- break;
-
- case 116:
- #line 945 "parse.y"
-- { (yyval.id) = '>'; }
-+ { yyval.id = '>'; ;}
- break;
-
- case 117:
- #line 946 "parse.y"
-- { (yyval.id) = tGEQ; }
-+ { yyval.id = tGEQ; ;}
- break;
-
- case 118:
- #line 947 "parse.y"
-- { (yyval.id) = '<'; }
-+ { yyval.id = '<'; ;}
- break;
-
- case 119:
- #line 948 "parse.y"
-- { (yyval.id) = tLEQ; }
-+ { yyval.id = tLEQ; ;}
- break;
-
- case 120:
- #line 949 "parse.y"
-- { (yyval.id) = tLSHFT; }
-+ { yyval.id = tLSHFT; ;}
- break;
-
- case 121:
- #line 950 "parse.y"
-- { (yyval.id) = tRSHFT; }
-+ { yyval.id = tRSHFT; ;}
- break;
-
- case 122:
- #line 951 "parse.y"
-- { (yyval.id) = '+'; }
-+ { yyval.id = '+'; ;}
- break;
-
- case 123:
- #line 952 "parse.y"
-- { (yyval.id) = '-'; }
-+ { yyval.id = '-'; ;}
- break;
-
- case 124:
- #line 953 "parse.y"
-- { (yyval.id) = '*'; }
-+ { yyval.id = '*'; ;}
- break;
-
- case 125:
- #line 954 "parse.y"
-- { (yyval.id) = '*'; }
-+ { yyval.id = '*'; ;}
- break;
-
- case 126:
- #line 955 "parse.y"
-- { (yyval.id) = '/'; }
-+ { yyval.id = '/'; ;}
- break;
-
- case 127:
- #line 956 "parse.y"
-- { (yyval.id) = '%'; }
-+ { yyval.id = '%'; ;}
- break;
-
- case 128:
- #line 957 "parse.y"
-- { (yyval.id) = tPOW; }
-+ { yyval.id = tPOW; ;}
- break;
-
- case 129:
- #line 958 "parse.y"
-- { (yyval.id) = '~'; }
-+ { yyval.id = '~'; ;}
- break;
-
- case 130:
- #line 959 "parse.y"
-- { (yyval.id) = tUPLUS; }
-+ { yyval.id = tUPLUS; ;}
- break;
-
- case 131:
- #line 960 "parse.y"
-- { (yyval.id) = tUMINUS; }
-+ { yyval.id = tUMINUS; ;}
- break;
-
- case 132:
- #line 961 "parse.y"
-- { (yyval.id) = tAREF; }
-+ { yyval.id = tAREF; ;}
- break;
-
- case 133:
- #line 962 "parse.y"
-- { (yyval.id) = tASET; }
-+ { yyval.id = tASET; ;}
- break;
-
- case 134:
- #line 963 "parse.y"
-- { (yyval.id) = '`'; }
-+ { yyval.id = '`'; ;}
- break;
-
- case 175:
- #line 976 "parse.y"
- {
-- (yyval.node) = node_assign((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 176:
- #line 980 "parse.y"
- {
-- (yyval.node) = node_assign((yyvsp[(1) - (5)].node), NEW_RESCUE((yyvsp[(3) - (5)].node), NEW_RESBODY(0,(yyvsp[(5) - (5)].node),0), 0));
-- }
-+ yyval.node = node_assign(yyvsp[-4].node, NEW_RESCUE(yyvsp[-2].node, NEW_RESBODY(0,yyvsp[0].node,0), 0));
-+ ;}
- break;
-
- case 177:
- #line 984 "parse.y"
- {
-- value_expr((yyvsp[(3) - (3)].node));
-- if ((yyvsp[(1) - (3)].node)) {
-- ID vid = (yyvsp[(1) - (3)].node)->nd_vid;
-- if ((yyvsp[(2) - (3)].id) == tOROP) {
-- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
-- (yyval.node) = NEW_OP_ASGN_OR(gettable(vid), (yyvsp[(1) - (3)].node));
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-2].node) {
-+ ID vid = yyvsp[-2].node->nd_vid;
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-2].node->nd_value = yyvsp[0].node;
-+ yyval.node = NEW_OP_ASGN_OR(gettable(vid), yyvsp[-2].node);
- if (is_asgn_or_id(vid)) {
-- (yyval.node)->nd_aid = vid;
-+ yyval.node->nd_aid = vid;
- }
- }
-- else if ((yyvsp[(2) - (3)].id) == tANDOP) {
-- (yyvsp[(1) - (3)].node)->nd_value = (yyvsp[(3) - (3)].node);
-- (yyval.node) = NEW_OP_ASGN_AND(gettable(vid), (yyvsp[(1) - (3)].node));
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-2].node->nd_value = yyvsp[0].node;
-+ yyval.node = NEW_OP_ASGN_AND(gettable(vid), yyvsp[-2].node);
- }
- else {
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-- (yyval.node)->nd_value = call_op(gettable(vid),(yyvsp[(2) - (3)].id),1,(yyvsp[(3) - (3)].node));
-+ yyval.node = yyvsp[-2].node;
-+ yyval.node->nd_value = call_op(gettable(vid),yyvsp[-1].id,1,yyvsp[0].node);
- }
- }
- else {
-- (yyval.node) = 0;
-+ yyval.node = 0;
- }
-- }
-+ ;}
- break;
-
- case 178:
- #line 1009 "parse.y"
- {
-- NODE *args;
--
-- value_expr((yyvsp[(6) - (6)].node));
-- if (!(yyvsp[(3) - (6)].node)) (yyvsp[(3) - (6)].node) = NEW_ZARRAY();
-- args = arg_concat((yyvsp[(6) - (6)].node), (yyvsp[(3) - (6)].node));
-- if ((yyvsp[(5) - (6)].id) == tOROP) {
-- (yyvsp[(5) - (6)].id) = 0;
-- }
-- else if ((yyvsp[(5) - (6)].id) == tANDOP) {
-- (yyvsp[(5) - (6)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN1((yyvsp[(1) - (6)].node), (yyvsp[(5) - (6)].id), args);
-- fixpos((yyval.node), (yyvsp[(1) - (6)].node));
-- }
-+ NODE *args;
-+
-+ value_expr(yyvsp[0].node);
-+ if (!yyvsp[-3].node) yyvsp[-3].node = NEW_ZARRAY();
-+ args = arg_concat(yyvsp[0].node, yyvsp[-3].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN1(yyvsp[-5].node, yyvsp[-1].id, args);
-+ fixpos(yyval.node, yyvsp[-5].node);
-+ ;}
- break;
-
- case 179:
- #line 1025 "parse.y"
- {
-- value_expr((yyvsp[(5) - (5)].node));
-- if ((yyvsp[(4) - (5)].id) == tOROP) {
-- (yyvsp[(4) - (5)].id) = 0;
-- }
-- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
-- (yyvsp[(4) - (5)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 180:
- #line 1037 "parse.y"
- {
-- value_expr((yyvsp[(5) - (5)].node));
-- if ((yyvsp[(4) - (5)].id) == tOROP) {
-- (yyvsp[(4) - (5)].id) = 0;
-- }
-- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
-- (yyvsp[(4) - (5)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 181:
- #line 1049 "parse.y"
- {
-- value_expr((yyvsp[(5) - (5)].node));
-- if ((yyvsp[(4) - (5)].id) == tOROP) {
-- (yyvsp[(4) - (5)].id) = 0;
-- }
-- else if ((yyvsp[(4) - (5)].id) == tANDOP) {
-- (yyvsp[(4) - (5)].id) = 1;
-- }
-- (yyval.node) = NEW_OP_ASGN2((yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].id), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ value_expr(yyvsp[0].node);
-+ if (yyvsp[-1].id == tOROP) {
-+ yyvsp[-1].id = 0;
-+ }
-+ else if (yyvsp[-1].id == tANDOP) {
-+ yyvsp[-1].id = 1;
-+ }
-+ yyval.node = NEW_OP_ASGN2(yyvsp[-4].node, yyvsp[-2].id, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 182:
- #line 1061 "parse.y"
- {
- yyerror("constant re-assignment");
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 183:
- #line 1066 "parse.y"
- {
- yyerror("constant re-assignment");
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 184:
- #line 1071 "parse.y"
- {
-- rb_backref_error((yyvsp[(1) - (3)].node));
-- (yyval.node) = 0;
-- }
-+ rb_backref_error(yyvsp[-2].node);
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 185:
- #line 1076 "parse.y"
- {
-- value_expr((yyvsp[(1) - (3)].node));
-- value_expr((yyvsp[(3) - (3)].node));
-- if (nd_type((yyvsp[(1) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(1) - (3)].node)->nd_lit) &&
-- nd_type((yyvsp[(3) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(3) - (3)].node)->nd_lit)) {
-- (yyvsp[(1) - (3)].node)->nd_lit = rb_range_new((yyvsp[(1) - (3)].node)->nd_lit, (yyvsp[(3) - (3)].node)->nd_lit, Qfalse);
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-+ value_expr(yyvsp[-2].node);
-+ value_expr(yyvsp[0].node);
-+ if (nd_type(yyvsp[-2].node) == NODE_LIT && FIXNUM_P(yyvsp[-2].node->nd_lit) &&
-+ nd_type(yyvsp[0].node) == NODE_LIT && FIXNUM_P(yyvsp[0].node->nd_lit)) {
-+ yyvsp[-2].node->nd_lit = rb_range_new(yyvsp[-2].node->nd_lit, yyvsp[0].node->nd_lit, Qfalse);
-+ yyval.node = yyvsp[-2].node;
- }
- else {
-- (yyval.node) = NEW_DOT2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-+ yyval.node = NEW_DOT2(yyvsp[-2].node, yyvsp[0].node);
- }
-- }
-+ ;}
- break;
-
- case 186:
- #line 1089 "parse.y"
- {
-- value_expr((yyvsp[(1) - (3)].node));
-- value_expr((yyvsp[(3) - (3)].node));
-- if (nd_type((yyvsp[(1) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(1) - (3)].node)->nd_lit) &&
-- nd_type((yyvsp[(3) - (3)].node)) == NODE_LIT && FIXNUM_P((yyvsp[(3) - (3)].node)->nd_lit)) {
-- (yyvsp[(1) - (3)].node)->nd_lit = rb_range_new((yyvsp[(1) - (3)].node)->nd_lit, (yyvsp[(3) - (3)].node)->nd_lit, Qtrue);
-- (yyval.node) = (yyvsp[(1) - (3)].node);
-+ value_expr(yyvsp[-2].node);
-+ value_expr(yyvsp[0].node);
-+ if (nd_type(yyvsp[-2].node) == NODE_LIT && FIXNUM_P(yyvsp[-2].node->nd_lit) &&
-+ nd_type(yyvsp[0].node) == NODE_LIT && FIXNUM_P(yyvsp[0].node->nd_lit)) {
-+ yyvsp[-2].node->nd_lit = rb_range_new(yyvsp[-2].node->nd_lit, yyvsp[0].node->nd_lit, Qtrue);
-+ yyval.node = yyvsp[-2].node;
- }
- else {
-- (yyval.node) = NEW_DOT3((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-+ yyval.node = NEW_DOT3(yyvsp[-2].node, yyvsp[0].node);
- }
-- }
-+ ;}
- break;
-
- case 187:
- #line 1102 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '+', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '+', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 188:
- #line 1106 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '-', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '-', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 189:
- #line 1110 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '*', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '*', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 190:
- #line 1114 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '/', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '/', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 191:
- #line 1118 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '%', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '%', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 192:
- #line 1122 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tPOW, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 193:
- #line 1126 "parse.y"
- {
-- (yyval.node) = call_op(call_op((yyvsp[(2) - (4)].node), tPOW, 1, (yyvsp[(4) - (4)].node)), tUMINUS, 0, 0);
-- }
-+ yyval.node = call_op(call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node), tUMINUS, 0, 0);
-+ ;}
- break;
-
- case 194:
- #line 1130 "parse.y"
- {
-- (yyval.node) = call_op(call_op((yyvsp[(2) - (4)].node), tPOW, 1, (yyvsp[(4) - (4)].node)), tUMINUS, 0, 0);
-- }
-+ yyval.node = call_op(call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node), tUMINUS, 0, 0);
-+ ;}
- break;
-
- case 195:
- #line 1134 "parse.y"
- {
-- if ((yyvsp[(2) - (2)].node) && nd_type((yyvsp[(2) - (2)].node)) == NODE_LIT) {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-+ if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_LIT) {
-+ yyval.node = yyvsp[0].node;
- }
- else {
-- (yyval.node) = call_op((yyvsp[(2) - (2)].node), tUPLUS, 0, 0);
-+ yyval.node = call_op(yyvsp[0].node, tUPLUS, 0, 0);
- }
-- }
-+ ;}
- break;
-
- case 196:
- #line 1143 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(2) - (2)].node), tUMINUS, 0, 0);
-- }
-+ yyval.node = call_op(yyvsp[0].node, tUMINUS, 0, 0);
-+ ;}
- break;
-
- case 197:
- #line 1147 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '|', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '|', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 198:
- #line 1151 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '^', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '^', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 199:
- #line 1155 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '&', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '&', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 200:
- #line 1159 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tCMP, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tCMP, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 201:
- #line 1163 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '>', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '>', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 202:
- #line 1167 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tGEQ, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tGEQ, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 203:
- #line 1171 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), '<', 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, '<', 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 204:
- #line 1175 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tLEQ, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tLEQ, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 205:
- #line 1179 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tEQ, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 206:
- #line 1183 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tEQQ, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tEQQ, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 207:
- #line 1187 "parse.y"
- {
-- (yyval.node) = NEW_NOT(call_op((yyvsp[(1) - (3)].node), tEQ, 1, (yyvsp[(3) - (3)].node)));
-- }
-+ yyval.node = NEW_NOT(call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node));
-+ ;}
- break;
-
- case 208:
- #line 1191 "parse.y"
- {
-- (yyval.node) = match_gen((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = match_gen(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 209:
- #line 1195 "parse.y"
- {
-- (yyval.node) = NEW_NOT(match_gen((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)));
-- }
-+ yyval.node = NEW_NOT(match_gen(yyvsp[-2].node, yyvsp[0].node));
-+ ;}
- break;
-
- case 210:
- #line 1199 "parse.y"
- {
-- (yyval.node) = NEW_NOT(cond((yyvsp[(2) - (2)].node)));
-- }
-+ yyval.node = NEW_NOT(cond(yyvsp[0].node));
-+ ;}
- break;
-
- case 211:
- #line 1203 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(2) - (2)].node), '~', 0, 0);
-- }
-+ yyval.node = call_op(yyvsp[0].node, '~', 0, 0);
-+ ;}
- break;
-
- case 212:
- #line 1207 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tLSHFT, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tLSHFT, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 213:
- #line 1211 "parse.y"
- {
-- (yyval.node) = call_op((yyvsp[(1) - (3)].node), tRSHFT, 1, (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = call_op(yyvsp[-2].node, tRSHFT, 1, yyvsp[0].node);
-+ ;}
- break;
-
- case 214:
- #line 1215 "parse.y"
- {
-- (yyval.node) = logop(NODE_AND, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 215:
- #line 1219 "parse.y"
- {
-- (yyval.node) = logop(NODE_OR, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 216:
- #line 1222 "parse.y"
-- {in_defined = 1;}
-+ {in_defined = 1;;}
- break;
-
- case 217:
- #line 1223 "parse.y"
- {
- in_defined = 0;
-- (yyval.node) = NEW_DEFINED((yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = NEW_DEFINED(yyvsp[0].node);
-+ ;}
- break;
-
- case 218:
- #line 1228 "parse.y"
- {
-- (yyval.node) = NEW_IF(cond((yyvsp[(1) - (5)].node)), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (5)].node));
-- }
-+ yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ ;}
- break;
-
- case 219:
- #line 1233 "parse.y"
- {
-- (yyval.node) = (yyvsp[(1) - (1)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 220:
- #line 1239 "parse.y"
- {
-- value_expr((yyvsp[(1) - (1)].node));
-- (yyval.node) = (yyvsp[(1) - (1)].node);
-- }
-+ value_expr(yyvsp[0].node);
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 222:
- #line 1247 "parse.y"
- {
- rb_warn("parenthesize argument(s) for future version");
-- (yyval.node) = NEW_LIST((yyvsp[(1) - (2)].node));
-- }
-+ yyval.node = NEW_LIST(yyvsp[-1].node);
-+ ;}
- break;
-
- case 223:
- #line 1252 "parse.y"
- {
-- (yyval.node) = (yyvsp[(1) - (2)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 224:
- #line 1256 "parse.y"
- {
-- value_expr((yyvsp[(4) - (5)].node));
-- (yyval.node) = arg_concat((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].node));
-- }
-+ value_expr(yyvsp[-1].node);
-+ yyval.node = arg_concat(yyvsp[-4].node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 225:
- #line 1261 "parse.y"
- {
-- (yyval.node) = NEW_LIST(NEW_HASH((yyvsp[(1) - (2)].node)));
-- }
-+ yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node));
-+ ;}
- break;
-
- case 226:
- #line 1265 "parse.y"
- {
-- value_expr((yyvsp[(2) - (3)].node));
-- (yyval.node) = NEW_NEWLINE(NEW_SPLAT((yyvsp[(2) - (3)].node)));
-- }
-+ value_expr(yyvsp[-1].node);
-+ yyval.node = NEW_NEWLINE(NEW_SPLAT(yyvsp[-1].node));
-+ ;}
- break;
-
- case 227:
- #line 1272 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 228:
- #line 1276 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (4)].node);
-- }
-+ yyval.node = yyvsp[-2].node;
-+ ;}
- break;
-
- case 229:
- #line 1280 "parse.y"
- {
- rb_warn("parenthesize argument for future version");
-- (yyval.node) = NEW_LIST((yyvsp[(2) - (4)].node));
-- }
-+ yyval.node = NEW_LIST(yyvsp[-2].node);
-+ ;}
- break;
-
- case 230:
- #line 1285 "parse.y"
- {
- rb_warn("parenthesize argument for future version");
-- (yyval.node) = list_append((yyvsp[(2) - (6)].node), (yyvsp[(4) - (6)].node));
-- }
-+ yyval.node = list_append(yyvsp[-4].node, yyvsp[-2].node);
-+ ;}
- break;
-
- case 233:
- #line 1296 "parse.y"
- {
- rb_warn("parenthesize argument(s) for future version");
-- (yyval.node) = NEW_LIST((yyvsp[(1) - (1)].node));
-- }
-+ yyval.node = NEW_LIST(yyvsp[0].node);
-+ ;}
- break;
-
- case 234:
- #line 1301 "parse.y"
- {
-- (yyval.node) = arg_blk_pass((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = arg_blk_pass(yyvsp[-1].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 235:
- #line 1305 "parse.y"
- {
-- (yyval.node) = arg_concat((yyvsp[(1) - (5)].node), (yyvsp[(4) - (5)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
-- }
-+ yyval.node = arg_concat(yyvsp[-4].node, yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 236:
- #line 1310 "parse.y"
- {
-- (yyval.node) = NEW_LIST(NEW_HASH((yyvsp[(1) - (2)].node)));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node));
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 237:
- #line 1315 "parse.y"
- {
-- (yyval.node) = arg_concat(NEW_LIST(NEW_HASH((yyvsp[(1) - (5)].node))), (yyvsp[(4) - (5)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
-- }
-+ yyval.node = arg_concat(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 238:
- #line 1320 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (4)].node), NEW_HASH((yyvsp[(3) - (4)].node)));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node));
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 239:
- #line 1325 "parse.y"
- {
-- value_expr((yyvsp[(6) - (7)].node));
-- (yyval.node) = arg_concat(list_append((yyvsp[(1) - (7)].node), NEW_HASH((yyvsp[(3) - (7)].node))), (yyvsp[(6) - (7)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(7) - (7)].node));
-- }
-+ value_expr(yyvsp[-1].node);
-+ yyval.node = arg_concat(list_append(yyvsp[-6].node, NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 240:
- #line 1331 "parse.y"
- {
-- (yyval.node) = arg_blk_pass(NEW_SPLAT((yyvsp[(2) - (3)].node)), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = arg_blk_pass(NEW_SPLAT(yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 242:
- #line 1338 "parse.y"
- {
-- (yyval.node) = arg_blk_pass(list_concat(NEW_LIST((yyvsp[(1) - (4)].node)),(yyvsp[(3) - (4)].node)), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = arg_blk_pass(list_concat(NEW_LIST(yyvsp[-3].node),yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 243:
- #line 1342 "parse.y"
- {
-- (yyval.node) = arg_blk_pass((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = arg_blk_pass(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 244:
- #line 1346 "parse.y"
- {
-- (yyval.node) = arg_concat(NEW_LIST((yyvsp[(1) - (5)].node)), (yyvsp[(4) - (5)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
-- }
-+ yyval.node = arg_concat(NEW_LIST(yyvsp[-4].node), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 245:
- #line 1351 "parse.y"
- {
-- (yyval.node) = arg_concat(list_concat(NEW_LIST((yyvsp[(1) - (7)].node)),(yyvsp[(3) - (7)].node)), (yyvsp[(6) - (7)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(7) - (7)].node));
-- }
-+ yyval.node = arg_concat(list_concat(NEW_LIST(yyvsp[-6].node),yyvsp[-4].node), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 246:
- #line 1356 "parse.y"
- {
-- (yyval.node) = NEW_LIST(NEW_HASH((yyvsp[(1) - (2)].node)));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node));
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 247:
- #line 1361 "parse.y"
- {
-- (yyval.node) = arg_concat(NEW_LIST(NEW_HASH((yyvsp[(1) - (5)].node))), (yyvsp[(4) - (5)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(5) - (5)].node));
-- }
-+ yyval.node = arg_concat(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 248:
- #line 1366 "parse.y"
- {
-- (yyval.node) = list_append(NEW_LIST((yyvsp[(1) - (4)].node)), NEW_HASH((yyvsp[(3) - (4)].node)));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = list_append(NEW_LIST(yyvsp[-3].node), NEW_HASH(yyvsp[-1].node));
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 249:
- #line 1371 "parse.y"
- {
-- (yyval.node) = list_append(list_concat(NEW_LIST((yyvsp[(1) - (6)].node)),(yyvsp[(3) - (6)].node)), NEW_HASH((yyvsp[(5) - (6)].node)));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(6) - (6)].node));
-- }
-+ yyval.node = list_append(list_concat(NEW_LIST(yyvsp[-5].node),yyvsp[-3].node), NEW_HASH(yyvsp[-1].node));
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 250:
- #line 1376 "parse.y"
- {
-- (yyval.node) = arg_concat(list_append(NEW_LIST((yyvsp[(1) - (7)].node)), NEW_HASH((yyvsp[(3) - (7)].node))), (yyvsp[(6) - (7)].node));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(7) - (7)].node));
-- }
-+ yyval.node = arg_concat(list_append(NEW_LIST(yyvsp[-6].node), NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 251:
- #line 1381 "parse.y"
- {
-- (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));
-- (yyval.node) = arg_blk_pass((yyval.node), (yyvsp[(9) - (9)].node));
-- }
-+ yyval.node = arg_concat(list_append(list_concat(NEW_LIST(yyvsp[-8].node), yyvsp[-6].node), NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node);
-+ yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 252:
- #line 1386 "parse.y"
- {
-- (yyval.node) = arg_blk_pass(NEW_SPLAT((yyvsp[(2) - (3)].node)), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = arg_blk_pass(NEW_SPLAT(yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 254:
- #line 1392 "parse.y"
- {
-- (yyval.num) = cmdarg_stack;
-+ yyval.num = cmdarg_stack;
- CMDARG_PUSH(1);
-- }
-+ ;}
- break;
-
- case 255:
- #line 1397 "parse.y"
- {
- /* CMDARG_POP() */
-- cmdarg_stack = (yyvsp[(1) - (2)].num);
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ cmdarg_stack = yyvsp[-1].num;
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 257:
- #line 1405 "parse.y"
-- {lex_state = EXPR_ENDARG;}
-+ {lex_state = EXPR_ENDARG;;}
- break;
-
- case 258:
- #line 1406 "parse.y"
- {
- rb_warn("don't put space before argument parentheses");
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 259:
- #line 1410 "parse.y"
-- {lex_state = EXPR_ENDARG;}
-+ {lex_state = EXPR_ENDARG;;}
- break;
-
- case 260:
- #line 1411 "parse.y"
- {
- rb_warn("don't put space before argument parentheses");
-- (yyval.node) = (yyvsp[(2) - (4)].node);
-- }
-+ yyval.node = yyvsp[-2].node;
-+ ;}
- break;
-
- case 261:
- #line 1418 "parse.y"
- {
-- (yyval.node) = NEW_BLOCK_PASS((yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = NEW_BLOCK_PASS(yyvsp[0].node);
-+ ;}
- break;
-
- case 262:
- #line 1424 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 264:
- #line 1431 "parse.y"
- {
-- (yyval.node) = NEW_LIST((yyvsp[(1) - (1)].node));
-- }
-+ yyval.node = NEW_LIST(yyvsp[0].node);
-+ ;}
- break;
-
- case 265:
- #line 1435 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 266:
- #line 1441 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 267:
- #line 1445 "parse.y"
- {
-- (yyval.node) = arg_concat((yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = arg_concat(yyvsp[-3].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 268:
- #line 1449 "parse.y"
- {
-- (yyval.node) = NEW_SPLAT((yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = NEW_SPLAT(yyvsp[0].node);
-+ ;}
- break;
-
- case 277:
- #line 1463 "parse.y"
- {
-- (yyval.node) = NEW_FCALL((yyvsp[(1) - (1)].id), 0);
-- }
-+ yyval.node = NEW_FCALL(yyvsp[0].id, 0);
-+ ;}
- break;
-
- case 278:
- #line 1467 "parse.y"
- {
-- (yyvsp[(1) - (1)].num) = ruby_sourceline;
-- }
-+ yyvsp[0].num = ruby_sourceline;
-+ ;}
- break;
-
- case 279:
- #line 1472 "parse.y"
- {
-- if ((yyvsp[(3) - (4)].node) == NULL)
-- (yyval.node) = NEW_NIL();
-+ if (yyvsp[-1].node == NULL)
-+ yyval.node = NEW_NIL();
- else
-- (yyval.node) = NEW_BEGIN((yyvsp[(3) - (4)].node));
-- nd_set_line((yyval.node), (yyvsp[(1) - (4)].num));
-- }
-+ yyval.node = NEW_BEGIN(yyvsp[-1].node);
-+ nd_set_line(yyval.node, yyvsp[-3].num);
-+ ;}
- break;
-
- case 280:
- #line 1479 "parse.y"
-- {lex_state = EXPR_ENDARG;}
-+ {lex_state = EXPR_ENDARG;;}
- break;
-
- case 281:
- #line 1480 "parse.y"
- {
- rb_warning("(...) interpreted as grouped expression");
-- (yyval.node) = (yyvsp[(2) - (5)].node);
-- }
-+ yyval.node = yyvsp[-3].node;
-+ ;}
- break;
-
- case 282:
- #line 1485 "parse.y"
- {
-- if (!(yyvsp[(2) - (3)].node)) (yyval.node) = NEW_NIL();
-- else (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ if (!yyvsp[-1].node) yyval.node = NEW_NIL();
-+ else yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 283:
- #line 1490 "parse.y"
- {
-- (yyval.node) = NEW_COLON2((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id));
-- }
-+ yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id);
-+ ;}
- break;
-
- case 284:
- #line 1494 "parse.y"
- {
-- (yyval.node) = NEW_COLON3((yyvsp[(2) - (2)].id));
-- }
-+ yyval.node = NEW_COLON3(yyvsp[0].id);
-+ ;}
- break;
-
- case 285:
- #line 1498 "parse.y"
- {
-- if ((yyvsp[(1) - (4)].node) && nd_type((yyvsp[(1) - (4)].node)) == NODE_SELF)
-- (yyval.node) = NEW_FCALL(tAREF, (yyvsp[(3) - (4)].node));
-+ if (yyvsp[-3].node && nd_type(yyvsp[-3].node) == NODE_SELF)
-+ yyval.node = NEW_FCALL(tAREF, yyvsp[-1].node);
- else
-- (yyval.node) = NEW_CALL((yyvsp[(1) - (4)].node), tAREF, (yyvsp[(3) - (4)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
-- }
-+ yyval.node = NEW_CALL(yyvsp[-3].node, tAREF, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 286:
- #line 1506 "parse.y"
- {
-- if ((yyvsp[(2) - (3)].node) == 0) {
-- (yyval.node) = NEW_ZARRAY(); /* zero length array*/
-+ if (yyvsp[-1].node == 0) {
-+ yyval.node = NEW_ZARRAY(); /* zero length array*/
- }
- else {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-+ yyval.node = yyvsp[-1].node;
- }
-- }
-+ ;}
- break;
-
- case 287:
- #line 1515 "parse.y"
- {
-- (yyval.node) = NEW_HASH((yyvsp[(2) - (3)].node));
-- }
-+ yyval.node = NEW_HASH(yyvsp[-1].node);
-+ ;}
- break;
-
- case 288:
- #line 1519 "parse.y"
- {
-- (yyval.node) = NEW_RETURN(0);
-- }
-+ yyval.node = NEW_RETURN(0);
-+ ;}
- break;
-
- case 289:
- #line 1523 "parse.y"
- {
-- (yyval.node) = new_yield((yyvsp[(3) - (4)].node));
-- }
-+ yyval.node = new_yield(yyvsp[-1].node);
-+ ;}
- break;
-
- case 290:
- #line 1527 "parse.y"
- {
-- (yyval.node) = NEW_YIELD(0, Qfalse);
-- }
-+ yyval.node = NEW_YIELD(0, Qfalse);
-+ ;}
- break;
-
- case 291:
- #line 1531 "parse.y"
- {
-- (yyval.node) = NEW_YIELD(0, Qfalse);
-- }
-+ yyval.node = NEW_YIELD(0, Qfalse);
-+ ;}
- break;
-
- case 292:
- #line 1534 "parse.y"
-- {in_defined = 1;}
-+ {in_defined = 1;;}
- break;
-
- case 293:
- #line 1535 "parse.y"
- {
- in_defined = 0;
-- (yyval.node) = NEW_DEFINED((yyvsp[(5) - (6)].node));
-- }
-+ yyval.node = NEW_DEFINED(yyvsp[-1].node);
-+ ;}
- break;
-
- case 294:
- #line 1540 "parse.y"
- {
-- (yyvsp[(2) - (2)].node)->nd_iter = NEW_FCALL((yyvsp[(1) - (2)].id), 0);
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- fixpos((yyvsp[(2) - (2)].node)->nd_iter, (yyvsp[(2) - (2)].node));
-- }
-+ yyvsp[0].node->nd_iter = NEW_FCALL(yyvsp[-1].id, 0);
-+ yyval.node = yyvsp[0].node;
-+ fixpos(yyvsp[0].node->nd_iter, yyvsp[0].node);
-+ ;}
- break;
-
- case 296:
- #line 1547 "parse.y"
- {
-- if ((yyvsp[(1) - (2)].node) && nd_type((yyvsp[(1) - (2)].node)) == NODE_BLOCK_PASS) {
-+ if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) {
- rb_compile_error("both block arg and actual block given");
- }
-- (yyvsp[(2) - (2)].node)->nd_iter = (yyvsp[(1) - (2)].node);
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- fixpos((yyval.node), (yyvsp[(1) - (2)].node));
-- }
-+ yyvsp[0].node->nd_iter = yyvsp[-1].node;
-+ yyval.node = yyvsp[0].node;
-+ fixpos(yyval.node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 297:
- #line 1559 "parse.y"
- {
-- (yyval.node) = NEW_IF(cond((yyvsp[(2) - (6)].node)), (yyvsp[(4) - (6)].node), (yyvsp[(5) - (6)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (6)].node));
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- NODE *tmp = (yyval.node)->nd_body;
-- (yyval.node)->nd_body = (yyval.node)->nd_else;
-- (yyval.node)->nd_else = tmp;
-+ yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ NODE *tmp = yyval.node->nd_body;
-+ yyval.node->nd_body = yyval.node->nd_else;
-+ yyval.node->nd_else = tmp;
- }
-- }
-+ ;}
- break;
-
- case 298:
- #line 1572 "parse.y"
- {
-- (yyval.node) = NEW_UNLESS(cond((yyvsp[(2) - (6)].node)), (yyvsp[(4) - (6)].node), (yyvsp[(5) - (6)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (6)].node));
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- NODE *tmp = (yyval.node)->nd_body;
-- (yyval.node)->nd_body = (yyval.node)->nd_else;
-- (yyval.node)->nd_else = tmp;
-+ yyval.node = NEW_UNLESS(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ NODE *tmp = yyval.node->nd_body;
-+ yyval.node->nd_body = yyval.node->nd_else;
-+ yyval.node->nd_else = tmp;
- }
-- }
-+ ;}
- break;
-
- case 299:
- #line 1581 "parse.y"
-- {COND_PUSH(1);}
-+ {COND_PUSH(1);;}
- break;
-
- case 300:
- #line 1581 "parse.y"
-- {COND_POP();}
-+ {COND_POP();;}
- break;
-
- case 301:
- #line 1584 "parse.y"
- {
-- (yyval.node) = NEW_WHILE(cond((yyvsp[(3) - (7)].node)), (yyvsp[(6) - (7)].node), 1);
-- fixpos((yyval.node), (yyvsp[(3) - (7)].node));
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- nd_set_type((yyval.node), NODE_UNTIL);
-+ yyval.node = NEW_WHILE(cond(yyvsp[-4].node), yyvsp[-1].node, 1);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ nd_set_type(yyval.node, NODE_UNTIL);
- }
-- }
-+ ;}
- break;
-
- case 302:
- #line 1591 "parse.y"
-- {COND_PUSH(1);}
-+ {COND_PUSH(1);;}
- break;
-
- case 303:
- #line 1591 "parse.y"
-- {COND_POP();}
-+ {COND_POP();;}
- break;
-
- case 304:
- #line 1594 "parse.y"
- {
-- (yyval.node) = NEW_UNTIL(cond((yyvsp[(3) - (7)].node)), (yyvsp[(6) - (7)].node), 1);
-- fixpos((yyval.node), (yyvsp[(3) - (7)].node));
-- if (cond_negative(&(yyval.node)->nd_cond)) {
-- nd_set_type((yyval.node), NODE_WHILE);
-+ yyval.node = NEW_UNTIL(cond(yyvsp[-4].node), yyvsp[-1].node, 1);
-+ fixpos(yyval.node, yyvsp[-4].node);
-+ if (cond_negative(&yyval.node->nd_cond)) {
-+ nd_set_type(yyval.node, NODE_WHILE);
- }
-- }
-+ ;}
- break;
-
- case 305:
- #line 1604 "parse.y"
- {
-- (yyval.node) = NEW_CASE((yyvsp[(2) - (5)].node), (yyvsp[(4) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (5)].node));
-- }
-+ yyval.node = NEW_CASE(yyvsp[-3].node, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 306:
- #line 1609 "parse.y"
- {
-- (yyval.node) = (yyvsp[(3) - (4)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 307:
- #line 1613 "parse.y"
- {
-- (yyval.node) = (yyvsp[(4) - (5)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 308:
- #line 1616 "parse.y"
-- {COND_PUSH(1);}
-+ {COND_PUSH(1);;}
- break;
-
- case 309:
- #line 1616 "parse.y"
-- {COND_POP();}
-+ {COND_POP();;}
- break;
-
- case 310:
- #line 1619 "parse.y"
- {
-- (yyval.node) = NEW_FOR((yyvsp[(2) - (9)].node), (yyvsp[(5) - (9)].node), (yyvsp[(8) - (9)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (9)].node));
-- }
-+ yyval.node = NEW_FOR(yyvsp[-7].node, yyvsp[-4].node, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-7].node);
-+ ;}
- break;
-
- case 311:
-@@ -6226,48 +5893,48 @@
- yyerror("class definition in method body");
- class_nest++;
- local_push(0);
-- (yyval.num) = ruby_sourceline;
-- }
-+ yyval.num = ruby_sourceline;
-+ ;}
- break;
-
- case 312:
- #line 1633 "parse.y"
- {
-- (yyval.node) = NEW_CLASS((yyvsp[(2) - (6)].node), (yyvsp[(5) - (6)].node), (yyvsp[(3) - (6)].node));
-- nd_set_line((yyval.node), (yyvsp[(4) - (6)].num));
-+ yyval.node = NEW_CLASS(yyvsp[-4].node, yyvsp[-1].node, yyvsp[-3].node);
-+ nd_set_line(yyval.node, yyvsp[-2].num);
- local_pop();
- class_nest--;
-- }
-+ ;}
- break;
-
- case 313:
- #line 1640 "parse.y"
- {
-- (yyval.num) = in_def;
-+ yyval.num = in_def;
- in_def = 0;
-- }
-+ ;}
- break;
-
- case 314:
- #line 1645 "parse.y"
- {
-- (yyval.num) = in_single;
-+ yyval.num = in_single;
- in_single = 0;
- class_nest++;
- local_push(0);
-- }
-+ ;}
- break;
-
- case 315:
- #line 1653 "parse.y"
- {
-- (yyval.node) = NEW_SCLASS((yyvsp[(3) - (8)].node), (yyvsp[(7) - (8)].node));
-- fixpos((yyval.node), (yyvsp[(3) - (8)].node));
-+ yyval.node = NEW_SCLASS(yyvsp[-5].node, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-5].node);
- local_pop();
- class_nest--;
-- in_def = (yyvsp[(4) - (8)].num);
-- in_single = (yyvsp[(6) - (8)].num);
-- }
-+ in_def = yyvsp[-4].num;
-+ in_single = yyvsp[-2].num;
-+ ;}
- break;
-
- case 316:
-@@ -6277,45 +5944,45 @@
- yyerror("module definition in method body");
- class_nest++;
- local_push(0);
-- (yyval.num) = ruby_sourceline;
-- }
-+ yyval.num = ruby_sourceline;
-+ ;}
- break;
-
- case 317:
- #line 1671 "parse.y"
- {
-- (yyval.node) = NEW_MODULE((yyvsp[(2) - (5)].node), (yyvsp[(4) - (5)].node));
-- nd_set_line((yyval.node), (yyvsp[(3) - (5)].num));
-+ yyval.node = NEW_MODULE(yyvsp[-3].node, yyvsp[-1].node);
-+ nd_set_line(yyval.node, yyvsp[-2].num);
- local_pop();
- class_nest--;
-- }
-+ ;}
- break;
-
- case 318:
- #line 1678 "parse.y"
- {
-- (yyval.id) = cur_mid;
-- cur_mid = (yyvsp[(2) - (2)].id);
-+ yyval.id = cur_mid;
-+ cur_mid = yyvsp[0].id;
- in_def++;
- local_push(0);
-- }
-+ ;}
- break;
-
- case 319:
- #line 1687 "parse.y"
- {
-- if (!(yyvsp[(5) - (6)].node)) (yyvsp[(5) - (6)].node) = NEW_NIL();
-- (yyval.node) = NEW_DEFN((yyvsp[(2) - (6)].id), (yyvsp[(4) - (6)].node), (yyvsp[(5) - (6)].node), NOEX_PRIVATE);
-- fixpos((yyval.node), (yyvsp[(4) - (6)].node));
-+ if (!yyvsp[-1].node) yyvsp[-1].node = NEW_NIL();
-+ yyval.node = NEW_DEFN(yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node, NOEX_PRIVATE);
-+ fixpos(yyval.node, yyvsp[-2].node);
- local_pop();
- in_def--;
-- cur_mid = (yyvsp[(3) - (6)].id);
-- }
-+ cur_mid = yyvsp[-3].id;
-+ ;}
- break;
-
- case 320:
- #line 1695 "parse.y"
-- {lex_state = EXPR_FNAME;}
-+ {lex_state = EXPR_FNAME;;}
- break;
-
- case 321:
-@@ -6324,325 +5991,325 @@
- in_single++;
- local_push(0);
- lex_state = EXPR_END; /* force for args */
-- }
-+ ;}
- break;
-
- case 322:
- #line 1704 "parse.y"
- {
-- (yyval.node) = NEW_DEFS((yyvsp[(2) - (9)].node), (yyvsp[(5) - (9)].id), (yyvsp[(7) - (9)].node), (yyvsp[(8) - (9)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (9)].node));
-+ yyval.node = NEW_DEFS(yyvsp[-7].node, yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node);
-+ fixpos(yyval.node, yyvsp[-7].node);
- local_pop();
- in_single--;
-- }
-+ ;}
- break;
-
- case 323:
- #line 1711 "parse.y"
- {
-- (yyval.node) = NEW_BREAK(0);
-- }
-+ yyval.node = NEW_BREAK(0);
-+ ;}
- break;
-
- case 324:
- #line 1715 "parse.y"
- {
-- (yyval.node) = NEW_NEXT(0);
-- }
-+ yyval.node = NEW_NEXT(0);
-+ ;}
- break;
-
- case 325:
- #line 1719 "parse.y"
- {
-- (yyval.node) = NEW_REDO();
-- }
-+ yyval.node = NEW_REDO();
-+ ;}
- break;
-
- case 326:
- #line 1723 "parse.y"
- {
-- (yyval.node) = NEW_RETRY();
-- }
-+ yyval.node = NEW_RETRY();
-+ ;}
- break;
-
- case 327:
- #line 1729 "parse.y"
- {
-- value_expr((yyvsp[(1) - (1)].node));
-- (yyval.node) = (yyvsp[(1) - (1)].node);
-- }
-+ value_expr(yyvsp[0].node);
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 336:
- #line 1750 "parse.y"
- {
-- (yyval.node) = NEW_IF(cond((yyvsp[(2) - (5)].node)), (yyvsp[(4) - (5)].node), (yyvsp[(5) - (5)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (5)].node));
-- }
-+ yyval.node = NEW_IF(cond(yyvsp[-3].node), yyvsp[-1].node, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 338:
- #line 1758 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 342:
- #line 1769 "parse.y"
- {
-- (yyval.node) = (NODE*)1;
-- }
-+ yyval.node = (NODE*)1;
-+ ;}
- break;
-
- case 343:
- #line 1773 "parse.y"
- {
-- (yyval.node) = (NODE*)1;
-- }
-+ yyval.node = (NODE*)1;
-+ ;}
- break;
-
- case 344:
- #line 1777 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 345:
- #line 1783 "parse.y"
- {
-- (yyval.vars) = dyna_push();
-- (yyvsp[(1) - (1)].num) = ruby_sourceline;
-- }
-+ yyval.vars = dyna_push();
-+ yyvsp[0].num = ruby_sourceline;
-+ ;}
- break;
-
- case 346:
- #line 1787 "parse.y"
-- {(yyval.vars) = ruby_dyna_vars;}
-+ {yyval.vars = ruby_dyna_vars;;}
- break;
-
- case 347:
- #line 1790 "parse.y"
- {
-- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
-- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
-- dyna_pop((yyvsp[(2) - (6)].vars));
-- }
-+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
-+ nd_set_line(yyval.node, yyvsp[-5].num);
-+ dyna_pop(yyvsp[-4].vars);
-+ ;}
- break;
-
- case 348:
- #line 1798 "parse.y"
- {
-- if ((yyvsp[(1) - (2)].node) && nd_type((yyvsp[(1) - (2)].node)) == NODE_BLOCK_PASS) {
-+ if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) {
- rb_compile_error("both block arg and actual block given");
- }
-- (yyvsp[(2) - (2)].node)->nd_iter = (yyvsp[(1) - (2)].node);
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- fixpos((yyval.node), (yyvsp[(1) - (2)].node));
-- }
-+ yyvsp[0].node->nd_iter = yyvsp[-1].node;
-+ yyval.node = yyvsp[0].node;
-+ fixpos(yyval.node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 349:
- #line 1807 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ ;}
- break;
-
- case 350:
- #line 1811 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ ;}
- break;
-
- case 351:
- #line 1817 "parse.y"
- {
-- (yyval.node) = new_fcall((yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = new_fcall(yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[0].node);
-+ ;}
- break;
-
- case 352:
- #line 1822 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 353:
- #line 1827 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].node));
-- fixpos((yyval.node), (yyvsp[(1) - (4)].node));
-- }
-+ yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-3].node);
-+ ;}
- break;
-
- case 354:
- #line 1832 "parse.y"
- {
-- (yyval.node) = new_call((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].id), 0);
-- }
-+ yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0);
-+ ;}
- break;
-
- case 355:
- #line 1836 "parse.y"
- {
-- (yyval.node) = new_super((yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = new_super(yyvsp[0].node);
-+ ;}
- break;
-
- case 356:
- #line 1840 "parse.y"
- {
-- (yyval.node) = NEW_ZSUPER();
-- }
-+ yyval.node = NEW_ZSUPER();
-+ ;}
- break;
-
- case 357:
- #line 1846 "parse.y"
- {
-- (yyval.vars) = dyna_push();
-- (yyvsp[(1) - (1)].num) = ruby_sourceline;
-- }
-+ yyval.vars = dyna_push();
-+ yyvsp[0].num = ruby_sourceline;
-+ ;}
- break;
-
- case 358:
- #line 1850 "parse.y"
-- {(yyval.vars) = ruby_dyna_vars;}
-+ {yyval.vars = ruby_dyna_vars;;}
- break;
-
- case 359:
- #line 1852 "parse.y"
- {
-- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
-- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
-- dyna_pop((yyvsp[(2) - (6)].vars));
-- }
-+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
-+ nd_set_line(yyval.node, yyvsp[-5].num);
-+ dyna_pop(yyvsp[-4].vars);
-+ ;}
- break;
-
- case 360:
- #line 1858 "parse.y"
- {
-- (yyval.vars) = dyna_push();
-- (yyvsp[(1) - (1)].num) = ruby_sourceline;
-- }
-+ yyval.vars = dyna_push();
-+ yyvsp[0].num = ruby_sourceline;
-+ ;}
- break;
-
- case 361:
- #line 1862 "parse.y"
-- {(yyval.vars) = ruby_dyna_vars;}
-+ {yyval.vars = ruby_dyna_vars;;}
- break;
-
- case 362:
- #line 1864 "parse.y"
- {
-- (yyval.node) = NEW_ITER((yyvsp[(3) - (6)].node), 0, dyna_init((yyvsp[(5) - (6)].node), (yyvsp[(4) - (6)].vars)));
-- nd_set_line((yyval.node), (yyvsp[(1) - (6)].num));
-- dyna_pop((yyvsp[(2) - (6)].vars));
-- }
-+ yyval.node = NEW_ITER(yyvsp[-3].node, 0, dyna_init(yyvsp[-1].node, yyvsp[-2].vars));
-+ nd_set_line(yyval.node, yyvsp[-5].num);
-+ dyna_pop(yyvsp[-4].vars);
-+ ;}
- break;
-
- case 363:
- #line 1874 "parse.y"
- {
-- (yyval.node) = NEW_WHEN((yyvsp[(2) - (5)].node), (yyvsp[(4) - (5)].node), (yyvsp[(5) - (5)].node));
-- }
-+ yyval.node = NEW_WHEN(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 365:
- #line 1880 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (4)].node), NEW_WHEN((yyvsp[(4) - (4)].node), 0, 0));
-- }
-+ yyval.node = list_append(yyvsp[-3].node, NEW_WHEN(yyvsp[0].node, 0, 0));
-+ ;}
- break;
-
- case 366:
- #line 1884 "parse.y"
- {
-- (yyval.node) = NEW_LIST(NEW_WHEN((yyvsp[(2) - (2)].node), 0, 0));
-- }
-+ yyval.node = NEW_LIST(NEW_WHEN(yyvsp[0].node, 0, 0));
-+ ;}
- break;
-
- case 369:
- #line 1896 "parse.y"
- {
-- if ((yyvsp[(3) - (6)].node)) {
-- (yyvsp[(3) - (6)].node) = node_assign((yyvsp[(3) - (6)].node), NEW_GVAR(rb_intern("$!")));
-- (yyvsp[(5) - (6)].node) = block_append((yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].node));
-- }
-- (yyval.node) = NEW_RESBODY((yyvsp[(2) - (6)].node), (yyvsp[(5) - (6)].node), (yyvsp[(6) - (6)].node));
-- fixpos((yyval.node), (yyvsp[(2) - (6)].node)?(yyvsp[(2) - (6)].node):(yyvsp[(5) - (6)].node));
-- }
-+ if (yyvsp[-3].node) {
-+ yyvsp[-3].node = node_assign(yyvsp[-3].node, NEW_GVAR(rb_intern("$!")));
-+ yyvsp[-1].node = block_append(yyvsp[-3].node, yyvsp[-1].node);
-+ }
-+ yyval.node = NEW_RESBODY(yyvsp[-4].node, yyvsp[-1].node, yyvsp[0].node);
-+ fixpos(yyval.node, yyvsp[-4].node?yyvsp[-4].node:yyvsp[-1].node);
-+ ;}
- break;
-
- case 371:
- #line 1908 "parse.y"
- {
-- (yyval.node) = NEW_LIST((yyvsp[(1) - (1)].node));
-- }
-+ yyval.node = NEW_LIST(yyvsp[0].node);
-+ ;}
- break;
-
- case 374:
- #line 1916 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 376:
- #line 1923 "parse.y"
- {
-- if ((yyvsp[(2) - (2)].node))
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-+ if (yyvsp[0].node)
-+ yyval.node = yyvsp[0].node;
- else
- /* place holder */
-- (yyval.node) = NEW_NIL();
-- }
-+ yyval.node = NEW_NIL();
-+ ;}
- break;
-
- case 379:
- #line 1935 "parse.y"
- {
-- (yyval.node) = NEW_LIT(ID2SYM((yyvsp[(1) - (1)].id)));
-- }
-+ yyval.node = NEW_LIT(ID2SYM(yyvsp[0].id));
-+ ;}
- break;
-
- case 381:
- #line 1942 "parse.y"
- {
-- NODE *node = (yyvsp[(1) - (1)].node);
-+ NODE *node = yyvsp[0].node;
- if (!node) {
- node = NEW_STR(rb_str_new(0, 0));
- }
- else {
- node = evstr2dstr(node);
- }
-- (yyval.node) = node;
-- }
-+ yyval.node = node;
-+ ;}
- break;
-
- case 383:
- #line 1956 "parse.y"
- {
-- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 384:
- #line 1962 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 385:
- #line 1968 "parse.y"
- {
-- NODE *node = (yyvsp[(2) - (3)].node);
-+ NODE *node = yyvsp[-1].node;
- if (!node) {
- node = NEW_XSTR(rb_str_new(0, 0));
- }
-@@ -6659,15 +6326,15 @@
- break;
- }
- }
-- (yyval.node) = node;
-- }
-+ yyval.node = node;
-+ ;}
- break;
-
- case 386:
- #line 1991 "parse.y"
- {
-- int options = (yyvsp[(3) - (3)].num);
-- NODE *node = (yyvsp[(2) - (3)].node);
-+ int options = yyvsp[0].num;
-+ NODE *node = yyvsp[-1].node;
- if (!node) {
- node = NEW_LIT(rb_reg_new("", 0, options & ~RE_OPTION_ONCE));
- }
-@@ -6693,499 +6360,499 @@
- node->nd_cflag = options & ~RE_OPTION_ONCE;
- break;
- }
-- (yyval.node) = node;
-- }
-+ yyval.node = node;
-+ ;}
- break;
-
- case 387:
- #line 2024 "parse.y"
- {
-- (yyval.node) = NEW_ZARRAY();
-- }
-+ yyval.node = NEW_ZARRAY();
-+ ;}
- break;
-
- case 388:
- #line 2028 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 389:
- #line 2034 "parse.y"
- {
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 390:
- #line 2038 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (3)].node), evstr2dstr((yyvsp[(2) - (3)].node)));
-- }
-+ yyval.node = list_append(yyvsp[-2].node, evstr2dstr(yyvsp[-1].node));
-+ ;}
- break;
-
- case 392:
- #line 2045 "parse.y"
- {
-- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 393:
- #line 2051 "parse.y"
- {
-- (yyval.node) = NEW_ZARRAY();
-- }
-+ yyval.node = NEW_ZARRAY();
-+ ;}
- break;
-
- case 394:
- #line 2055 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (3)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 395:
- #line 2061 "parse.y"
- {
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 396:
- #line 2065 "parse.y"
- {
-- (yyval.node) = list_append((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].node));
-- }
-+ yyval.node = list_append(yyvsp[-2].node, yyvsp[-1].node);
-+ ;}
- break;
-
- case 397:
- #line 2071 "parse.y"
- {
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 398:
- #line 2075 "parse.y"
- {
-- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 399:
- #line 2081 "parse.y"
- {
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 400:
- #line 2085 "parse.y"
- {
-- (yyval.node) = literal_concat((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = literal_concat(yyvsp[-1].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 402:
- #line 2092 "parse.y"
- {
-- (yyval.node) = lex_strterm;
-+ yyval.node = lex_strterm;
- lex_strterm = 0;
- lex_state = EXPR_BEG;
-- }
-+ ;}
- break;
-
- case 403:
- #line 2098 "parse.y"
- {
-- lex_strterm = (yyvsp[(2) - (3)].node);
-- (yyval.node) = NEW_EVSTR((yyvsp[(3) - (3)].node));
-- }
-+ lex_strterm = yyvsp[-1].node;
-+ yyval.node = NEW_EVSTR(yyvsp[0].node);
-+ ;}
- break;
-
- case 404:
- #line 2103 "parse.y"
- {
-- (yyval.node) = lex_strterm;
-+ yyval.node = lex_strterm;
- lex_strterm = 0;
- lex_state = EXPR_BEG;
- COND_PUSH(0);
- CMDARG_PUSH(0);
-- }
-+ ;}
- break;
-
- case 405:
- #line 2111 "parse.y"
- {
-- lex_strterm = (yyvsp[(2) - (4)].node);
-+ lex_strterm = yyvsp[-2].node;
- COND_LEXPOP();
- CMDARG_LEXPOP();
-- if (((yyval.node) = (yyvsp[(3) - (4)].node)) && nd_type((yyval.node)) == NODE_NEWLINE) {
-- (yyval.node) = (yyval.node)->nd_next;
-- rb_gc_force_recycle((VALUE)(yyvsp[(3) - (4)].node));
-+ if ((yyval.node = yyvsp[-1].node) && nd_type(yyval.node) == NODE_NEWLINE) {
-+ yyval.node = yyval.node->nd_next;
-+ rb_gc_force_recycle((VALUE)yyvsp[-1].node);
- }
-- (yyval.node) = new_evstr((yyval.node));
-- }
-+ yyval.node = new_evstr(yyval.node);
-+ ;}
- break;
-
- case 406:
- #line 2123 "parse.y"
-- {(yyval.node) = NEW_GVAR((yyvsp[(1) - (1)].id));}
-+ {yyval.node = NEW_GVAR(yyvsp[0].id);;}
- break;
-
- case 407:
- #line 2124 "parse.y"
-- {(yyval.node) = NEW_IVAR((yyvsp[(1) - (1)].id));}
-+ {yyval.node = NEW_IVAR(yyvsp[0].id);;}
- break;
-
- case 408:
- #line 2125 "parse.y"
-- {(yyval.node) = NEW_CVAR((yyvsp[(1) - (1)].id));}
-+ {yyval.node = NEW_CVAR(yyvsp[0].id);;}
- break;
-
- case 410:
- #line 2130 "parse.y"
- {
- lex_state = EXPR_END;
-- (yyval.id) = (yyvsp[(2) - (2)].id);
-- }
-+ yyval.id = yyvsp[0].id;
-+ ;}
- break;
-
- case 415:
- #line 2143 "parse.y"
- {
- lex_state = EXPR_END;
-- if (!((yyval.node) = (yyvsp[(2) - (3)].node))) {
-+ if (!(yyval.node = yyvsp[-1].node)) {
- yyerror("empty symbol literal");
- }
- else {
- VALUE lit;
-
-- switch (nd_type((yyval.node))) {
-+ switch (nd_type(yyval.node)) {
- case NODE_DSTR:
-- nd_set_type((yyval.node), NODE_DSYM);
-+ nd_set_type(yyval.node, NODE_DSYM);
- break;
- case NODE_STR:
-- lit = (yyval.node)->nd_lit;
-+ lit = yyval.node->nd_lit;
- if (RSTRING(lit)->len == 0) {
- yyerror("empty symbol literal");
- break;
- }
- if (strlen(RSTRING(lit)->ptr) == RSTRING(lit)->len) {
-- (yyval.node)->nd_lit = ID2SYM(rb_intern(RSTRING((yyval.node)->nd_lit)->ptr));
-- nd_set_type((yyval.node), NODE_LIT);
-+ yyval.node->nd_lit = ID2SYM(rb_intern(RSTRING(yyval.node->nd_lit)->ptr));
-+ nd_set_type(yyval.node, NODE_LIT);
- break;
- }
- /* fall through */
- default:
-- (yyval.node) = NEW_NODE(NODE_DSYM, rb_str_new(0, 0), 1, NEW_LIST((yyval.node)));
-+ yyval.node = NEW_NODE(NODE_DSYM, rb_str_new(0, 0), 1, NEW_LIST(yyval.node));
- break;
- }
- }
-- }
-+ ;}
- break;
-
- case 418:
- #line 2178 "parse.y"
- {
-- (yyval.node) = negate_lit((yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = negate_lit(yyvsp[0].node);
-+ ;}
- break;
-
- case 419:
- #line 2182 "parse.y"
- {
-- (yyval.node) = negate_lit((yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = negate_lit(yyvsp[0].node);
-+ ;}
- break;
-
- case 425:
- #line 2192 "parse.y"
-- {(yyval.id) = kNIL;}
-+ {yyval.id = kNIL;;}
- break;
-
- case 426:
- #line 2193 "parse.y"
-- {(yyval.id) = kSELF;}
-+ {yyval.id = kSELF;;}
- break;
-
- case 427:
- #line 2194 "parse.y"
-- {(yyval.id) = kTRUE;}
-+ {yyval.id = kTRUE;;}
- break;
-
- case 428:
- #line 2195 "parse.y"
-- {(yyval.id) = kFALSE;}
-+ {yyval.id = kFALSE;;}
- break;
-
- case 429:
- #line 2196 "parse.y"
-- {(yyval.id) = k__FILE__;}
-+ {yyval.id = k__FILE__;;}
- break;
-
- case 430:
- #line 2197 "parse.y"
-- {(yyval.id) = k__LINE__;}
-+ {yyval.id = k__LINE__;;}
- break;
-
- case 431:
- #line 2201 "parse.y"
- {
-- (yyval.node) = gettable((yyvsp[(1) - (1)].id));
-- }
-+ yyval.node = gettable(yyvsp[0].id);
-+ ;}
- break;
-
- case 432:
- #line 2207 "parse.y"
- {
-- (yyval.node) = assignable((yyvsp[(1) - (1)].id), 0);
-- }
-+ yyval.node = assignable(yyvsp[0].id, 0);
-+ ;}
- break;
-
- case 435:
- #line 2217 "parse.y"
- {
-- (yyval.node) = 0;
-- }
-+ yyval.node = 0;
-+ ;}
- break;
-
- case 436:
- #line 2221 "parse.y"
- {
- lex_state = EXPR_BEG;
-- }
-+ ;}
- break;
-
- case 437:
- #line 2225 "parse.y"
- {
-- (yyval.node) = (yyvsp[(3) - (4)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 438:
- #line 2228 "parse.y"
-- {yyerrok; (yyval.node) = 0;}
-+ {yyerrok; yyval.node = 0;;}
- break;
-
- case 439:
- #line 2232 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (4)].node);
-+ yyval.node = yyvsp[-2].node;
- lex_state = EXPR_BEG;
- command_start = Qtrue;
-- }
-+ ;}
- break;
-
- case 440:
- #line 2238 "parse.y"
- {
-- (yyval.node) = (yyvsp[(1) - (2)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 441:
- #line 2244 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (6)].num), (yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].node)), (yyvsp[(6) - (6)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(yyvsp[-5].num, yyvsp[-3].node, yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 442:
- #line 2248 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (4)].num), (yyvsp[(3) - (4)].node), 0), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, yyvsp[-1].node, 0), yyvsp[0].node);
-+ ;}
- break;
-
- case 443:
- #line 2252 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (4)].num), 0, (yyvsp[(3) - (4)].node)), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, 0, yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 444:
- #line 2256 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS((yyvsp[(1) - (2)].num), 0, 0), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(yyvsp[-1].num, 0, 0), yyvsp[0].node);
-+ ;}
- break;
-
- case 445:
- #line 2260 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS(0, (yyvsp[(1) - (4)].node), (yyvsp[(3) - (4)].node)), (yyvsp[(4) - (4)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(0, yyvsp[-3].node, yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 446:
- #line 2264 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS(0, (yyvsp[(1) - (2)].node), 0), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(0, yyvsp[-1].node, 0), yyvsp[0].node);
-+ ;}
- break;
-
- case 447:
- #line 2268 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS(0, 0, (yyvsp[(1) - (2)].node)), (yyvsp[(2) - (2)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(0, 0, yyvsp[-1].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 448:
- #line 2272 "parse.y"
- {
-- (yyval.node) = block_append(NEW_ARGS(0, 0, 0), (yyvsp[(1) - (1)].node));
-- }
-+ yyval.node = block_append(NEW_ARGS(0, 0, 0), yyvsp[0].node);
-+ ;}
- break;
-
- case 449:
- #line 2276 "parse.y"
- {
-- (yyval.node) = NEW_ARGS(0, 0, 0);
-- }
-+ yyval.node = NEW_ARGS(0, 0, 0);
-+ ;}
- break;
-
- case 450:
- #line 2282 "parse.y"
- {
- yyerror("formal argument cannot be a constant");
-- }
-+ ;}
- break;
-
- case 451:
- #line 2286 "parse.y"
- {
- yyerror("formal argument cannot be an instance variable");
-- }
-+ ;}
- break;
-
- case 452:
- #line 2290 "parse.y"
- {
- yyerror("formal argument cannot be a global variable");
-- }
-+ ;}
- break;
-
- case 453:
- #line 2294 "parse.y"
- {
- yyerror("formal argument cannot be a class variable");
-- }
-+ ;}
- break;
-
- case 454:
- #line 2298 "parse.y"
- {
-- if (!is_local_id((yyvsp[(1) - (1)].id)))
-+ if (!is_local_id(yyvsp[0].id))
- yyerror("formal argument must be local variable");
-- else if (local_id((yyvsp[(1) - (1)].id)))
-+ else if (local_id(yyvsp[0].id))
- yyerror("duplicate argument name");
-- local_cnt((yyvsp[(1) - (1)].id));
-- (yyval.num) = 1;
-- }
-+ local_cnt(yyvsp[0].id);
-+ yyval.num = 1;
-+ ;}
- break;
-
- case 456:
- #line 2310 "parse.y"
- {
-- (yyval.num) += 1;
-- }
-+ yyval.num += 1;
-+ ;}
- break;
-
- case 457:
- #line 2316 "parse.y"
- {
-- if (!is_local_id((yyvsp[(1) - (3)].id)))
-+ if (!is_local_id(yyvsp[-2].id))
- yyerror("formal argument must be local variable");
-- else if (local_id((yyvsp[(1) - (3)].id)))
-+ else if (local_id(yyvsp[-2].id))
- yyerror("duplicate optional argument name");
-- (yyval.node) = assignable((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = assignable(yyvsp[-2].id, yyvsp[0].node);
-+ ;}
- break;
-
- case 458:
- #line 2326 "parse.y"
- {
-- (yyval.node) = NEW_BLOCK((yyvsp[(1) - (1)].node));
-- (yyval.node)->nd_end = (yyval.node);
-- }
-+ yyval.node = NEW_BLOCK(yyvsp[0].node);
-+ yyval.node->nd_end = yyval.node;
-+ ;}
- break;
-
- case 459:
- #line 2331 "parse.y"
- {
-- (yyval.node) = block_append((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = block_append(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 462:
- #line 2341 "parse.y"
- {
-- if (!is_local_id((yyvsp[(2) - (2)].id)))
-+ if (!is_local_id(yyvsp[0].id))
- yyerror("rest argument must be local variable");
- if (dyna_in_block()) {
-- rb_dvar_push((yyvsp[(2) - (2)].id), Qnil);
-+ rb_dvar_push(yyvsp[0].id, Qnil);
- }
-- (yyval.node) = assignable((yyvsp[(2) - (2)].id), 0);
-- }
-+ yyval.node = assignable(yyvsp[0].id, 0);
-+ ;}
- break;
-
- case 463:
- #line 2350 "parse.y"
- {
- if (dyna_in_block()) {
-- (yyval.node) = NEW_DASGN_CURR(internal_id(), 0);
-+ yyval.node = NEW_DASGN_CURR(internal_id(), 0);
- }
- else {
-- (yyval.node) = NEW_NODE(NODE_LASGN,0,0,local_append(0));
-+ yyval.node = NEW_NODE(NODE_LASGN,0,0,local_append(0));
- }
-- }
-+ ;}
- break;
-
- case 466:
- #line 2365 "parse.y"
- {
-- if (!is_local_id((yyvsp[(2) - (2)].id)))
-+ if (!is_local_id(yyvsp[0].id))
- yyerror("block argument must be local variable");
-- else if (local_id((yyvsp[(2) - (2)].id)))
-+ else if (local_id(yyvsp[0].id))
- yyerror("duplicate block argument name");
-- (yyval.node) = NEW_BLOCK_ARG((yyvsp[(2) - (2)].id));
-- }
-+ yyval.node = NEW_BLOCK_ARG(yyvsp[0].id);
-+ ;}
- break;
-
- case 467:
- #line 2375 "parse.y"
- {
-- (yyval.node) = (yyvsp[(2) - (2)].node);
-- }
-+ yyval.node = yyvsp[0].node;
-+ ;}
- break;
-
- case 469:
- #line 2382 "parse.y"
- {
-- (yyval.node) = (yyvsp[(1) - (1)].node);
-- value_expr((yyval.node));
-- }
-+ yyval.node = yyvsp[0].node;
-+ value_expr(yyval.node);
-+ ;}
- break;
-
- case 470:
- #line 2386 "parse.y"
-- {lex_state = EXPR_BEG;}
-+ {lex_state = EXPR_BEG;;}
- break;
-
- case 471:
- #line 2387 "parse.y"
- {
-- if ((yyvsp[(3) - (5)].node) == 0) {
-+ if (yyvsp[-2].node == 0) {
- yyerror("can't define singleton method for ().");
- }
- else {
-- switch (nd_type((yyvsp[(3) - (5)].node))) {
-+ switch (nd_type(yyvsp[-2].node)) {
- case NODE_STR:
- case NODE_DSTR:
- case NODE_XSTR:
-@@ -7196,69 +6863,70 @@
- case NODE_ZARRAY:
- yyerror("can't define singleton method for literals");
- default:
-- value_expr((yyvsp[(3) - (5)].node));
-+ value_expr(yyvsp[-2].node);
- break;
- }
- }
-- (yyval.node) = (yyvsp[(3) - (5)].node);
-- }
-+ yyval.node = yyvsp[-2].node;
-+ ;}
- break;
-
- case 473:
- #line 2413 "parse.y"
- {
-- (yyval.node) = (yyvsp[(1) - (2)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 474:
- #line 2417 "parse.y"
- {
-- if ((yyvsp[(1) - (2)].node)->nd_alen%2 != 0) {
-+ if (yyvsp[-1].node->nd_alen%2 != 0) {
- yyerror("odd number list for Hash");
- }
-- (yyval.node) = (yyvsp[(1) - (2)].node);
-- }
-+ yyval.node = yyvsp[-1].node;
-+ ;}
- break;
-
- case 476:
- #line 2427 "parse.y"
- {
-- (yyval.node) = list_concat((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = list_concat(yyvsp[-2].node, yyvsp[0].node);
-+ ;}
- break;
-
- case 477:
- #line 2433 "parse.y"
- {
-- (yyval.node) = list_append(NEW_LIST((yyvsp[(1) - (3)].node)), (yyvsp[(3) - (3)].node));
-- }
-+ yyval.node = list_append(NEW_LIST(yyvsp[-2].node), yyvsp[0].node);
-+ ;}
- break;
-
- case 497:
- #line 2471 "parse.y"
-- {yyerrok;}
-+ {yyerrok;;}
- break;
-
- case 500:
- #line 2476 "parse.y"
-- {yyerrok;}
-+ {yyerrok;;}
- break;
-
- case 501:
- #line 2479 "parse.y"
-- {(yyval.node) = 0;}
-+ {yyval.node = 0;;}
- break;
-
-
--/* Line 1267 of yacc.c. */
--#line 7256 "parse.c"
-- default: break;
- }
-- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-- YYPOPSTACK (yylen);
-- yylen = 0;
-+/* Line 1010 of yacc.c. */
-+#line 6925 "parse.c"
-+\f
-+ yyvsp -= yylen;
-+ yyssp -= yylen;
-+
-+
- YY_STACK_PRINT (yyss, yyssp);
-
- *++yyvsp = yyval;
-@@ -7287,65 +6955,99 @@
- if (!yyerrstatus)
- {
- ++yynerrs;
--#if ! YYERROR_VERBOSE
-- yyerror (YY_("syntax error"));
--#else
-- {
-- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-- {
-- YYSIZE_T yyalloc = 2 * yysize;
-- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-- yyalloc = YYSTACK_ALLOC_MAXIMUM;
-- if (yymsg != yymsgbuf)
-- YYSTACK_FREE (yymsg);
-- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-- if (yymsg)
-- yymsg_alloc = yyalloc;
-- else
-+#if YYERROR_VERBOSE
-+ yyn = yypact[yystate];
-+
-+ if (YYPACT_NINF < yyn && yyn < YYLAST)
-+ {
-+ YYSIZE_T yysize = 0;
-+ int yytype = YYTRANSLATE (yychar);
-+ const char* yyprefix;
-+ char *yymsg;
-+ int yyx;
-+
-+ /* Start YYX at -YYN if negative to avoid negative indexes in
-+ YYCHECK. */
-+ int yyxbegin = yyn < 0 ? -yyn : 0;
-+
-+ /* Stay within bounds of both yycheck and yytname. */
-+ int yychecklim = YYLAST - yyn;
-+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-+ int yycount = 0;
-+
-+ yyprefix = ", expecting ";
-+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
-- yymsg = yymsgbuf;
-- yymsg_alloc = sizeof yymsgbuf;
-+ yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-+ yycount += 1;
-+ if (yycount == 5)
-+ {
-+ yysize = 0;
-+ break;
-+ }
- }
-- }
-+ yysize += (sizeof ("syntax error, unexpected ")
-+ + yystrlen (yytname[yytype]));
-+ yymsg = (char *) YYSTACK_ALLOC (yysize);
-+ if (yymsg != 0)
-+ {
-+ char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-+ yyp = yystpcpy (yyp, yytname[yytype]);
-
-- if (0 < yysize && yysize <= yymsg_alloc)
-- {
-- (void) yysyntax_error (yymsg, yystate, yychar);
-- yyerror (yymsg);
-- }
-- else
-- {
-- yyerror (YY_("syntax error"));
-- if (yysize != 0)
-- goto yyexhaustedlab;
-- }
-- }
--#endif
-+ if (yycount < 5)
-+ {
-+ yyprefix = ", expecting ";
-+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-+ {
-+ yyp = yystpcpy (yyp, yyprefix);
-+ yyp = yystpcpy (yyp, yytname[yyx]);
-+ yyprefix = " or ";
-+ }
-+ }
-+ yyerror (yymsg);
-+ YYSTACK_FREE (yymsg);
-+ }
-+ else
-+ yyerror ("syntax error; also virtual memory exhausted");
-+ }
-+ else
-+#endif /* YYERROR_VERBOSE */
-+ yyerror ("syntax error");
- }
-
-
-
- if (yyerrstatus == 3)
- {
-- /* If just tried and failed to reuse look-ahead token after an
-+ /* If just tried and failed to reuse lookahead token after an
- error, discard it. */
-
- if (yychar <= YYEOF)
-- {
-- /* Return failure if at end of input. */
-+ {
-+ /* If at end of input, pop the error token,
-+ then the rest of the stack, then return failure. */
- if (yychar == YYEOF)
-- YYABORT;
-- }
-+ for (;;)
-+ {
-+ YYPOPSTACK;
-+ if (yyssp == yyss)
-+ YYABORT;
-+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-+ yydestruct (yystos[*yyssp], yyvsp);
-+ }
-+ }
- else
- {
-- yydestruct ("Error: discarding",
-- yytoken, &yylval);
-+ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-+ yydestruct (yytoken, &yylval);
- yychar = YYEMPTY;
-+
- }
- }
-
-- /* Else will try to reuse look-ahead token after shifting the error
-+ /* Else will try to reuse lookahead token after shifting the error
- token. */
- goto yyerrlab1;
-
-@@ -7355,17 +7057,15 @@
- `---------------------------------------------------*/
- yyerrorlab:
-
-- /* Pacify compilers like GCC when the user code never invokes
-- YYERROR and the label yyerrorlab therefore never appears in user
-- code. */
-- if (/*CONSTCOND*/ 0)
-+#ifdef __GNUC__
-+ /* Pacify GCC when the user code never invokes YYERROR and the label
-+ yyerrorlab therefore never appears in user code. */
-+ if (0)
- goto yyerrorlab;
-+#endif
-
-- /* Do not reclaim the symbols of the rule which action triggered
-- this YYERROR. */
-- YYPOPSTACK (yylen);
-- yylen = 0;
-- YY_STACK_PRINT (yyss, yyssp);
-+ yyvsp -= yylen;
-+ yyssp -= yylen;
- yystate = *yyssp;
- goto yyerrlab1;
-
-@@ -7394,10 +7094,9 @@
- if (yyssp == yyss)
- YYABORT;
-
--
-- yydestruct ("Error: popping",
-- yystos[yystate], yyvsp);
-- YYPOPSTACK (1);
-+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-+ yydestruct (yystos[yystate], yyvsp);
-+ YYPOPSTACK;
- yystate = *yyssp;
- YY_STACK_PRINT (yyss, yyssp);
- }
-@@ -7405,11 +7104,10 @@
- if (yyn == YYFINAL)
- YYACCEPT;
-
-- *++yyvsp = yylval;
-+ YYDPRINTF ((stderr, "Shifting error token, "));
-
-+ *++yyvsp = yylval;
-
-- /* Shift the error token. */
-- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
- yystate = yyn;
- goto yynewstate;
-@@ -7430,39 +7128,21 @@
- goto yyreturn;
-
- #ifndef yyoverflow
--/*-------------------------------------------------.
--| yyexhaustedlab -- memory exhaustion comes here. |
--`-------------------------------------------------*/
--yyexhaustedlab:
-- yyerror (YY_("memory exhausted"));
-+/*----------------------------------------------.
-+| yyoverflowlab -- parser overflow comes here. |
-+`----------------------------------------------*/
-+yyoverflowlab:
-+ yyerror ("parser stack overflow");
- yyresult = 2;
- /* Fall through. */
- #endif
-
- yyreturn:
-- if (yychar != YYEOF && yychar != YYEMPTY)
-- yydestruct ("Cleanup: discarding lookahead",
-- yytoken, &yylval);
-- /* Do not reclaim the symbols of the rule which action triggered
-- this YYABORT or YYACCEPT. */
-- YYPOPSTACK (yylen);
-- YY_STACK_PRINT (yyss, yyssp);
-- while (yyssp != yyss)
-- {
-- yydestruct ("Cleanup: popping",
-- yystos[*yyssp], yyvsp);
-- YYPOPSTACK (1);
-- }
- #ifndef yyoverflow
- if (yyss != yyssa)
- YYSTACK_FREE (yyss);
- #endif
--#if YYERROR_VERBOSE
-- if (yymsg != yymsgbuf)
-- YYSTACK_FREE (yymsg);
--#endif
-- /* Make sure YYID is used. */
-- return YYID (yyresult);
-+ return yyresult;
- }
-
-
-@@ -9135,6 +8815,7 @@
- COND_PUSH(0);
- CMDARG_PUSH(0);
- lex_state = EXPR_BEG;
-+ if (c != tLBRACE) command_start = Qtrue;
- return c;
-
- case '\\':
-@@ -9438,6 +9119,7 @@
- return kw->id[0];
- }
- if (kw->id[0] == kDO) {
-+ command_start = Qtrue;
- if (COND_P()) return kDO_COND;
- if (CMDARG_P() && state != EXPR_CMDARG)
- return kDO_BLOCK;
-@@ -11331,3 +11013,4 @@
- }
- #endif
-
-+
-diff -ur ruby-1.8.6/parse.y ruby/parse.y
---- ruby-1.8.6/parse.y 2007-03-03 00:30:46.000000000 -0700
-+++ ruby/parse.y 2007-04-16 01:44:56.000000000 -0600
-@@ -2,8 +2,8 @@
-
- parse.y -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Fri May 28 18:02:42 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -4146,6 +4146,7 @@
- COND_PUSH(0);
- CMDARG_PUSH(0);
- lex_state = EXPR_BEG;
-+ if (c != tLBRACE) command_start = Qtrue;
- return c;
-
- case '\\':
-@@ -4449,6 +4450,7 @@
- return kw->id[0];
- }
- if (kw->id[0] == kDO) {
-+ command_start = Qtrue;
- if (COND_P()) return kDO_COND;
- if (CMDARG_P() && state != EXPR_CMDARG)
- return kDO_BLOCK;
-diff -ur ruby-1.8.6/README ruby/README
---- ruby-1.8.6/README 2007-02-20 00:37:34.000000000 -0700
-+++ ruby/README 2007-02-20 00:37:23.000000000 -0700
-@@ -29,7 +29,7 @@
- The latest source code of this version series can be checked out
- through SVN with the following command:
-
-- $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-+ $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
-
- The trunk of the Ruby source tree can be checked out with the
- following command:
-diff -ur ruby-1.8.6/README.ja ruby/README.ja
---- ruby-1.8.6/README.ja 2007-02-20 00:37:34.000000000 -0700
-+++ ruby/README.ja 2007-02-20 00:37:23.000000000 -0700
-@@ -36,7 +36,7 @@
-
- ËÜ¥Ö¥é¥ó¥Á¤ÎRuby¤ÎºÇ¿·¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤¤Þ¤¹¡¥
-
-- $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-+ $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
-
- ³«È¯Àèü¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤¤Þ¤¹¡¥
-
-diff -ur ruby-1.8.6/runruby.rb ruby/runruby.rb
---- ruby-1.8.6/runruby.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/runruby.rb 2007-03-12 12:23:54.000000000 -0600
-@@ -1,5 +1,6 @@
- #!./miniruby
-
-+pure = true
- while arg = ARGV[0]
- break ARGV.shift if arg == '--'
- /\A--([-\w]+)(?:=(.*))?\z/ =~ arg or break
-@@ -12,6 +13,10 @@
- archdir = value
- when re =~ "extout"
- extout = value
-+ when re =~ "pure"
-+ pure = (value != "no")
-+ when re =~ "debugger"
-+ debugger = value ? (value.split unless value == "no") : %w"gdb --args"
- else
- break
- end
-@@ -25,23 +30,24 @@
- $:.unshift(abs_archdir)
-
- require 'rbconfig'
--config = Config::CONFIG
-+config = RbConfig::CONFIG
-
- ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT'])
- unless File.exist?(ruby)
- abort "#{ruby} is not found.\nTry `make' first, then `make test', please.\n"
- end
-
--libs = [abs_archdir, File.expand_path("lib", srcdir)]
-+libs = [abs_archdir]
- if extout
- abs_extout = File.expand_path(extout)
- libs << File.expand_path("common", abs_extout) << File.expand_path(RUBY_PLATFORM, abs_extout)
- end
-+libs << File.expand_path("lib", srcdir)
- config["bindir"] = abs_archdir
- ENV["RUBY"] = File.expand_path(ruby)
- ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
-
--if e = ENV["RUBYLIB"]
-+if !pure and e = ENV["RUBYLIB"]
- libs |= e.split(File::PATH_SEPARATOR)
- end
- ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
-@@ -55,5 +61,15 @@
- ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ')
- end
- end
-+begin
-+ open("puretest.rb", IO::EXCL|IO::CREAT|IO::WRONLY) do |f|
-+ f.puts('$LOAD_PATH.replace(ENV["RUBYLIB"].split(File::PATH_SEPARATOR))')
-+ end
-+rescue Errno::EEXIST
-+end
-
--exec ruby, *ARGV
-+cmd = [ruby]
-+cmd << "-rpuretest.rb" if pure
-+cmd.concat(ARGV)
-+cmd.unshift(*debugger) if debugger
-+exec(*cmd)
-diff -ur ruby-1.8.6/sample/cbreak.rb ruby/sample/cbreak.rb
---- ruby-1.8.6/sample/cbreak.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/sample/cbreak.rb 2007-04-16 07:51:51.000000000 -0600
-@@ -6,11 +6,11 @@
- TIOCSETP = 0x80067409
-
- def cbreak ()
-- set_cbreak(TRUE)
-+ set_cbreak(true)
- end
-
- def cooked ()
-- set_cbreak(FALSE)
-+ set_cbreak(false)
- end
-
- def set_cbreak (on)
-diff -ur ruby-1.8.6/sample/dualstack-httpd.rb ruby/sample/dualstack-httpd.rb
---- ruby-1.8.6/sample/dualstack-httpd.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/sample/dualstack-httpd.rb 2007-04-16 07:51:51.000000000 -0600
-@@ -26,7 +26,7 @@
- ls = mysock # copy to dynamic variable
- t = Thread.current
- STDERR.print "socket #{myname} listener started, pid #{$$} thread #{t}\n"
-- while TRUE
-+ while true
- as = ls.accept
- Thread.start do
- STDERR.print "socket #{myname} accepted, thread ", Thread.current, "\n"
-diff -ur ruby-1.8.6/sample/eval.rb ruby/sample/eval.rb
---- ruby-1.8.6/sample/eval.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/sample/eval.rb 2007-04-16 07:51:51.000000000 -0600
-@@ -1,6 +1,6 @@
- line = ''
- indent = 0
--$stdout.sync = TRUE
-+$stdout.sync = true
- print "ruby> "
- loop do
- l = gets
-diff -ur ruby-1.8.6/sample/from.rb ruby/sample/from.rb
---- ruby-1.8.6/sample/from.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/sample/from.rb 2007-04-16 07:51:51.000000000 -0600
-@@ -26,7 +26,7 @@
- end
-
- if ARGV[0] == '-w'
-- wait = TRUE
-+ wait = true
- ARGV.shift
- end
-
-diff -ur ruby-1.8.6/sample/philos.rb ruby/sample/philos.rb
---- ruby-1.8.6/sample/philos.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/sample/philos.rb 2007-04-16 07:51:51.000000000 -0600
-@@ -25,7 +25,7 @@
- end
-
- def philosopher(n)
-- while TRUE
-+ while true
- think n
- $forks[n].lock
- if not $forks[(n+1)%N].try_lock
-diff -ur ruby-1.8.6/sample/regx.rb ruby/sample/regx.rb
---- ruby-1.8.6/sample/regx.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/sample/regx.rb 2007-04-16 07:51:51.000000000 -0600
-@@ -3,7 +3,7 @@
- #st = "<<"
- #en = ">>"
-
--while TRUE
-+while true
- print "str> "
- STDOUT.flush
- input = gets
-diff -ur ruby-1.8.6/signal.c ruby/signal.c
---- ruby-1.8.6/signal.c 2007-03-11 01:31:53.000000000 -0700
-+++ ruby/signal.c 2007-04-26 11:06:54.000000000 -0600
-@@ -2,8 +2,8 @@
-
- signal.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Tue Dec 20 10:13:44 JST 1994
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -264,14 +264,17 @@
- }
-
- static VALUE
--interrupt_init(self, mesg)
-- VALUE self, mesg;
-+interrupt_init(argc, argv, self)
-+ int argc;
-+ VALUE *argv;
-+ VALUE self;
- {
-- VALUE argv[2];
-+ VALUE args[2];
-
-- argv[0] = INT2FIX(SIGINT);
-- argv[1] = mesg;
-- return rb_call_super(2, argv);
-+ args[0] = INT2FIX(SIGINT);
-+ rb_scan_args(argc, argv, "01", &args[1]);
-+
-+ return rb_call_super(2, args);
- }
-
- void
-@@ -1071,7 +1074,7 @@
- rb_define_method(rb_eSignal, "initialize", esignal_init, -1);
- rb_attr(rb_eSignal, rb_intern("signo"), 1, 0, 0);
- rb_alias(rb_eSignal, rb_intern("signm"), rb_intern("message"));
-- rb_define_method(rb_eInterrupt, "initialize", interrupt_init, 1);
-+ rb_define_method(rb_eInterrupt, "initialize", interrupt_init, -1);
-
- install_sighandler(SIGINT, sighandler);
- #ifdef SIGHUP
-diff -ur ruby-1.8.6/test/ruby/test_beginendblock.rb ruby/test/ruby/test_beginendblock.rb
---- ruby-1.8.6/test/ruby/test_beginendblock.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/test/ruby/test_beginendblock.rb 2007-03-23 10:53:42.000000000 -0600
-@@ -54,4 +54,34 @@
- assert_equal(expected, File.read(erroutpath))
- # expecting Tempfile to unlink launcher and errout file.
- end
-+
-+ def test_raise_in_at_exit
-+ # [ruby-core:09675]
-+ ruby = EnvUtil.rubybin
-+ out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \
-+ "at_exit{raise %[SomethingBad]};" \
-+ "raise %[SomethingElse]'") {|f|
-+ f.read
-+ }
-+ assert_match /SomethingBad/, out
-+ assert_match /SomethingElse/, out
-+ end
-+
-+ def test_should_propagate_exit_code
-+ ruby = EnvUtil.rubybin
-+ assert_equal false, system("#{q(ruby)} -e 'at_exit{exit 2}'")
-+ assert_equal 2, $?.exitstatus
-+ assert_nil $?.termsig
-+ end
-+
-+ def test_should_propagate_signaled
-+ ruby = EnvUtil.rubybin
-+ out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \
-+ "at_exit{Process.kill(:INT, $$)}'"){|f|
-+ f.read
-+ }
-+ assert_match /Interrupt$/, out
-+ assert_nil $?.exitstatus
-+ assert_equal Signal.list["INT"], $?.termsig
-+ end
- end
-diff -ur ruby-1.8.6/test/ruby/test_bignum.rb ruby/test/ruby/test_bignum.rb
---- ruby-1.8.6/test/ruby/test_bignum.rb 2007-02-12 16:01:19.000000000 -0700
-+++ ruby/test/ruby/test_bignum.rb 2007-03-21 19:29:34.000000000 -0600
-@@ -84,4 +84,15 @@
- shift_test(-4518325415524767873)
- shift_test(-0xfffffffffffffffff)
- end
-+
-+ def test_to_s # [ruby-core:10686]
-+ assert_equal("fvvvvvvvvvvvv" ,18446744073709551615.to_s(32))
-+ assert_equal("g000000000000" ,18446744073709551616.to_s(32))
-+ assert_equal("3w5e11264sgsf" ,18446744073709551615.to_s(36))
-+ assert_equal("3w5e11264sgsg" ,18446744073709551616.to_s(36))
-+ assert_equal("nd075ib45k86f" ,18446744073709551615.to_s(31))
-+ assert_equal("nd075ib45k86g" ,18446744073709551616.to_s(31))
-+ assert_equal("1777777777777777777777" ,18446744073709551615.to_s(8))
-+ assert_equal("-1777777777777777777777" ,-18446744073709551615.to_s(8))
-+ end
- end
-Only in ruby/test: thread
-diff -ur ruby-1.8.6/time.c ruby/time.c
---- ruby-1.8.6/time.c 2007-03-06 03:12:12.000000000 -0700
-+++ ruby/time.c 2007-03-06 02:36:29.000000000 -0700
-@@ -3,7 +3,7 @@
- time.c -
-
- $Author$
-- $Date$
-+ $Date$
- created at: Tue Dec 28 14:31:59 JST 1993
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-diff -ur ruby-1.8.6/util.c ruby/util.c
---- ruby-1.8.6/util.c 2007-03-04 07:20:24.000000000 -0700
-+++ ruby/util.c 2007-04-17 19:40:38.000000000 -0600
-@@ -2,8 +2,8 @@
-
- util.c -
-
-- $Author$
-- $Date$
-+ $Author$
-+ $Date$
- created at: Fri Mar 10 17:22:34 JST 1995
-
- Copyright (C) 1993-2003 Yukihiro Matsumoto
-@@ -683,8 +683,8 @@
- *
- */
-
--#define MDMINEXPT DBL_MIN_EXP
--#define MDMAXEXPT DBL_MAX_EXP
-+#define MDMINEXPT DBL_MIN_10_EXP
-+#define MDMAXEXPT DBL_MAX_10_EXP
-
- static const
- double powersOf10[] = { /* Table giving binary powers of 10. Entry */
-diff -ur ruby-1.8.6/version.h ruby/version.h
---- ruby-1.8.6/version.h 2007-03-12 11:55:03.000000000 -0600
-+++ ruby/version.h 2007-04-25 22:54:01.000000000 -0600
-@@ -1,19 +1,17 @@
- #define RUBY_VERSION "1.8.6"
--#define RUBY_RELEASE_DATE "2007-03-13"
-+#define RUBY_RELEASE_DATE "2007-04-26"
- #define RUBY_VERSION_CODE 186
--#define RUBY_RELEASE_CODE 20070313
--#define RUBY_PATCHLEVEL 0
-+#define RUBY_RELEASE_CODE 20070426
-+#define RUBY_PATCHLEVEL 5000
-
- #define RUBY_VERSION_MAJOR 1
- #define RUBY_VERSION_MINOR 8
- #define RUBY_VERSION_TEENY 6
- #define RUBY_RELEASE_YEAR 2007
--#define RUBY_RELEASE_MONTH 3
--#define RUBY_RELEASE_DAY 13
-+#define RUBY_RELEASE_MONTH 4
-+#define RUBY_RELEASE_DAY 26
-
--#ifdef RUBY_EXTERN
- RUBY_EXTERN const char ruby_version[];
- RUBY_EXTERN const char ruby_release_date[];
- RUBY_EXTERN const char ruby_platform[];
- RUBY_EXTERN const int ruby_patchlevel;
--#endif
-diff -ur ruby-1.8.6/win32/win32.c ruby/win32/win32.c
---- ruby-1.8.6/win32/win32.c 2007-02-24 01:00:24.000000000 -0700
-+++ ruby/win32/win32.c 2007-04-10 02:37:21.000000000 -0600
-@@ -3634,6 +3634,7 @@
- {
- int fd = fileno(fp);
- SOCKET sock = TO_SOCKET(fd);
-+ int save_errno = errno;
-
- if (fflush(fp)) return -1;
- if (!is_socket(sock)) {
-@@ -3642,6 +3643,7 @@
- }
- _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
- fclose(fp);
-+ errno = save_errno;
- if (closesocket(sock) == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- return -1;
-@@ -3653,6 +3655,7 @@
- rb_w32_close(int fd)
- {
- SOCKET sock = TO_SOCKET(fd);
-+ int save_errno = errno;
-
- if (!is_socket(sock)) {
- UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
-@@ -3660,6 +3663,7 @@
- }
- _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
- _close(fd);
-+ errno = save_errno;
- if (closesocket(sock) == SOCKET_ERROR) {
- errno = map_errno(WSAGetLastError());
- return -1;
projects / packages / ruby.git / commitdiff