Changeset af8c147 in rtems-tools


Ignore:
Timestamp:
Nov 14, 2014, 10:19:09 PM (5 years ago)
Author:
Jiri Gaisler <jiri@…>
Branches:
4.10, 4.11, e9f48e9face6c4dea62712d73b35412c0fe10332
Children:
d8a82fd
Parents:
4bdba3e
git-author:
Jiri Gaisler <jiri@…> (11/14/14 22:19:09)
git-committer:
Sebastian Huber <sebastian.huber@…> (12/04/14 12:00:50)
Message:

gdb patch to add leon2/3 support to sis

This fixes the commit 4bdba3e552f22bbd82ffc9ab2c915a7b4f2eadd5 which
added a patch patch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/4.11/gdb/sparc/gdb-7.7-7.8-sis-leon2-leon3-fixup.diff

    r4bdba3e raf8c147  
    1 From 458324b419f29cd473a6ed13ed7c61005453ab7a Mon Sep 17 00:00:00 2001
    2 From: Jiri Gaisler <jiri@gaisler.se>
    3 Date: Fri, 14 Nov 2014 23:19:09 +0100
    4 Subject: [PATCH] gdb patch to add leon2/3 support to sis
    5 
    6 ---
    7  .../gdb/sparc/gdb-7.7-sis-leon2-leon3-fixup.diff   | 8915 ++++++++++++++++++++
    8  1 file changed, 8915 insertions(+)
    9  create mode 100644 tools/4.11/gdb/sparc/gdb-7.7-sis-leon2-leon3-fixup.diff
    10 
    11 diff --git a/tools/4.11/gdb/sparc/gdb-7.7-sis-leon2-leon3-fixup.diff b/tools/4.11/gdb/sparc/gdb-7.7-sis-leon2-leon3-fixup.diff
     1diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
     2index 66ef84e..424e390 100644
     3--- a/gdb/sparc-tdep.c
     4+++ b/gdb/sparc-tdep.c
     5@@ -1713,6 +1713,8 @@ sparc32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     6   /* Hook in ABI-specific overrides, if they have been registered.  */
     7   gdbarch_init_osabi (info, gdbarch);
     8 
     9+  dwarf2_append_unwinders (gdbarch);  /* DWARF CFI frame unwinder */
     10+
     11   frame_unwind_append_unwinder (gdbarch, &sparc32_frame_unwind);
     12 
     13   /* If we have register sets, enable the generic core file support.  */
     14diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
     15index 0ce58a6..3f09b0e 100644
     16--- a/sim/erc32/Makefile.in
     17+++ b/sim/erc32/Makefile.in
     18@@ -21,7 +21,7 @@
     19 TERMCAP_LIB = @TERMCAP@
     20 READLINE_LIB = @READLINE@
     21 
     22-SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
     23+SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o leon2.o leon3.o grlib.o
     24 SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
     25 SIM_EXTRA_ALL = sis
     26 SIM_EXTRA_INSTALL = install-sis
     27@@ -30,32 +30,24 @@ SIM_EXTRA_CLEAN = clean-sis
     28 # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to
     29 # CFLAGS if faster (infinite) UART speed is desired. Might affect the
     30 # behaviour of UART interrupt routines ...
     31-SIM_EXTRA_CFLAGS = -DSTAT -DFAST_UART -DIUREV0 -DMECREV0
     32+SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcdir)/../..
     33 
     34 ## COMMON_POST_CONFIG_FRAG
     35 
     36 # `sis' doesn't need interf.o.
     37-SIS_OFILES = exec.o erc32.o func.o help.o float.o
     38+SIS_OFILES = exec.o erc32.o func.o help.o float.o grlib.o leon2.o leon3.o
     39 
     40 sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
     41        $(CC) $(ALL_CFLAGS) -o sis \
     42          sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
     43 
     44-# FIXME: This computes the build host's endianness, doesn't it?
     45-# There is AC_C_BIGENDIAN but it doesn't handle float endianness.
     46-# [Are int/float endians every different on a sparc?]
     47-end: $(srcdir)/end.c
     48-       $(CC_FOR_BUILD) -I. $(srcdir)/end.c -o end
     49-end.h: end
     50-       ./end > end.h
     51-
     52 # Copy the files into directories where they will be run.
     53 install-sis: installdirs
     54        n=`echo sis | sed '$(program_transform_name)'`; \
     55        $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
     56 
     57 clean-sis:
     58-       rm -f sis end end.h
     59+       rm -f sis
     60 
     61 configure:
     62        @echo "Rebuilding configure..."
     63@@ -65,10 +57,13 @@ configure:
     64        (cd $${srcdir}; autoconf --localdir=../common)
     65 
     66 # Circumvent Sun Make bug with VPATH.
     67-erc32.o: erc32.c sis.h end.h
     68-exec.o: exec.c sis.h end.h
     69-float.o: float.c sis.h end.h
     70-func.o: func.c sis.h end.h
     71-help.o: help.c sis.h end.h
     72-interf.o: interf.c sis.h end.h
     73-sis.o: sis.c sis.h end.h
     74+erc32.o: erc32.c sis.h
     75+exec.o: exec.c sis.h
     76+float.o: float.c sis.h
     77+func.o: func.c sis.h
     78+help.o: help.c sis.h
     79+interf.o: interf.c sis.h
     80+sis.o: sis.c sis.h
     81+grlib.o: grlib.c sis.h grlib.h
     82+leon3.o: leon3.c sis.h grlib.h
     83+leon2.o: leon2.c sis.h
     84diff --git a/sim/erc32/NEWS b/sim/erc32/NEWS
     85deleted file mode 100644
     86index dd24b7b..0000000
     87--- a/sim/erc32/NEWS
     88+++ /dev/null
     89@@ -1,108 +0,0 @@
     90-
     91-version 2.0 05-02-96
     92---------------------
     93-
     94-* Switched to bfd library. Any supported format (elf, coff, ...) can be used.
     95-* The UART devices can be set through -uart1 and -uart2 switches.
     96-* Switched to GNU readline.
     97-* Added -c option to run batch files at startup
     98-* 'reg' command can show different register windows (eg 'reg w3').
     99-* Use 'help' for online help on simulator commands
     100-
     101-version 1.8.1 20-01-96
     102---------------------
     103-
     104-* added -mevrev0 switch to simulate MEC rev.0 bugs in timer and uart
     105-
     106-* added -iurev0 switch to simulate IU rev.0 jmpl/restore bug
     107-
     108-* Added sis command 'batch' to run batch files
     109-
     110-
     111-version 1.8 30-10-95
     112---------------------
     113-
     114-* Added s-record support. Use the '-s' switch with sis or the 'load' command.
     115-
     116-* IU load dependencies are now modelled
     117-
     118-version 1.7 30-10-95
     119---------------------
     120-
     121-* Power-down mode implemented in erc32.c.
     122
     123-* Performance display shows the ratio between simulator-time and real-time.
     124-
     125-
     126-version 1.6.2 25-10-95
     127---------------------
     128-
     129-* The UARTs can now be run at a given speed (simulator time) to better
     130-  simulate the behaviour of interrupt routines. The "true mode" is
     131-  selected through a compile switch in the makefile.
     132-
     133-
     134-version 1.6 28-09-95
     135---------------------
     136-
     137-* Major reorganisation of the code. mec.c and mem.c merged into erc32.c.
     138-
     139-* The load command does NOT longer load the initialised data at an address
     140-  defined by .bdata. This is done in srt0.s using _environ.
     141-
     142-* Additional MEC functionallity added - software reset, memory access
     143-  protection and waitstate configuration register.
     144-
     145-* interf.c - a GDB interface added
     146-
     147-* -v switch (verbose) added
     148-
     149-version 1.5 14-09-95
     150---------------------
     151-
     152-* Added a instruction trace buffer, enabled through the 'hist' command.
     153-
     154-* Added a 'perf' command to display statistics such as instruction mix,
     155-  CPI, FPU holds etc.
     156-
     157-* Added -nfp switch to disable FPU.
     158-
     159-* Added -freq switch to set simulated frequency.
     160-
     161-version 1.4 22-08-95
     162---------------------
     163-
     164-* A -g is provided for those who have problems with GNU readline().
     165-
     166-version 1.3 26-07-95
     167---------------------
     168-
     169-* No major news, just a bug fix release ...
     170-
     171-
     172-version 1.2 13-07-95
     173---------------------
     174-
     175-* Added setting of IU registers through the 'reg' command. See README.
     176-
     177-* The GNU readline() function is used for command input. However, a
     178-ctrl-D still kills the simulator ...
     179-
     180-
     181-version 1.1 07-07-95
     182---------------------
     183-
     184-
     185-* Added a 'go' command
     186-
     187-* Added cycle counting for interrupt overhead.
     188-
     189-* Function 'get_mem_ptr' takes one more parameter to avoid segmentation
     190-   faults if a.out files are loaded outside the simulated memory. See README.
     191-
     192-* Added user-defined function sim_stop().
     193-
     194-* Added a reset command. See README.
     195-
     196-* Implemented buffered output for MEC uarts to improve output speed.
     197-
     198diff --git a/sim/erc32/README.gdb b/sim/erc32/README.gdb
     199deleted file mode 100644
     200index 619fcb3..0000000
     201--- a/sim/erc32/README.gdb
     202+++ /dev/null
     203@@ -1,67 +0,0 @@
     204-How to use SIS with GDB
     205------------------------
     206-
     207-1. Building GDB with SIS
     208-
     209-To build GDB with the SIS/ERC32 simulator, configure with option
     210-'--target sparc-erc32-aout' and build as usual.
     211-
     212-2. Attaching the simulator
     213-
     214-To attach GDB to the simulator, use:
     215-
     216-target sim [options] [files]
     217-
     218-The following options are supported:
     219-
     220- -nfp          Disable FPU. FPops will cause an FPU disabled trap.
     221-
     222- -freq <f>     Set the simulated "system clock" to <f> MHz.
     223-
     224- -v            Verbose mode.
     225-
     226- -nogdb                Disable GDB breakpoint handling (see below)
     227-
     228-The listed [files] are expected to be in aout format and will be
     229-loaded in the simulator memory prior. This could be used to load
     230-a boot block at address 0x0 if the application is linked to run
     231-from RAM (0x2000000).
     232-
     233-To start debugging a program type 'load <program>' and debug as
     234-usual.
     235-
     236-The native simulator commands can be reached using the GDB 'sim'
     237-command:
     238-
     239-sim <sis_command>
     240-
     241-Direct simulator commands during a GDB session must be issued
     242-with care not to disturb GDB's operation ...
     243-
     244-For info on supported ERC32 functionality, see README.sis.
     245-
     246-
     247-3. Loading aout files
     248-
     249-The GDB load command loads an aout file into the simulator
     250-memory with the data section starting directly after the text
     251-section regardless of wich start address was specified for the data
     252-at link time! This means that your applications either has to include
     253-a routine that initialise the data segment at the proper address or
     254-link with the data placed directly after the text section.
     255-
     256-A copying routine is fairly simple, just copy all data between
     257-_etext and _data to a memory loaction starting at _environ. This
     258-should be done at the same time as the bss is cleared (in srt0.s).
     259-
     260-
     261-4. GDB breakpoint handling
     262-
     263-GDB inserts breakpoint in the form of the 'ta 1' instruction. The
     264-GDB-integrated simulator will therefore recognize the breakpoint
     265-instruction and return control to GDB. If the application uses
     266-'ta 1', the breakpoint detection can be disabled with the -nogdb
     267-switch. In this case however, GDB breakpoints will not work.
     268-
     269-
     270-Report problems to Jiri Gaisler ESA/ESTEC (jgais@wd.estec.esa.nl)
     271diff --git a/sim/erc32/README.leon2 b/sim/erc32/README.leon2
    12272new file mode 100644
    13 index 0000000..e19e30a
     273index 0000000..3820eca
    14274--- /dev/null
    15 +++ b/tools/4.11/gdb/sparc/gdb-7.7-sis-leon2-leon3-fixup.diff
    16 @@ -0,0 +1,8915 @@
    17 +diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
    18 +index 66ef84e..424e390 100644
    19 +--- a/gdb/sparc-tdep.c
    20 ++++ b/gdb/sparc-tdep.c
    21 +@@ -1713,6 +1713,8 @@ sparc32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
    22 +   /* Hook in ABI-specific overrides, if they have been registered.  */
    23 +   gdbarch_init_osabi (info, gdbarch);
    24 +
    25 ++  dwarf2_append_unwinders (gdbarch);  /* DWARF CFI frame unwinder */
    26 ++
    27 +   frame_unwind_append_unwinder (gdbarch, &sparc32_frame_unwind);
    28 +
    29 +   /* If we have register sets, enable the generic core file support.  */
    30 +diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
    31 +index 0ce58a6..3f09b0e 100644
    32 +--- a/sim/erc32/Makefile.in
    33 ++++ b/sim/erc32/Makefile.in
    34 +@@ -21,7 +21,7 @@
    35 + TERMCAP_LIB = @TERMCAP@
    36 + READLINE_LIB = @READLINE@
    37 +
    38 +-SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
    39 ++SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o leon2.o leon3.o grlib.o
    40 + SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
    41 + SIM_EXTRA_ALL = sis
    42 + SIM_EXTRA_INSTALL = install-sis
    43 +@@ -30,32 +30,24 @@ SIM_EXTRA_CLEAN = clean-sis
    44 + # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to
    45 + # CFLAGS if faster (infinite) UART speed is desired. Might affect the
    46 + # behaviour of UART interrupt routines ...
    47 +-SIM_EXTRA_CFLAGS = -DSTAT -DFAST_UART -DIUREV0 -DMECREV0
    48 ++SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcdir)/../..
    49 +
    50 + ## COMMON_POST_CONFIG_FRAG
    51 +
    52 + # `sis' doesn't need interf.o.
    53 +-SIS_OFILES = exec.o erc32.o func.o help.o float.o
    54 ++SIS_OFILES = exec.o erc32.o func.o help.o float.o grlib.o leon2.o leon3.o
    55 +
    56 + sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
    57 +       $(CC) $(ALL_CFLAGS) -o sis \
    58 +         sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
    59 +
    60 +-# FIXME: This computes the build host's endianness, doesn't it?
    61 +-# There is AC_C_BIGENDIAN but it doesn't handle float endianness.
    62 +-# [Are int/float endians every different on a sparc?]
    63 +-end: $(srcdir)/end.c
    64 +-      $(CC_FOR_BUILD) -I. $(srcdir)/end.c -o end
    65 +-end.h: end
    66 +-      ./end > end.h
    67 +-
    68 + # Copy the files into directories where they will be run.
    69 + install-sis: installdirs
    70 +       n=`echo sis | sed '$(program_transform_name)'`; \
    71 +       $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
    72 +
    73 + clean-sis:
    74 +-      rm -f sis end end.h
    75 ++      rm -f sis
    76 +
    77 + configure:
    78 +       @echo "Rebuilding configure..."
    79 +@@ -65,10 +57,13 @@ configure:
    80 +       (cd $${srcdir}; autoconf --localdir=../common)
    81 +
    82 + # Circumvent Sun Make bug with VPATH.
    83 +-erc32.o: erc32.c sis.h end.h
    84 +-exec.o: exec.c sis.h end.h
    85 +-float.o: float.c sis.h end.h
    86 +-func.o: func.c sis.h end.h
    87 +-help.o: help.c sis.h end.h
    88 +-interf.o: interf.c sis.h end.h
    89 +-sis.o: sis.c sis.h end.h
    90 ++erc32.o: erc32.c sis.h
    91 ++exec.o: exec.c sis.h
    92 ++float.o: float.c sis.h
    93 ++func.o: func.c sis.h
    94 ++help.o: help.c sis.h
    95 ++interf.o: interf.c sis.h
    96 ++sis.o: sis.c sis.h
    97 ++grlib.o: grlib.c sis.h grlib.h
    98 ++leon3.o: leon3.c sis.h grlib.h
    99 ++leon2.o: leon2.c sis.h
    100 +diff --git a/sim/erc32/NEWS b/sim/erc32/NEWS
    101 +deleted file mode 100644
    102 +index dd24b7b..0000000
    103 +--- a/sim/erc32/NEWS
    104 ++++ /dev/null
    105 +@@ -1,108 +0,0 @@
    106 +-
    107 +-version 2.0 05-02-96
    108 +---------------------
    109 +-
    110 +-* Switched to bfd library. Any supported format (elf, coff, ...) can be used.
    111 +-* The UART devices can be set through -uart1 and -uart2 switches.
    112 +-* Switched to GNU readline.
    113 +-* Added -c option to run batch files at startup
    114 +-* 'reg' command can show different register windows (eg 'reg w3').
    115 +-* Use 'help' for online help on simulator commands
    116 +-
    117 +-version 1.8.1 20-01-96
    118 +---------------------
    119 +-
    120 +-* added -mevrev0 switch to simulate MEC rev.0 bugs in timer and uart
    121 +-
    122 +-* added -iurev0 switch to simulate IU rev.0 jmpl/restore bug
    123 +-
    124 +-* Added sis command 'batch' to run batch files
    125 +-
    126 +-
    127 +-version 1.8 30-10-95
    128 +---------------------
    129 +-
    130 +-* Added s-record support. Use the '-s' switch with sis or the 'load' command.
    131 +-
    132 +-* IU load dependencies are now modelled
    133 +-
    134 +-version 1.7 30-10-95
    135 +---------------------
    136 +-
    137 +-* Power-down mode implemented in erc32.c.
    138 +- 
    139 +-* Performance display shows the ratio between simulator-time and real-time.
    140 +-
    141 +-
    142 +-version 1.6.2 25-10-95
    143 +---------------------
    144 +-
    145 +-* The UARTs can now be run at a given speed (simulator time) to better
    146 +-  simulate the behaviour of interrupt routines. The "true mode" is
    147 +-  selected through a compile switch in the makefile.
    148 +-
    149 +-
    150 +-version 1.6 28-09-95
    151 +---------------------
    152 +-
    153 +-* Major reorganisation of the code. mec.c and mem.c merged into erc32.c.
    154 +-
    155 +-* The load command does NOT longer load the initialised data at an address
    156 +-  defined by .bdata. This is done in srt0.s using _environ.
    157 +-
    158 +-* Additional MEC functionallity added - software reset, memory access
    159 +-  protection and waitstate configuration register.
    160 +-
    161 +-* interf.c - a GDB interface added
    162 +-
    163 +-* -v switch (verbose) added
    164 +-
    165 +-version 1.5 14-09-95
    166 +---------------------
    167 +-
    168 +-* Added a instruction trace buffer, enabled through the 'hist' command.
    169 +-
    170 +-* Added a 'perf' command to display statistics such as instruction mix,
    171 +-  CPI, FPU holds etc.
    172 +-
    173 +-* Added -nfp switch to disable FPU.
    174 +-
    175 +-* Added -freq switch to set simulated frequency.
    176 +-
    177 +-version 1.4 22-08-95
    178 +---------------------
    179 +-
    180 +-* A -g is provided for those who have problems with GNU readline().
    181 +-
    182 +-version 1.3 26-07-95
    183 +---------------------
    184 +-
    185 +-* No major news, just a bug fix release ...
    186 +-
    187 +-
    188 +-version 1.2 13-07-95
    189 +---------------------
    190 +-
    191 +-* Added setting of IU registers through the 'reg' command. See README.
    192 +-
    193 +-* The GNU readline() function is used for command input. However, a
    194 +-ctrl-D still kills the simulator ...
    195 +-
    196 +-
    197 +-version 1.1 07-07-95
    198 +---------------------
    199 +-
    200 +-
    201 +-* Added a 'go' command
    202 +-
    203 +-* Added cycle counting for interrupt overhead.
    204 +-
    205 +-* Function 'get_mem_ptr' takes one more parameter to avoid segmentation
    206 +-   faults if a.out files are loaded outside the simulated memory. See README.
    207 +-
    208 +-* Added user-defined function sim_stop().
    209 +-
    210 +-* Added a reset command. See README.
    211 +-
    212 +-* Implemented buffered output for MEC uarts to improve output speed.
    213 +-
    214 +diff --git a/sim/erc32/README.gdb b/sim/erc32/README.gdb
    215 +deleted file mode 100644
    216 +index 619fcb3..0000000
    217 +--- a/sim/erc32/README.gdb
    218 ++++ /dev/null
    219 +@@ -1,67 +0,0 @@
    220 +-How to use SIS with GDB
    221 +------------------------
    222 +-
    223 +-1. Building GDB with SIS
    224 +-
    225 +-To build GDB with the SIS/ERC32 simulator, configure with option
    226 +-'--target sparc-erc32-aout' and build as usual.
    227 +-
    228 +-2. Attaching the simulator
    229 +-
    230 +-To attach GDB to the simulator, use:
    231 +-
    232 +-target sim [options] [files]
    233 +-
    234 +-The following options are supported:
    235 +-
    236 +- -nfp         Disable FPU. FPops will cause an FPU disabled trap.
    237 +-
    238 +- -freq <f>    Set the simulated "system clock" to <f> MHz.
    239 +-
    240 +- -v           Verbose mode.
    241 +-
    242 +- -nogdb               Disable GDB breakpoint handling (see below)
    243 +-
    244 +-The listed [files] are expected to be in aout format and will be
    245 +-loaded in the simulator memory prior. This could be used to load
    246 +-a boot block at address 0x0 if the application is linked to run
    247 +-from RAM (0x2000000).
    248 +-
    249 +-To start debugging a program type 'load <program>' and debug as
    250 +-usual.
    251 +-
    252 +-The native simulator commands can be reached using the GDB 'sim'
    253 +-command:
    254 +-
    255 +-sim <sis_command>
    256 +-
    257 +-Direct simulator commands during a GDB session must be issued
    258 +-with care not to disturb GDB's operation ...
    259 +-
    260 +-For info on supported ERC32 functionality, see README.sis.
    261 +-
    262 +-
    263 +-3. Loading aout files
    264 +-
    265 +-The GDB load command loads an aout file into the simulator
    266 +-memory with the data section starting directly after the text
    267 +-section regardless of wich start address was specified for the data
    268 +-at link time! This means that your applications either has to include
    269 +-a routine that initialise the data segment at the proper address or
    270 +-link with the data placed directly after the text section.
    271 +-
    272 +-A copying routine is fairly simple, just copy all data between
    273 +-_etext and _data to a memory loaction starting at _environ. This
    274 +-should be done at the same time as the bss is cleared (in srt0.s).
    275 +-
    276 +-
    277 +-4. GDB breakpoint handling
    278 +-
    279 +-GDB inserts breakpoint in the form of the 'ta 1' instruction. The
    280 +-GDB-integrated simulator will therefore recognize the breakpoint
    281 +-instruction and return control to GDB. If the application uses
    282 +-'ta 1', the breakpoint detection can be disabled with the -nogdb
    283 +-switch. In this case however, GDB breakpoints will not work.
    284 +-
    285 +-
    286 +-Report problems to Jiri Gaisler ESA/ESTEC (jgais@wd.estec.esa.nl)
    287 +diff --git a/sim/erc32/README.leon2 b/sim/erc32/README.leon2
    288 +new file mode 100644
    289 +index 0000000..3820eca
    290 +--- /dev/null
    291 ++++ b/sim/erc32/README.leon2
    292 +@@ -0,0 +1,53 @@
    293 ++
    294 ++1. LEON2 emulation
    295 ++
    296 ++The file 'leon2.c' contains a model of simple LEON2 sub-system. It
    297 ++contains 16 Mbyte ROM and 16 Mbyte RAM. Standard peripherals
    298 ++such as interrupt controller, UART and timer are provided.
    299 ++The model can execute leon2 binaries that do not require an
    300 ++MMU.
    301 ++
    302 ++To start sis in Leon2 mode, add the -leon2 switch. In gdb,
    303 ++use 'target sim -leon2' .
    304 ++
    305 ++1.1 UART
    306 ++
    307 ++One LEON2 UART is emaulted, and is located at address 0x80000070.
    308 ++The following registers are implemeted:
    309 ++
    310 ++- UART RX and TX register     (0x80000070)
    311 ++- UART status register                (0x80000074)
    312 ++
    313 ++The UART generates interrupt 3.
    314 ++
    315 ++1.2 Timer unit
    316 ++
    317 ++The LEON2 timer unit is emulated and located at address 0x80000040.
    318 ++It is configured with two timers and separate interrupts (8 and 9).
    319 ++The scaler is configured to 16 bits, while the counters are 32 bits.
    320 ++
    321 ++1.3 Interrupt controller
    322 ++
    323 ++The interrupt controller is implemented as described in the
    324 ++LEON2 IP manual, with the exception of the interrupt level register.
    325 ++Secondary interrupts are not supported. The registers are located
    326 ++at address 0x80000090.
    327 ++
    328 ++1.5 Memory interface
    329 ++
    330 ++The following memory areas are valid for the Leon3 simulator:
    331 ++
    332 ++0x00000000 - 0x01000000               ROM (16 Mbyte, loaded at start-up)
    333 ++0x40000000 - 0x41000000               RAM (16 Mbyte, loaded at start-up)
    334 ++0x80000000 - 0x81000000               APB bus, including plug&play
    335 ++0xFFFFF000 - 0xFFFFFFFF               AHB plug&play area
    336 ++
    337 ++Access to non-existing memory will result in a memory exception trap.
    338 ++
    339 ++1.8 Power-down mode
    340 ++
    341 ++The Leon2 power-down register (0x80000018) is supported. When power-down is
    342 ++entered, time is skipped forward until the next event in the event queue.
    343 ++However, if the simulator event queue is empty, power-down mode is not
    344 ++entered since no interrupt would be generated to exit from the mode. A
    345 ++Ctrl-C in the simulator window will exit the power-down mode.
    346 +diff --git a/sim/erc32/README.leon3 b/sim/erc32/README.leon3
    347 +new file mode 100644
    348 +index 0000000..00ab14a
    349 +--- /dev/null
    350 ++++ b/sim/erc32/README.leon3
    351 +@@ -0,0 +1,53 @@
    352 ++
    353 ++1. LEON3 emulation
    354 ++
    355 ++The file 'leon3.c' contains a model of simple LEON3 sub-system. It
    356 ++contains 16 Mbyte ROM and 16 Mbyte RAM. Standard peripherals
    357 ++such as interrupt controller, UART and timer are provided.
    358 ++The model can execute leon3 binaries that do not require an
    359 ++MMU.
    360 ++
    361 ++To start sis in Leon3 mode, add the -leon3 switch. In gdb,
    362 ++use 'target sim -leon3' .
    363 ++
    364 ++1.1 UART
    365 ++
    366 ++The UART emulates an APBUART and is located at address 0x80000100.
    367 ++The following registers are implemeted:
    368 ++
    369 ++- UART RX and TX register     (0x80000100)
    370 ++- UART status register                (0x80000104)
    371 ++
    372 ++The UART generates interrupt 3.
    373 ++
    374 ++1.2 Timer unit (GPTIMER)
    375 ++
    376 ++The GPTIMER programmable counter is emulated and located at
    377 ++address 0x80000300. It is configured with two timers and separate
    378 ++interrupts (8 and 9).
    379 ++
    380 ++1.3 Interrupt controller
    381 ++
    382 ++The IRQMP interrupt controller is implemented as described in the
    383 ++GRLIB IP manual, with the exception of the interrupt level register.
    384 ++Extended interrupts are not supported. The registers are located
    385 ++at address 0x80000200.
    386 ++
    387 ++1.5 Memory interface
    388 ++
    389 ++The following memory areas are valid for the Leon3 simulator:
    390 ++
    391 ++0x00000000 - 0x01000000               ROM (16 Mbyte, loaded at start-up)
    392 ++0x40000000 - 0x41000000               RAM (16 Mbyte, loaded at start-up)
    393 ++0x80000000 - 0x81000000               APB bus, including plug&play
    394 ++0xFFFFF000 - 0xFFFFFFFF               AHB plug&play area
    395 ++
    396 ++Access to non-existing memory will result in a memory exception trap.
    397 ++
    398 ++1.8 Power-down mode
    399 ++
    400 ++The Leon3 power-down feature (%asr19) is supported. When power-down is
    401 ++entered, time is skipped forward until the next event in the event queue.
    402 ++However, if the simulator event queue is empty, power-down mode is not
    403 ++entered since no interrupt would be generated to exit from the mode. A
    404 ++Ctrl-C in the simulator window will exit the power-down mode.
    405 +diff --git a/sim/erc32/README.sis b/sim/erc32/README.sis
    406 +index b119f03..59c4c64 100644
    407 +--- a/sim/erc32/README.sis
    408 ++++ b/sim/erc32/README.sis
    409 +@@ -1,10 +1,10 @@
    410 +
    411 +-SIS - Sparc Instruction Simulator README file  (v2.0, 05-02-1996)
    412 ++SIS - Sparc Instruction Simulator README file  (v2.8, 10-11-2014)
    413 + -------------------------------------------------------------------
    414 +
    415 + 1. Introduction
    416 +
    417 +-The SIS is a SPARC V7 architecture simulator. It consist of two parts,
    418 ++The SIS is a SPARC V7/V8 architecture simulator. It consist of two parts,
    419 + the simulator core and a user defined memory module. The simulator
    420 + core executes the instructions while the memory module emulates memory
    421 + and peripherals.
    422 +@@ -13,28 +13,29 @@ and peripherals.
    423 +
    424 + The simulator is started as follows:
    425 +
    426 +-sis [-uart1 uart_device1] [-uart2 uart_device2]
    427 ++sis [-leon2] [-leon3] [-uart1 uart_device1] [-uart2 uart_device2]
    428 +     [-nfp] [-freq frequency] [-c batch_file] [files]
    429 +
    430 +-The default uart devices for SIS are /dev/ptypc and /dev/ptypd. The
    431 +--uart[1,2] switch can be used to connect the uarts to other devices.
    432 +-Use 'tip /dev/ttypc'  to connect a terminal emulator to the uarts.
    433 ++By default, SIS emaultes an ERC32 system. The -leon2 switch enables
    434 ++LEON2 emaultion, while the -leon3 switch enables emulation of a
    435 ++LEON3 SOC system.
    436 ++
    437 ++The emulated console uart is connected stdin/stdout. The -uart[1,2]
    438 ++switch can be used to connect the uarts to other devices.
    439 ++
    440 + The '-nfp' will disable the simulated FPU, so each FPU instruction will
    441 + generate a FPU disabled trap. The '-freq' switch can be used to define
    442 + which "frequency" the simulator runs at. This is used by the 'perf'
    443 + command to calculated the MIPS figure for a particular configuration.
    444 +-The give frequency must be an integer indicating the frequency in MHz.
    445 ++The frequency must be an integer indicating the frequency in MHz.
    446 +
    447 + The -c option indicates that sis commands should be read from 'batch_file'
    448 + at startup.
    449 +
    450 +-Files to be loaded must be in one of the supported formats (see INSTALLATION),
    451 +-and will be loaded into the simulated memory. The file formats are
    452 +-automatically recognised.
    453 ++Files to be loaded must be in one of the supported formats (elf, a.out, srec),
    454 ++and will be loaded into the simulated memory.
    455 +
    456 +-The script 'startsim' will start the simulator in one xterm window and
    457 +-open a terminal emulator (tip) connected to the UART A in a second
    458 +-xterm window. Below is description of commands  that are recognized by
    459 ++Below is description of commands  that are recognized by
    460 + the simulator. The command-line is parsed using GNU readline. A command
    461 + history of 64 commands is maintained. Use the up/down arrows to recall
    462 + previous commands. For more details, see the readline documentation.
    463 +@@ -77,8 +78,8 @@ Prints the FPU registers
    464 + go <address> [inst_count]
    465 +
    466 + The go command will set pc to <address> and npc to <address> + 4, and start
    467 +-execution. No other initialisation will be done. If inst_count is given,
    468 +-execution will stop after the specified number of instructions.
    469 ++execution. If inst_count is given, execution will stop after the specified
    470 ++number of instructions.
    471 +
    472 + help
    473 +
    474 +@@ -143,136 +144,67 @@ Typing a 'Ctrl-C' will interrupt a running simulator.
    475 + Short forms of the commands are allowed, e.g 'c' 'co' or 'con' are all
    476 + interpreted as 'cont'.
    477 +
    478 ++2 Using SIS with gdb
    479 ++
    480 ++2.1 Attaching the simulator
    481 ++
    482 ++To attach GDB to the simulator, use:
    483 ++
    484 ++target sim [options]
    485 ++
    486 ++The following options are supported:
    487 ++
    488 ++ -leon2         Emulate a LEON2 system
    489 ++
    490 ++ -leon3         Emulate a LEON3 system
    491 ++
    492 ++ -nfp           Disable FPU. FPops will cause an FPU disabled trap.
    493 ++
    494 ++ -freq <f>      Set the simulated "system clock" to <f> MHz.
    495 ++
    496 ++ -v             Verbose mode.
    497 ++
    498 ++ -nogdb         Disable GDB breakpoint handling (see below)
    499 ++
    500 ++To start debugging a program type 'load <program>' and debug as
    501 ++usual.
    502 ++
    503 ++The native simulator commands can be reached using the GDB 'sim'
    504 ++command:
    505 ++
    506 ++sim <sis_command>
    507 ++
    508 ++Direct simulator commands during a GDB session must be issued
    509 ++with care not to disturb GDB's operation ...
    510 ++
    511 ++A program can be restarted in gdb by first issuing the load command,
    512 ++followed by run.
    513 ++
    514 ++2.2 GDB breakpoint handling
    515 ++
    516 ++GDB inserts breakpoint in the form of the 'ta 1' instruction. The
    517 ++GDB-integrated simulator will therefore recognize the breakpoint
    518 ++instruction and return control to GDB. If the application uses
    519 ++'ta 1', the breakpoint detection can be disabled with the -nogdb
    520 ++switch. In this case however, GDB breakpoints will not work.
    521 ++
    522 +
    523 + 3. Simulator core
    524 +
    525 +-The SIS emulates the behavior of the 90C601E and 90C602E sparc IU and
    526 +-FPU from Matra MHS. These are roughly equivalent to the Cypress C601
    527 +-and C602.  The simulator is cycle true, i.e a simulator time is
    528 ++In ERC32 mode, SIS emulates the behavior of the 90C601E and 90C602E
    529 ++sparc IU and FPU from Matra MHS. These are roughly equivalent to the
    530 ++Cypress C601 and C602. The simulator is cycle true, i.e a simulator time is
    531 + maintained and inremented according the IU and FPU instruction timing.
    532 + The parallel execution between the IU and FPU is modelled, as well as
    533 +-stalls due to operand dependencies (FPU). The core interacts with the
    534 +-user-defined memory modules through a number of functions. The memory
    535 +-module must provide the following functions:
    536 +-
    537 +-int memory_read(asi,addr,data,ws)
    538 +-int asi;
    539 +-unsigned int addr;
    540 +-unsigned int *data;
    541 +-int *ws;
    542 +-
    543 +-int memory_write(asi,addr,data,sz,ws)
    544 +-int asi;
    545 +-unsigned int addr;
    546 +-unsigned int *data;
    547 +-int sz;
    548 +-int *ws;
    549 +-
    550 +-int sis_memory_read(addr, data, length)
    551 +-unsigned int addr;
    552 +-char   *data;
    553 +-unsigned int length;
    554 +-
    555 +-int sis_memory_write(addr, data, length)
    556 +-unsigned int addr;
    557 +-char    *data;
    558 +-unsigned int length;
    559 +-
    560 +-int init_sim()
    561 +-
    562 +-int reset()
    563 +-
    564 +-int error_mode(pc)
    565 +-unsigned int pc;
    566 +-
    567 +-memory_read() is used by the simulator to fetch instructions and
    568 +-operands.  The address space identifier (asi) and address is passed as
    569 +-parameters. The read data should be assigned to the data pointer
    570 +-(*data) and the number of waitstate to *ws. 'memory_read' should return
    571 +-0 on success and 1 on failure. A failure will cause a data or
    572 +-instruction fetch trap. memory_read() always reads one 32-bit word.
    573 +-
    574 +-sis_memory_read() is used by the simulator to display and disassemble
    575 +-memory contants. The function should copy 'length' bytes of the simulated
    576 +-memory starting at 'addr' to '*data'.
    577 +-The sis_memory_read() should return 1 on success and 0 on failure.
    578 +-Failure should only be indicated if access to unimplemented memory is attempted.
    579 +-
    580 +-memory_write() is used to write to memory. In addition to the asi
    581 +-and address parameters, the size of the written data is given by 'sz'.
    582 +-The pointer *data points to the data to be written. The 'sz' is coded
    583 +-as follows:
    584 +-
    585 +-  sz  access type
    586 +-  0     byte
    587 +-  1     halfword
    588 +-  2     word
    589 +-  3     double-word
    590 +-
    591 +-If a double word is written, the most significant word is in data[0] and
    592 +-the least significant in data[1].
    593 +-
    594 +-sis_memory_write() is used by the simulator during loading of programs.
    595 +-The function should copy 'length' bytes from *data to the simulated
    596 +-memory starting at 'addr'. sis_memory_write() should return 1 on
    597 +-success and 0 on failure. Failure should only be indicated if access
    598 +-to unimplemented memory is attempted. See erc32.c for more details
    599 +-on how to define the memory emulation functions.
    600 +-
    601 +-The 'init_sim' is called once when the simulator is started. This function
    602 +-should be used to perform initialisations of user defined memory or
    603 +-peripherals that only have to be done once, such as opening files etc.
    604 +-
    605 +-The 'reset' is called every time the simulator is reset, i.e. when a
    606 +-'run' command is given. This function should be used to simulate a power
    607 +-on reset of memory and peripherals.
    608 +-
    609 +-error_mode() is called by the simulator when the IU goes into error mode,
    610 +-typically if a trap is caused when traps are disabled. The memory module
    611 +-can then take actions, such as issue a reset.
    612 +-
    613 +-sys_reset() can be called by the memory module to reset the simulator. A
    614 +-reset will empty the event queue and perform a power-on reset.
    615 +-
    616 +-4. Events and interrupts
    617 +-
    618 +-The simulator supports an event queue and the generation of processor
    619 +-interrupts. The following functions are available to the user-defined
    620 +-memory module:
    621 +-
    622 +-event(cfunc,arg,delta)
    623 +-void (*cfunc)();
    624 +-int arg;
    625 +-unsigned int delta;
    626 +-
    627 +-set_int(level,callback,arg)
    628 +-int level;
    629 +-void (*callback)();
    630 +-int arg;
    631 +-
    632 +-clear_int(level)
    633 +-int level;
    634 +-
    635 +-sim_stop()
    636 +-
    637 +-The 'event' functions will schedule the execution of the function 'cfunc'
    638 +-at time 'now + delta' clock cycles. The parameter 'arg' is passed as a
    639 +-parameter to 'cfunc'.
    640 +-
    641 +-The 'set_int' function set the processor interrupt 'level'. When the interrupt
    642 +-is taken, the function 'callback' is called with the argument 'arg'. This
    643 +-will also clear the interrupt. An interrupt can be cleared before it is
    644 +-taken by calling 'clear_int' with the appropriate interrupt level.
    645 +-
    646 +-The sim_stop function is called each time the simulator stops execution.
    647 +-It can be used to flush buffered devices to get a clean state during
    648 +-single stepping etc.
    649 ++stalls due to operand dependencies (FPU).
    650 +
    651 +-See 'erc32.c' for examples on how to use events and interrupts.
    652 ++In Leon2/3 mode, the core emulates the Leon2/3 SPARC V8 core from
    653 ++Gaisler Research. All SPARC V8 instructions are supported but
    654 ++emaultion is not fully cycle-true as the cache is not emulated.
    655 +
    656 + 5. Memory module
    657 +
    658 +-The supplied memory module (erc32.c) emulates the functions of memory and
    659 ++The ERC32 memory module (erc32.c) emulates the functions of memory and
    660 + the MEC asic developed for the 90C601/2. It includes the following functions:
    661 +
    662 + * UART A & B
    663 +@@ -284,28 +216,38 @@ the MEC asic developed for the 90C601/2. It includes the following functions:
    664 + * 512 Kbyte ROM
    665 + * 4 Mbyte RAM
    666 +
    667 +-See README.erc32 on how the MEC functions are emulated.  For a detailed MEC
    668 +-specification, look at the ERC32 home page at URL:
    669 ++See README.erc32 on how the MEC functions are emulated.
    670 ++
    671 ++The Leon2 memory module (leon2.c) emulates on-chip peripherals and
    672 ++external memory for a simple Leon2 system. The modules includes the
    673 ++following functions:
    674 ++
    675 ++* AHB and APB buses
    676 ++* One UART
    677 ++* Interrupt controller
    678 ++* Timer unit with two timers
    679 ++* PROM/SRAM memory controller
    680 ++* 16 Mbyte PROM, 16 Mbyte SRAM
    681 +
    682 +-http://www.estec.esa.nl/wsmwww/erc32
    683 ++See README.leon2 for further details on Leon3 emulation.
    684 +
    685 +-6. Compile and linking programs
    686 ++The Leon3 memory module (leon3.c) emulates on-chip peripherals and
    687 ++external memory for a simple Leon3 system. The modules includes the
    688 ++following functions:
    689 +
    690 +-The directory 'examples' contain some code fragments for SIS.
    691 +-The script gccx indicates how the native sunos gcc and linker can be used
    692 +-to produce executables for the simulator. To compile and link the provided
    693 +-'hello.c', type 'gccx hello.c'. This will build the executable 'hello'.
    694 +-Start the simulator by running 'startsim hello', and issue the command 'run.
    695 +-After the program is terminated, the IU will be force to error mode through
    696 +-a software trap and halt.
    697 ++* AHB and APB buses with plug&play
    698 ++* UART (APBUART)
    699 ++* Interrupt controller (IRQMP)
    700 ++* Timer unit with two timers (GPTIMER)
    701 ++* PROM/SRAM memory controller (SRCTRL)
    702 ++* 16 Mbyte PROM, 16 Mbyte SRAM
    703 +
    704 +-The programs are linked with a start-up file, srt0.S. This file includes
    705 +-the traptable and window underflow/overflow trap routines.
    706 ++See README.leon3 for further details on Leon3 emulation.
    707 +
    708 +-7. IU and FPU instruction timing.
    709 ++6. IU and FPU instruction timing.
    710 +
    711 +-The simulator provides cycle true simulation. The following table shows
    712 +-the emulated instruction timing for 90C601E & 90C602E:
    713 ++The simulator provides cycle true simulation for ERC32. The following table
    714 ++shows the emulated instruction timing for 90C601E & 90C602E:
    715 +
    716 + Instructions        Cycles
    717 +
    718 +diff --git a/sim/erc32/config.in b/sim/erc32/config.in
    719 +index 0db6f1e..0f712af 100644
    720 +--- a/sim/erc32/config.in
    721 ++++ b/sim/erc32/config.in
    722 +@@ -1,5 +1,8 @@
    723 + /* config.in.  Generated from configure.ac by autoheader.  */
    724 +
    725 ++/* Define if building universal (internal helper macro) */
    726 ++#undef AC_APPLE_UNIVERSAL_BUILD
    727 ++
    728 + /* Define to 1 if translation of program messages to the user's native
    729 +    language is requested. */
    730 + #undef ENABLE_NLS
    731 +@@ -73,6 +76,10 @@
    732 + /* Define to 1 if you have the `__setfpucw' function. */
    733 + #undef HAVE___SETFPUCW
    734 +
    735 ++/* Define to the sub-directory in which libtool stores uninstalled libraries.
    736 ++   */
    737 ++#undef LT_OBJDIR
    738 ++
    739 + /* Name of this package. */
    740 + #undef PACKAGE
    741 +
    742 +@@ -128,6 +135,18 @@
    743 + #endif
    744 +
    745 +
    746 ++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    747 ++   significant byte first (like Motorola and SPARC, unlike Intel). */
    748 ++#if defined AC_APPLE_UNIVERSAL_BUILD
    749 ++# if defined __BIG_ENDIAN__
    750 ++#  define WORDS_BIGENDIAN 1
    751 ++# endif
    752 ++#else
    753 ++# ifndef WORDS_BIGENDIAN
    754 ++#  undef WORDS_BIGENDIAN
    755 ++# endif
    756 ++#endif
    757 ++
    758 + /* Define to 1 if on MINIX. */
    759 + #undef _MINIX
    760 +
    761 +diff --git a/sim/erc32/configure b/sim/erc32/configure
    762 +index b8fd852..9d1b373 100755
    763 +--- a/sim/erc32/configure
    764 ++++ b/sim/erc32/configure
    765 +@@ -1,10 +1,10 @@
    766 + #! /bin/sh
    767 + # Guess values for system-dependent variables and create Makefiles.
    768 +-# Generated by GNU Autoconf 2.64.
    769 ++# Generated by GNU Autoconf 2.69.
    770 ++#
    771 ++#
    772 ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
    773 + #
    774 +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    775 +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
    776 +-# Foundation, Inc.
    777 + #
    778 + # This configure script is free software; the Free Software Foundation
    779 + # gives unlimited permission to copy, distribute and modify it.
    780 +@@ -87,6 +87,7 @@ fi
    781 + IFS=" ""      $as_nl"
    782 +
    783 + # Find who we are.  Look in the path if we contain no directory separator.
    784 ++as_myself=
    785 + case $0 in #((
    786 +   *[\\/]* ) as_myself=$0 ;;
    787 +   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    788 +@@ -131,6 +132,31 @@ export LANGUAGE
    789 + # CDPATH.
    790 + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
    791 +
    792 ++# Use a proper internal environment variable to ensure we don't fall
    793 ++  # into an infinite loop, continuously re-executing ourselves.
    794 ++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
    795 ++    _as_can_reexec=no; export _as_can_reexec;
    796 ++    # We cannot yet assume a decent shell, so we have to provide a
    797 ++# neutralization value for shells without unset; and this also
    798 ++# works around shells that cannot unset nonexistent variables.
    799 ++# Preserve -v and -x to the replacement shell.
    800 ++BASH_ENV=/dev/null
    801 ++ENV=/dev/null
    802 ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    803 ++case $- in # ((((
    804 ++  *v*x* | *x*v* ) as_opts=-vx ;;
    805 ++  *v* ) as_opts=-v ;;
    806 ++  *x* ) as_opts=-x ;;
    807 ++  * ) as_opts= ;;
    808 ++esac
    809 ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    810 ++# Admittedly, this is quite paranoid, since all the known shells bail
    811 ++# out after a failed `exec'.
    812 ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    813 ++as_fn_exit 255
    814 ++  fi
    815 ++  # We don't want this to propagate to other subprocesses.
    816 ++          { _as_can_reexec=; unset _as_can_reexec;}
    817 + if test "x$CONFIG_SHELL" = x; then
    818 +   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
    819 +   emulate sh
    820 +@@ -164,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
    821 + else
    822 +   exitcode=1; echo positional parameters were not saved.
    823 + fi
    824 +-test x\$exitcode = x0 || exit 1"
    825 ++test x\$exitcode = x0 || exit 1
    826 ++test -x / || exit 1"
    827 +   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    828 +   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
    829 +   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
    830 +@@ -217,14 +244,25 @@ IFS=$as_save_IFS
    831 +
    832 +
    833 +       if test "x$CONFIG_SHELL" != x; then :
    834 +-  # We cannot yet assume a decent shell, so we have to provide a
    835 +-      # neutralization value for shells without unset; and this also
    836 +-      # works around shells that cannot unset nonexistent variables.
    837 +-      BASH_ENV=/dev/null
    838 +-      ENV=/dev/null
    839 +-      (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    840 +-      export CONFIG_SHELL
    841 +-      exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
    842 ++  export CONFIG_SHELL
    843 ++             # We cannot yet assume a decent shell, so we have to provide a
    844 ++# neutralization value for shells without unset; and this also
    845 ++# works around shells that cannot unset nonexistent variables.
    846 ++# Preserve -v and -x to the replacement shell.
    847 ++BASH_ENV=/dev/null
    848 ++ENV=/dev/null
    849 ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    850 ++case $- in # ((((
    851 ++  *v*x* | *x*v* ) as_opts=-vx ;;
    852 ++  *v* ) as_opts=-v ;;
    853 ++  *x* ) as_opts=-x ;;
    854 ++  * ) as_opts= ;;
    855 ++esac
    856 ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    857 ++# Admittedly, this is quite paranoid, since all the known shells bail
    858 ++# out after a failed `exec'.
    859 ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    860 ++exit 255
    861 + fi
    862 +
    863 +     if test x$as_have_required = xno; then :
    864 +@@ -322,10 +360,18 @@ $as_echo X"$as_dir" |
    865 +       test -d "$as_dir" && break
    866 +     done
    867 +     test -z "$as_dirs" || eval "mkdir $as_dirs"
    868 +-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
    869 ++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
    870 +
    871 +
    872 + } # as_fn_mkdir_p
    873 ++
    874 ++# as_fn_executable_p FILE
    875 ++# -----------------------
    876 ++# Test if FILE is an executable regular file.
    877 ++as_fn_executable_p ()
    878 ++{
    879 ++  test -f "$1" && test -x "$1"
    880 ++} # as_fn_executable_p
    881 + # as_fn_append VAR VALUE
    882 + # ----------------------
    883 + # Append the text in VALUE to the end of the definition contained in VAR. Take
    884 +@@ -362,19 +408,19 @@ else
    885 + fi # as_fn_arith
    886 +
    887 +
    888 +-# as_fn_error ERROR [LINENO LOG_FD]
    889 +-# ---------------------------------
    890 ++# as_fn_error STATUS ERROR [LINENO LOG_FD]
    891 ++# ----------------------------------------
    892 + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    893 + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    894 +-# script with status $?, using 1 if that was 0.
    895 ++# script with STATUS, using 1 if that was 0.
    896 + as_fn_error ()
    897 + {
    898 +-  as_status=$?; test $as_status -eq 0 && as_status=1
    899 +-  if test "$3"; then
    900 +-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    901 +-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
    902 ++  as_status=$1; test $as_status -eq 0 && as_status=1
    903 ++  if test "$4"; then
    904 ++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    905 ++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    906 +   fi
    907 +-  $as_echo "$as_me: error: $1" >&2
    908 ++  $as_echo "$as_me: error: $2" >&2
    909 +   as_fn_exit $as_status
    910 + } # as_fn_error
    911 +
    912 +@@ -447,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
    913 +   chmod +x "$as_me.lineno" ||
    914 +     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
    915 +
    916 ++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
    917 ++  # already done that, so ensure we don't try to do so again and fall
    918 ++  # in an infinite loop.  This has already happened in practice.
    919 ++  _as_can_reexec=no; export _as_can_reexec
    920 +   # Don't try to exec as it changes $[0], causing all sort of problems
    921 +   # (the dirname of $[0] is not the place where we might find the
    922 +   # original and so on.  Autoconf is especially sensitive to this).
    923 +@@ -481,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then
    924 +     # ... but there are two gotchas:
    925 +     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
    926 +     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
    927 +-    # In both cases, we have to default to `cp -p'.
    928 ++    # In both cases, we have to default to `cp -pR'.
    929 +     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
    930 +-      as_ln_s='cp -p'
    931 ++      as_ln_s='cp -pR'
    932 +   elif ln conf$$.file conf$$ 2>/dev/null; then
    933 +     as_ln_s=ln
    934 +   else
    935 +-    as_ln_s='cp -p'
    936 ++    as_ln_s='cp -pR'
    937 +   fi
    938 + else
    939 +-  as_ln_s='cp -p'
    940 ++  as_ln_s='cp -pR'
    941 + fi
    942 + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
    943 + rmdir conf$$.dir 2>/dev/null
    944 +@@ -502,28 +552,8 @@ else
    945 +   as_mkdir_p=false
    946 + fi
    947 +
    948 +-if test -x / >/dev/null 2>&1; then
    949 +-  as_test_x='test -x'
    950 +-else
    951 +-  if ls -dL / >/dev/null 2>&1; then
    952 +-    as_ls_L_option=L
    953 +-  else
    954 +-    as_ls_L_option=
    955 +-  fi
    956 +-  as_test_x='
    957 +-    eval sh -c '\''
    958 +-      if test -d "$1"; then
    959 +-      test -d "$1/.";
    960 +-      else
    961 +-      case $1 in #(
    962 +-      -*)set "./$1";;
    963 +-      esac;
    964 +-      case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
    965 +-      ???[sx]*):;;*)false;;esac;fi
    966 +-    '\'' sh
    967 +-  '
    968 +-fi
    969 +-as_executable_p=$as_test_x
    970 ++as_test_x='test -x'
    971 ++as_executable_p=as_fn_executable_p
    972 +
    973 + # Sed expression to map a string onto a valid CPP name.
    974 + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
    975 +@@ -534,10 +564,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
    976 + SHELL=${CONFIG_SHELL-/bin/sh}
    977 +
    978 +
    979 +-exec 7<&0 </dev/null 6>&1
    980 ++test -n "$DJDIR" || exec 7<&0 </dev/null
    981 ++exec 6>&1
    982 +
    983 + # Name of the host.
    984 +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
    985 ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
    986 + # so uname gets run too.
    987 + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    988 +
    989 +@@ -833,8 +864,9 @@ do
    990 +   fi
    991 +
    992 +   case $ac_option in
    993 +-  *=*)        ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
    994 +-  *)  ac_optarg=yes ;;
    995 ++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
    996 ++  *=)   ac_optarg= ;;
    997 ++  *)    ac_optarg=yes ;;
    998 +   esac
    999 +
    1000 +   # Accept the important Cygnus configure options, so we can diagnose typos.
    1001 +@@ -879,7 +911,7 @@ do
    1002 +     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
    1003 +     # Reject names that are not valid shell variable names.
    1004 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1005 +-      as_fn_error "invalid feature name: $ac_useropt"
    1006 ++      as_fn_error $? "invalid feature name: $ac_useropt"
    1007 +     ac_useropt_orig=$ac_useropt
    1008 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    1009 +     case $ac_user_opts in
    1010 +@@ -905,7 +937,7 @@ do
    1011 +     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
    1012 +     # Reject names that are not valid shell variable names.
    1013 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1014 +-      as_fn_error "invalid feature name: $ac_useropt"
    1015 ++      as_fn_error $? "invalid feature name: $ac_useropt"
    1016 +     ac_useropt_orig=$ac_useropt
    1017 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    1018 +     case $ac_user_opts in
    1019 +@@ -1109,7 +1141,7 @@ do
    1020 +     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
    1021 +     # Reject names that are not valid shell variable names.
    1022 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1023 +-      as_fn_error "invalid package name: $ac_useropt"
    1024 ++      as_fn_error $? "invalid package name: $ac_useropt"
    1025 +     ac_useropt_orig=$ac_useropt
    1026 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    1027 +     case $ac_user_opts in
    1028 +@@ -1125,7 +1157,7 @@ do
    1029 +     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
    1030 +     # Reject names that are not valid shell variable names.
    1031 +     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1032 +-      as_fn_error "invalid package name: $ac_useropt"
    1033 ++      as_fn_error $? "invalid package name: $ac_useropt"
    1034 +     ac_useropt_orig=$ac_useropt
    1035 +     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    1036 +     case $ac_user_opts in
    1037 +@@ -1155,8 +1187,8 @@ do
    1038 +   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
    1039 +     x_libraries=$ac_optarg ;;
    1040 +
    1041 +-  -*) as_fn_error "unrecognized option: \`$ac_option'
    1042 +-Try \`$0 --help' for more information."
    1043 ++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1044 ++Try \`$0 --help' for more information"
    1045 +     ;;
    1046 +
    1047 +   *=*)
    1048 +@@ -1164,7 +1196,7 @@ Try \`$0 --help' for more information."
    1049 +     # Reject names that are not valid shell variable names.
    1050 +     case $ac_envvar in #(
    1051 +       '' | [0-9]* | *[!_$as_cr_alnum]* )
    1052 +-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    1053 ++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
    1054 +     esac
    1055 +     eval $ac_envvar=\$ac_optarg
    1056 +     export $ac_envvar ;;
    1057 +@@ -1174,7 +1206,7 @@ Try \`$0 --help' for more information."
    1058 +     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    1059 +     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    1060 +       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    1061 +-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    1062 ++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    1063 +     ;;
    1064 +
    1065 +   esac
    1066 +@@ -1182,13 +1214,13 @@ done
    1067 +
    1068 + if test -n "$ac_prev"; then
    1069 +   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
    1070 +-  as_fn_error "missing argument to $ac_option"
    1071 ++  as_fn_error $? "missing argument to $ac_option"
    1072 + fi
    1073 +
    1074 + if test -n "$ac_unrecognized_opts"; then
    1075 +   case $enable_option_checking in
    1076 +     no) ;;
    1077 +-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    1078 ++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
    1079 +     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    1080 +   esac
    1081 + fi
    1082 +@@ -1211,7 +1243,7 @@ do
    1083 +     [\\/$]* | ?:[\\/]* )  continue;;
    1084 +     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    1085 +   esac
    1086 +-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
    1087 ++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
    1088 + done
    1089 +
    1090 + # There might be people who depend on the old broken behavior: `$host'
    1091 +@@ -1225,8 +1257,6 @@ target=$target_alias
    1092 + if test "x$host_alias" != x; then
    1093 +   if test "x$build_alias" = x; then
    1094 +     cross_compiling=maybe
    1095 +-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
    1096 +-    If a cross compiler is detected then cross compile mode will be used." >&2
    1097 +   elif test "x$build_alias" != "x$host_alias"; then
    1098 +     cross_compiling=yes
    1099 +   fi
    1100 +@@ -1241,9 +1271,9 @@ test "$silent" = yes && exec 6>/dev/null
    1101 + ac_pwd=`pwd` && test -n "$ac_pwd" &&
    1102 + ac_ls_di=`ls -di .` &&
    1103 + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
    1104 +-  as_fn_error "working directory cannot be determined"
    1105 ++  as_fn_error $? "working directory cannot be determined"
    1106 + test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    1107 +-  as_fn_error "pwd does not report name of working directory"
    1108 ++  as_fn_error $? "pwd does not report name of working directory"
    1109 +
    1110 +
    1111 + # Find the source files, if location was not specified.
    1112 +@@ -1282,11 +1312,11 @@ else
    1113 + fi
    1114 + if test ! -r "$srcdir/$ac_unique_file"; then
    1115 +   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
    1116 +-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
    1117 ++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
    1118 + fi
    1119 + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    1120 + ac_abs_confdir=`(
    1121 +-      cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
    1122 ++      cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
    1123 +       pwd)`
    1124 + # When building in place, set srcdir=.
    1125 + if test "$ac_abs_confdir" = "$ac_pwd"; then
    1126 +@@ -1326,7 +1356,7 @@ Configuration:
    1127 +       --help=short        display options specific to this package
    1128 +       --help=recursive    display the short help of all the included packages
    1129 +   -V, --version           display version information and exit
    1130 +-  -q, --quiet, --silent   do not print \`checking...' messages
    1131 ++  -q, --quiet, --silent   do not print \`checking ...' messages
    1132 +       --cache-file=FILE   cache test results in FILE [disabled]
    1133 +   -C, --config-cache      alias for \`--cache-file=config.cache'
    1134 +   -n, --no-create         do not create output files
    1135 +@@ -1420,7 +1450,7 @@ Some influential environment variables:
    1136 +   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
    1137 +               nonstandard directory <lib dir>
    1138 +   LIBS        libraries to pass to the linker, e.g. -l<library>
    1139 +-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
    1140 ++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    1141 +               you have headers in a nonstandard directory <include dir>
    1142 +   CPP         C preprocessor
    1143 +
    1144 +@@ -1491,9 +1521,9 @@ test -n "$ac_init_help" && exit $ac_status
    1145 + if $ac_init_version; then
    1146 +   cat <<\_ACEOF
    1147 + configure
    1148 +-generated by GNU Autoconf 2.64
    1149 ++generated by GNU Autoconf 2.69
    1150 +
    1151 +-Copyright (C) 2009 Free Software Foundation, Inc.
    1152 ++Copyright (C) 2012 Free Software Foundation, Inc.
    1153 + This configure script is free software; the Free Software Foundation
    1154 + gives unlimited permission to copy, distribute and modify it.
    1155 + _ACEOF
    1156 +@@ -1537,8 +1567,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
    1157 +
    1158 +       ac_retval=1
    1159 + fi
    1160 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1161 +-  return $ac_retval
    1162 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1163 ++  as_fn_set_status $ac_retval
    1164 +
    1165 + } # ac_fn_c_try_compile
    1166 +
    1167 +@@ -1563,7 +1593,7 @@ $as_echo "$ac_try_echo"; } >&5
    1168 +     mv -f conftest.er1 conftest.err
    1169 +   fi
    1170 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1171 +-  test $ac_status = 0; } >/dev/null && {
    1172 ++  test $ac_status = 0; } > conftest.i && {
    1173 +        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    1174 +        test ! -s conftest.err
    1175 +        }; then :
    1176 +@@ -1574,8 +1604,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
    1177 +
    1178 +     ac_retval=1
    1179 + fi
    1180 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1181 +-  return $ac_retval
    1182 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1183 ++  as_fn_set_status $ac_retval
    1184 +
    1185 + } # ac_fn_c_try_cpp
    1186 +
    1187 +@@ -1587,10 +1617,10 @@ fi
    1188 + ac_fn_c_check_header_mongrel ()
    1189 + {
    1190 +   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1191 +-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    1192 ++  if eval \${$3+:} false; then :
    1193 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    1194 + $as_echo_n "checking for $2... " >&6; }
    1195 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    1196 ++if eval \${$3+:} false; then :
    1197 +   $as_echo_n "(cached) " >&6
    1198 + fi
    1199 + eval ac_res=\$$3
    1200 +@@ -1626,7 +1656,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
    1201 + else
    1202 +   ac_header_preproc=no
    1203 + fi
    1204 +-rm -f conftest.err conftest.$ac_ext
    1205 ++rm -f conftest.err conftest.i conftest.$ac_ext
    1206 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    1207 + $as_echo "$ac_header_preproc" >&6; }
    1208 +
    1209 +@@ -1653,7 +1683,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     275+++ b/sim/erc32/README.leon2
     276@@ -0,0 +1,53 @@
     277+
     278+1. LEON2 emulation
     279+
     280+The file 'leon2.c' contains a model of simple LEON2 sub-system. It
     281+contains 16 Mbyte ROM and 16 Mbyte RAM. Standard peripherals
     282+such as interrupt controller, UART and timer are provided.
     283+The model can execute leon2 binaries that do not require an
     284+MMU.
     285+
     286+To start sis in Leon2 mode, add the -leon2 switch. In gdb,
     287+use 'target sim -leon2' .
     288+
     289+1.1 UART
     290+
     291+One LEON2 UART is emaulted, and is located at address 0x80000070.
     292+The following registers are implemeted:
     293+
     294+- UART RX and TX register      (0x80000070)
     295+- UART status register         (0x80000074)
     296+
     297+The UART generates interrupt 3.
     298+
     299+1.2 Timer unit
     300+
     301+The LEON2 timer unit is emulated and located at address 0x80000040.
     302+It is configured with two timers and separate interrupts (8 and 9).
     303+The scaler is configured to 16 bits, while the counters are 32 bits.
     304+
     305+1.3 Interrupt controller
     306+
     307+The interrupt controller is implemented as described in the
     308+LEON2 IP manual, with the exception of the interrupt level register.
     309+Secondary interrupts are not supported. The registers are located
     310+at address 0x80000090.
     311+
     312+1.5 Memory interface
     313+
     314+The following memory areas are valid for the Leon3 simulator:
     315+
     316+0x00000000 - 0x01000000                ROM (16 Mbyte, loaded at start-up)
     317+0x40000000 - 0x41000000                RAM (16 Mbyte, loaded at start-up)
     318+0x80000000 - 0x81000000                APB bus, including plug&play
     319+0xFFFFF000 - 0xFFFFFFFF                AHB plug&play area
     320+
     321+Access to non-existing memory will result in a memory exception trap.
     322+
     323+1.8 Power-down mode
     324+
     325+The Leon2 power-down register (0x80000018) is supported. When power-down is
     326+entered, time is skipped forward until the next event in the event queue.
     327+However, if the simulator event queue is empty, power-down mode is not
     328+entered since no interrupt would be generated to exit from the mode. A
     329+Ctrl-C in the simulator window will exit the power-down mode.
     330diff --git a/sim/erc32/README.leon3 b/sim/erc32/README.leon3
     331new file mode 100644
     332index 0000000..00ab14a
     333--- /dev/null
     334+++ b/sim/erc32/README.leon3
     335@@ -0,0 +1,53 @@
     336+
     337+1. LEON3 emulation
     338+
     339+The file 'leon3.c' contains a model of simple LEON3 sub-system. It
     340+contains 16 Mbyte ROM and 16 Mbyte RAM. Standard peripherals
     341+such as interrupt controller, UART and timer are provided.
     342+The model can execute leon3 binaries that do not require an
     343+MMU.
     344+
     345+To start sis in Leon3 mode, add the -leon3 switch. In gdb,
     346+use 'target sim -leon3' .
     347+
     348+1.1 UART
     349+
     350+The UART emulates an APBUART and is located at address 0x80000100.
     351+The following registers are implemeted:
     352+
     353+- UART RX and TX register      (0x80000100)
     354+- UART status register         (0x80000104)
     355+
     356+The UART generates interrupt 3.
     357+
     358+1.2 Timer unit (GPTIMER)
     359+
     360+The GPTIMER programmable counter is emulated and located at
     361+address 0x80000300. It is configured with two timers and separate
     362+interrupts (8 and 9).
     363+
     364+1.3 Interrupt controller
     365+
     366+The IRQMP interrupt controller is implemented as described in the
     367+GRLIB IP manual, with the exception of the interrupt level register.
     368+Extended interrupts are not supported. The registers are located
     369+at address 0x80000200.
     370+
     371+1.5 Memory interface
     372+
     373+The following memory areas are valid for the Leon3 simulator:
     374+
     375+0x00000000 - 0x01000000                ROM (16 Mbyte, loaded at start-up)
     376+0x40000000 - 0x41000000                RAM (16 Mbyte, loaded at start-up)
     377+0x80000000 - 0x81000000                APB bus, including plug&play
     378+0xFFFFF000 - 0xFFFFFFFF                AHB plug&play area
     379+
     380+Access to non-existing memory will result in a memory exception trap.
     381+
     382+1.8 Power-down mode
     383+
     384+The Leon3 power-down feature (%asr19) is supported. When power-down is
     385+entered, time is skipped forward until the next event in the event queue.
     386+However, if the simulator event queue is empty, power-down mode is not
     387+entered since no interrupt would be generated to exit from the mode. A
     388+Ctrl-C in the simulator window will exit the power-down mode.
     389diff --git a/sim/erc32/README.sis b/sim/erc32/README.sis
     390index b119f03..59c4c64 100644
     391--- a/sim/erc32/README.sis
     392+++ b/sim/erc32/README.sis
     393@@ -1,10 +1,10 @@
     394 
     395-SIS - Sparc Instruction Simulator README file  (v2.0, 05-02-1996)
     396+SIS - Sparc Instruction Simulator README file  (v2.8, 10-11-2014)
     397 -------------------------------------------------------------------
     398 
     399 1. Introduction
     400 
     401-The SIS is a SPARC V7 architecture simulator. It consist of two parts,
     402+The SIS is a SPARC V7/V8 architecture simulator. It consist of two parts,
     403 the simulator core and a user defined memory module. The simulator
     404 core executes the instructions while the memory module emulates memory
     405 and peripherals.
     406@@ -13,28 +13,29 @@ and peripherals.
     407 
     408 The simulator is started as follows:
     409 
     410-sis [-uart1 uart_device1] [-uart2 uart_device2]
     411+sis [-leon2] [-leon3] [-uart1 uart_device1] [-uart2 uart_device2]
     412     [-nfp] [-freq frequency] [-c batch_file] [files]
     413 
     414-The default uart devices for SIS are /dev/ptypc and /dev/ptypd. The
     415--uart[1,2] switch can be used to connect the uarts to other devices.
     416-Use 'tip /dev/ttypc'  to connect a terminal emulator to the uarts.
     417+By default, SIS emaultes an ERC32 system. The -leon2 switch enables
     418+LEON2 emaultion, while the -leon3 switch enables emulation of a
     419+LEON3 SOC system.
     420+
     421+The emulated console uart is connected stdin/stdout. The -uart[1,2]
     422+switch can be used to connect the uarts to other devices.
     423+
     424 The '-nfp' will disable the simulated FPU, so each FPU instruction will
     425 generate a FPU disabled trap. The '-freq' switch can be used to define
     426 which "frequency" the simulator runs at. This is used by the 'perf'
     427 command to calculated the MIPS figure for a particular configuration.
     428-The give frequency must be an integer indicating the frequency in MHz.
     429+The frequency must be an integer indicating the frequency in MHz.
     430 
     431 The -c option indicates that sis commands should be read from 'batch_file'
     432 at startup.
     433 
     434-Files to be loaded must be in one of the supported formats (see INSTALLATION),
     435-and will be loaded into the simulated memory. The file formats are
     436-automatically recognised.
     437+Files to be loaded must be in one of the supported formats (elf, a.out, srec),
     438+and will be loaded into the simulated memory.
     439 
     440-The script 'startsim' will start the simulator in one xterm window and
     441-open a terminal emulator (tip) connected to the UART A in a second
     442-xterm window. Below is description of commands  that are recognized by
     443+Below is description of commands  that are recognized by
     444 the simulator. The command-line is parsed using GNU readline. A command
     445 history of 64 commands is maintained. Use the up/down arrows to recall
     446 previous commands. For more details, see the readline documentation.
     447@@ -77,8 +78,8 @@ Prints the FPU registers
     448 go <address> [inst_count]
     449 
     450 The go command will set pc to <address> and npc to <address> + 4, and start
     451-execution. No other initialisation will be done. If inst_count is given,
     452-execution will stop after the specified number of instructions.
     453+execution. If inst_count is given, execution will stop after the specified
     454+number of instructions.
     455 
     456 help
     457 
     458@@ -143,136 +144,67 @@ Typing a 'Ctrl-C' will interrupt a running simulator.
     459 Short forms of the commands are allowed, e.g 'c' 'co' or 'con' are all
     460 interpreted as 'cont'.
     461 
     462+2 Using SIS with gdb
     463+
     464+2.1 Attaching the simulator
     465+
     466+To attach GDB to the simulator, use:
     467+
     468+target sim [options]
     469+
     470+The following options are supported:
     471+
     472+ -leon2         Emulate a LEON2 system
     473+
     474+ -leon3         Emulate a LEON3 system
     475+
     476+ -nfp           Disable FPU. FPops will cause an FPU disabled trap.
     477+
     478+ -freq <f>      Set the simulated "system clock" to <f> MHz.
     479+
     480+ -v             Verbose mode.
     481+
     482+ -nogdb         Disable GDB breakpoint handling (see below)
     483+
     484+To start debugging a program type 'load <program>' and debug as
     485+usual.
     486+
     487+The native simulator commands can be reached using the GDB 'sim'
     488+command:
     489+
     490+sim <sis_command>
     491+
     492+Direct simulator commands during a GDB session must be issued
     493+with care not to disturb GDB's operation ...
     494+
     495+A program can be restarted in gdb by first issuing the load command,
     496+followed by run.
     497+
     498+2.2 GDB breakpoint handling
     499+
     500+GDB inserts breakpoint in the form of the 'ta 1' instruction. The
     501+GDB-integrated simulator will therefore recognize the breakpoint
     502+instruction and return control to GDB. If the application uses
     503+'ta 1', the breakpoint detection can be disabled with the -nogdb
     504+switch. In this case however, GDB breakpoints will not work.
     505+
     506 
     507 3. Simulator core
     508 
     509-The SIS emulates the behavior of the 90C601E and 90C602E sparc IU and
     510-FPU from Matra MHS. These are roughly equivalent to the Cypress C601
     511-and C602.  The simulator is cycle true, i.e a simulator time is
     512+In ERC32 mode, SIS emulates the behavior of the 90C601E and 90C602E
     513+sparc IU and FPU from Matra MHS. These are roughly equivalent to the
     514+Cypress C601 and C602. The simulator is cycle true, i.e a simulator time is
     515 maintained and inremented according the IU and FPU instruction timing.
     516 The parallel execution between the IU and FPU is modelled, as well as
     517-stalls due to operand dependencies (FPU). The core interacts with the
     518-user-defined memory modules through a number of functions. The memory
     519-module must provide the following functions:
     520-
     521-int memory_read(asi,addr,data,ws)
     522-int asi;
     523-unsigned int addr;
     524-unsigned int *data;
     525-int *ws;
     526-
     527-int memory_write(asi,addr,data,sz,ws)
     528-int asi;
     529-unsigned int addr;
     530-unsigned int *data;
     531-int sz;
     532-int *ws;
     533-
     534-int sis_memory_read(addr, data, length)
     535-unsigned int addr;
     536-char   *data;
     537-unsigned int length;
     538-
     539-int sis_memory_write(addr, data, length)
     540-unsigned int addr;
     541-char    *data;
     542-unsigned int length;
     543-
     544-int init_sim()
     545-
     546-int reset()
     547-
     548-int error_mode(pc)
     549-unsigned int pc;
     550-
     551-memory_read() is used by the simulator to fetch instructions and
     552-operands.  The address space identifier (asi) and address is passed as
     553-parameters. The read data should be assigned to the data pointer
     554-(*data) and the number of waitstate to *ws. 'memory_read' should return
     555-0 on success and 1 on failure. A failure will cause a data or
     556-instruction fetch trap. memory_read() always reads one 32-bit word.
     557-
     558-sis_memory_read() is used by the simulator to display and disassemble
     559-memory contants. The function should copy 'length' bytes of the simulated
     560-memory starting at 'addr' to '*data'.
     561-The sis_memory_read() should return 1 on success and 0 on failure.
     562-Failure should only be indicated if access to unimplemented memory is attempted.
     563-
     564-memory_write() is used to write to memory. In addition to the asi
     565-and address parameters, the size of the written data is given by 'sz'.
     566-The pointer *data points to the data to be written. The 'sz' is coded
     567-as follows:
     568-
     569-  sz   access type
     570-  0      byte
     571-  1      halfword
     572-  2      word
     573-  3      double-word
     574-
     575-If a double word is written, the most significant word is in data[0] and
     576-the least significant in data[1].
     577-
     578-sis_memory_write() is used by the simulator during loading of programs.
     579-The function should copy 'length' bytes from *data to the simulated
     580-memory starting at 'addr'. sis_memory_write() should return 1 on
     581-success and 0 on failure. Failure should only be indicated if access
     582-to unimplemented memory is attempted. See erc32.c for more details
     583-on how to define the memory emulation functions.
     584-
     585-The 'init_sim' is called once when the simulator is started. This function
     586-should be used to perform initialisations of user defined memory or
     587-peripherals that only have to be done once, such as opening files etc.
     588-
     589-The 'reset' is called every time the simulator is reset, i.e. when a
     590-'run' command is given. This function should be used to simulate a power
     591-on reset of memory and peripherals.
     592-
     593-error_mode() is called by the simulator when the IU goes into error mode,
     594-typically if a trap is caused when traps are disabled. The memory module
     595-can then take actions, such as issue a reset.
     596-
     597-sys_reset() can be called by the memory module to reset the simulator. A
     598-reset will empty the event queue and perform a power-on reset.
     599-
     600-4. Events and interrupts
     601-
     602-The simulator supports an event queue and the generation of processor
     603-interrupts. The following functions are available to the user-defined
     604-memory module:
     605-
     606-event(cfunc,arg,delta)
     607-void (*cfunc)();
     608-int arg;
     609-unsigned int delta;
     610-
     611-set_int(level,callback,arg)
     612-int level;
     613-void (*callback)();
     614-int arg;
     615-
     616-clear_int(level)
     617-int level;
     618-
     619-sim_stop()
     620-
     621-The 'event' functions will schedule the execution of the function 'cfunc'
     622-at time 'now + delta' clock cycles. The parameter 'arg' is passed as a
     623-parameter to 'cfunc'.
     624-
     625-The 'set_int' function set the processor interrupt 'level'. When the interrupt
     626-is taken, the function 'callback' is called with the argument 'arg'. This
     627-will also clear the interrupt. An interrupt can be cleared before it is
     628-taken by calling 'clear_int' with the appropriate interrupt level.
     629-
     630-The sim_stop function is called each time the simulator stops execution.
     631-It can be used to flush buffered devices to get a clean state during
     632-single stepping etc.
     633+stalls due to operand dependencies (FPU).
     634 
     635-See 'erc32.c' for examples on how to use events and interrupts.
     636+In Leon2/3 mode, the core emulates the Leon2/3 SPARC V8 core from
     637+Gaisler Research. All SPARC V8 instructions are supported but
     638+emaultion is not fully cycle-true as the cache is not emulated.
     639 
     640 5. Memory module
     641 
     642-The supplied memory module (erc32.c) emulates the functions of memory and
     643+The ERC32 memory module (erc32.c) emulates the functions of memory and
     644 the MEC asic developed for the 90C601/2. It includes the following functions:
     645 
     646 * UART A & B
     647@@ -284,28 +216,38 @@ the MEC asic developed for the 90C601/2. It includes the following functions:
     648 * 512 Kbyte ROM
     649 * 4 Mbyte RAM
     650 
     651-See README.erc32 on how the MEC functions are emulated.  For a detailed MEC
     652-specification, look at the ERC32 home page at URL:
     653+See README.erc32 on how the MEC functions are emulated.
     654+
     655+The Leon2 memory module (leon2.c) emulates on-chip peripherals and
     656+external memory for a simple Leon2 system. The modules includes the
     657+following functions:
     658+
     659+* AHB and APB buses
     660+* One UART
     661+* Interrupt controller
     662+* Timer unit with two timers
     663+* PROM/SRAM memory controller
     664+* 16 Mbyte PROM, 16 Mbyte SRAM
     665 
     666-http://www.estec.esa.nl/wsmwww/erc32
     667+See README.leon2 for further details on Leon3 emulation.
     668 
     669-6. Compile and linking programs
     670+The Leon3 memory module (leon3.c) emulates on-chip peripherals and
     671+external memory for a simple Leon3 system. The modules includes the
     672+following functions:
     673 
     674-The directory 'examples' contain some code fragments for SIS.
     675-The script gccx indicates how the native sunos gcc and linker can be used
     676-to produce executables for the simulator. To compile and link the provided
     677-'hello.c', type 'gccx hello.c'. This will build the executable 'hello'.
     678-Start the simulator by running 'startsim hello', and issue the command 'run.
     679-After the program is terminated, the IU will be force to error mode through
     680-a software trap and halt.
     681+* AHB and APB buses with plug&play
     682+* UART (APBUART)
     683+* Interrupt controller (IRQMP)
     684+* Timer unit with two timers (GPTIMER)
     685+* PROM/SRAM memory controller (SRCTRL)
     686+* 16 Mbyte PROM, 16 Mbyte SRAM
     687 
     688-The programs are linked with a start-up file, srt0.S. This file includes
     689-the traptable and window underflow/overflow trap routines.
     690+See README.leon3 for further details on Leon3 emulation.
     691 
     692-7. IU and FPU instruction timing.
     693+6. IU and FPU instruction timing.
     694 
     695-The simulator provides cycle true simulation. The following table shows
     696-the emulated instruction timing for 90C601E & 90C602E:
     697+The simulator provides cycle true simulation for ERC32. The following table
     698+shows the emulated instruction timing for 90C601E & 90C602E:
     699 
     700 Instructions         Cycles
     701 
     702diff --git a/sim/erc32/config.in b/sim/erc32/config.in
     703index 0db6f1e..0f712af 100644
     704--- a/sim/erc32/config.in
     705+++ b/sim/erc32/config.in
     706@@ -1,5 +1,8 @@
     707 /* config.in.  Generated from configure.ac by autoheader.  */
     708 
     709+/* Define if building universal (internal helper macro) */
     710+#undef AC_APPLE_UNIVERSAL_BUILD
     711+
     712 /* Define to 1 if translation of program messages to the user's native
     713    language is requested. */
     714 #undef ENABLE_NLS
     715@@ -73,6 +76,10 @@
     716 /* Define to 1 if you have the `__setfpucw' function. */
     717 #undef HAVE___SETFPUCW
     718 
     719+/* Define to the sub-directory in which libtool stores uninstalled libraries.
     720+   */
     721+#undef LT_OBJDIR
     722+
     723 /* Name of this package. */
     724 #undef PACKAGE
     725 
     726@@ -128,6 +135,18 @@
     727 #endif
     728 
     729 
     730+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
     731+   significant byte first (like Motorola and SPARC, unlike Intel). */
     732+#if defined AC_APPLE_UNIVERSAL_BUILD
     733+# if defined __BIG_ENDIAN__
     734+#  define WORDS_BIGENDIAN 1
     735+# endif
     736+#else
     737+# ifndef WORDS_BIGENDIAN
     738+#  undef WORDS_BIGENDIAN
     739+# endif
     740+#endif
     741+
     742 /* Define to 1 if on MINIX. */
     743 #undef _MINIX
     744 
     745diff --git a/sim/erc32/configure b/sim/erc32/configure
     746index b8fd852..9d1b373 100755
     747--- a/sim/erc32/configure
     748+++ b/sim/erc32/configure
     749@@ -1,10 +1,10 @@
     750 #! /bin/sh
     751 # Guess values for system-dependent variables and create Makefiles.
     752-# Generated by GNU Autoconf 2.64.
     753+# Generated by GNU Autoconf 2.69.
     754+#
     755+#
     756+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
     757 #
     758-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
     759-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
     760-# Foundation, Inc.
     761 #
     762 # This configure script is free software; the Free Software Foundation
     763 # gives unlimited permission to copy, distribute and modify it.
     764@@ -87,6 +87,7 @@ fi
     765 IFS=" ""       $as_nl"
     766 
     767 # Find who we are.  Look in the path if we contain no directory separator.
     768+as_myself=
     769 case $0 in #((
     770   *[\\/]* ) as_myself=$0 ;;
     771   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     772@@ -131,6 +132,31 @@ export LANGUAGE
     773 # CDPATH.
     774 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
     775 
     776+# Use a proper internal environment variable to ensure we don't fall
     777+  # into an infinite loop, continuously re-executing ourselves.
     778+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
     779+    _as_can_reexec=no; export _as_can_reexec;
     780+    # We cannot yet assume a decent shell, so we have to provide a
     781+# neutralization value for shells without unset; and this also
     782+# works around shells that cannot unset nonexistent variables.
     783+# Preserve -v and -x to the replacement shell.
     784+BASH_ENV=/dev/null
     785+ENV=/dev/null
     786+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     787+case $- in # ((((
     788+  *v*x* | *x*v* ) as_opts=-vx ;;
     789+  *v* ) as_opts=-v ;;
     790+  *x* ) as_opts=-x ;;
     791+  * ) as_opts= ;;
     792+esac
     793+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
     794+# Admittedly, this is quite paranoid, since all the known shells bail
     795+# out after a failed `exec'.
     796+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
     797+as_fn_exit 255
     798+  fi
     799+  # We don't want this to propagate to other subprocesses.
     800+          { _as_can_reexec=; unset _as_can_reexec;}
     801 if test "x$CONFIG_SHELL" = x; then
     802   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
     803   emulate sh
     804@@ -164,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
     805 else
     806   exitcode=1; echo positional parameters were not saved.
     807 fi
     808-test x\$exitcode = x0 || exit 1"
     809+test x\$exitcode = x0 || exit 1
     810+test -x / || exit 1"
     811   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
     812   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
     813   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
     814@@ -217,14 +244,25 @@ IFS=$as_save_IFS
     815 
     816 
     817       if test "x$CONFIG_SHELL" != x; then :
     818-  # We cannot yet assume a decent shell, so we have to provide a
     819-       # neutralization value for shells without unset; and this also
     820-       # works around shells that cannot unset nonexistent variables.
     821-       BASH_ENV=/dev/null
     822-       ENV=/dev/null
     823-       (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     824-       export CONFIG_SHELL
     825-       exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
     826+  export CONFIG_SHELL
     827+             # We cannot yet assume a decent shell, so we have to provide a
     828+# neutralization value for shells without unset; and this also
     829+# works around shells that cannot unset nonexistent variables.
     830+# Preserve -v and -x to the replacement shell.
     831+BASH_ENV=/dev/null
     832+ENV=/dev/null
     833+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
     834+case $- in # ((((
     835+  *v*x* | *x*v* ) as_opts=-vx ;;
     836+  *v* ) as_opts=-v ;;
     837+  *x* ) as_opts=-x ;;
     838+  * ) as_opts= ;;
     839+esac
     840+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
     841+# Admittedly, this is quite paranoid, since all the known shells bail
     842+# out after a failed `exec'.
     843+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
     844+exit 255
     845 fi
     846 
     847     if test x$as_have_required = xno; then :
     848@@ -322,10 +360,18 @@ $as_echo X"$as_dir" |
     849       test -d "$as_dir" && break
     850     done
     851     test -z "$as_dirs" || eval "mkdir $as_dirs"
     852-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
     853+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
     854 
     855 
     856 } # as_fn_mkdir_p
     857+
     858+# as_fn_executable_p FILE
     859+# -----------------------
     860+# Test if FILE is an executable regular file.
     861+as_fn_executable_p ()
     862+{
     863+  test -f "$1" && test -x "$1"
     864+} # as_fn_executable_p
     865 # as_fn_append VAR VALUE
     866 # ----------------------
     867 # Append the text in VALUE to the end of the definition contained in VAR. Take
     868@@ -362,19 +408,19 @@ else
     869 fi # as_fn_arith
     870 
     871 
     872-# as_fn_error ERROR [LINENO LOG_FD]
     873-# ---------------------------------
     874+# as_fn_error STATUS ERROR [LINENO LOG_FD]
     875+# ----------------------------------------
     876 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
     877 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
     878-# script with status $?, using 1 if that was 0.
     879+# script with STATUS, using 1 if that was 0.
     880 as_fn_error ()
     881 {
     882-  as_status=$?; test $as_status -eq 0 && as_status=1
     883-  if test "$3"; then
     884-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     885-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
     886+  as_status=$1; test $as_status -eq 0 && as_status=1
     887+  if test "$4"; then
     888+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     889+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     890   fi
     891-  $as_echo "$as_me: error: $1" >&2
     892+  $as_echo "$as_me: error: $2" >&2
     893   as_fn_exit $as_status
     894 } # as_fn_error
     895 
     896@@ -447,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
     897   chmod +x "$as_me.lineno" ||
     898     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
     899 
     900+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
     901+  # already done that, so ensure we don't try to do so again and fall
     902+  # in an infinite loop.  This has already happened in practice.
     903+  _as_can_reexec=no; export _as_can_reexec
     904   # Don't try to exec as it changes $[0], causing all sort of problems
     905   # (the dirname of $[0] is not the place where we might find the
     906   # original and so on.  Autoconf is especially sensitive to this).
     907@@ -481,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     908     # ... but there are two gotchas:
     909     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     910     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     911-    # In both cases, we have to default to `cp -p'.
     912+    # In both cases, we have to default to `cp -pR'.
     913     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     914-      as_ln_s='cp -p'
     915+      as_ln_s='cp -pR'
     916   elif ln conf$$.file conf$$ 2>/dev/null; then
     917     as_ln_s=ln
     918   else
     919-    as_ln_s='cp -p'
     920+    as_ln_s='cp -pR'
     921   fi
     922 else
     923-  as_ln_s='cp -p'
     924+  as_ln_s='cp -pR'
     925 fi
     926 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
     927 rmdir conf$$.dir 2>/dev/null
     928@@ -502,28 +552,8 @@ else
     929   as_mkdir_p=false
     930 fi
     931 
     932-if test -x / >/dev/null 2>&1; then
     933-  as_test_x='test -x'
     934-else
     935-  if ls -dL / >/dev/null 2>&1; then
     936-    as_ls_L_option=L
     937-  else
     938-    as_ls_L_option=
     939-  fi
     940-  as_test_x='
     941-    eval sh -c '\''
     942-      if test -d "$1"; then
     943-       test -d "$1/.";
     944-      else
     945-       case $1 in #(
     946-       -*)set "./$1";;
     947-       esac;
     948-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
     949-       ???[sx]*):;;*)false;;esac;fi
     950-    '\'' sh
     951-  '
     952-fi
     953-as_executable_p=$as_test_x
     954+as_test_x='test -x'
     955+as_executable_p=as_fn_executable_p
     956 
     957 # Sed expression to map a string onto a valid CPP name.
     958 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
     959@@ -534,10 +564,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
     960 SHELL=${CONFIG_SHELL-/bin/sh}
     961 
     962 
     963-exec 7<&0 </dev/null 6>&1
     964+test -n "$DJDIR" || exec 7<&0 </dev/null
     965+exec 6>&1
     966 
     967 # Name of the host.
     968-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
     969+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
     970 # so uname gets run too.
     971 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
     972 
     973@@ -833,8 +864,9 @@ do
     974   fi
     975 
     976   case $ac_option in
     977-  *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     978-  *)   ac_optarg=yes ;;
     979+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     980+  *=)   ac_optarg= ;;
     981+  *)    ac_optarg=yes ;;
     982   esac
     983 
     984   # Accept the important Cygnus configure options, so we can diagnose typos.
     985@@ -879,7 +911,7 @@ do
     986     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     987     # Reject names that are not valid shell variable names.
     988     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     989-      as_fn_error "invalid feature name: $ac_useropt"
     990+      as_fn_error $? "invalid feature name: $ac_useropt"
     991     ac_useropt_orig=$ac_useropt
     992     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     993     case $ac_user_opts in
     994@@ -905,7 +937,7 @@ do
     995     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     996     # Reject names that are not valid shell variable names.
     997     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     998-      as_fn_error "invalid feature name: $ac_useropt"
     999+      as_fn_error $? "invalid feature name: $ac_useropt"
     1000     ac_useropt_orig=$ac_useropt
     1001     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     1002     case $ac_user_opts in
     1003@@ -1109,7 +1141,7 @@ do
     1004     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     1005     # Reject names that are not valid shell variable names.
     1006     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     1007-      as_fn_error "invalid package name: $ac_useropt"
     1008+      as_fn_error $? "invalid package name: $ac_useropt"
     1009     ac_useropt_orig=$ac_useropt
     1010     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     1011     case $ac_user_opts in
     1012@@ -1125,7 +1157,7 @@ do
     1013     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     1014     # Reject names that are not valid shell variable names.
     1015     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
     1016-      as_fn_error "invalid package name: $ac_useropt"
     1017+      as_fn_error $? "invalid package name: $ac_useropt"
     1018     ac_useropt_orig=$ac_useropt
     1019     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     1020     case $ac_user_opts in
     1021@@ -1155,8 +1187,8 @@ do
     1022   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     1023     x_libraries=$ac_optarg ;;
     1024 
     1025-  -*) as_fn_error "unrecognized option: \`$ac_option'
     1026-Try \`$0 --help' for more information."
     1027+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
     1028+Try \`$0 --help' for more information"
     1029     ;;
     1030 
     1031   *=*)
     1032@@ -1164,7 +1196,7 @@ Try \`$0 --help' for more information."
     1033     # Reject names that are not valid shell variable names.
     1034     case $ac_envvar in #(
     1035       '' | [0-9]* | *[!_$as_cr_alnum]* )
     1036-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     1037+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1038     esac
     1039     eval $ac_envvar=\$ac_optarg
     1040     export $ac_envvar ;;
     1041@@ -1174,7 +1206,7 @@ Try \`$0 --help' for more information."
     1042     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     1043     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
     1044       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     1045-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     1046+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     1047     ;;
     1048 
     1049   esac
     1050@@ -1182,13 +1214,13 @@ done
     1051 
     1052 if test -n "$ac_prev"; then
     1053   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
     1054-  as_fn_error "missing argument to $ac_option"
     1055+  as_fn_error $? "missing argument to $ac_option"
     1056 fi
     1057 
     1058 if test -n "$ac_unrecognized_opts"; then
     1059   case $enable_option_checking in
     1060     no) ;;
     1061-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     1062+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1063     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
     1064   esac
     1065 fi
     1066@@ -1211,7 +1243,7 @@ do
     1067     [\\/$]* | ?:[\\/]* )  continue;;
     1068     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
     1069   esac
     1070-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
     1071+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
     1072 done
     1073 
     1074 # There might be people who depend on the old broken behavior: `$host'
     1075@@ -1225,8 +1257,6 @@ target=$target_alias
     1076 if test "x$host_alias" != x; then
     1077   if test "x$build_alias" = x; then
     1078     cross_compiling=maybe
     1079-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     1080-    If a cross compiler is detected then cross compile mode will be used." >&2
     1081   elif test "x$build_alias" != "x$host_alias"; then
     1082     cross_compiling=yes
     1083   fi
     1084@@ -1241,9 +1271,9 @@ test "$silent" = yes && exec 6>/dev/null
     1085 ac_pwd=`pwd` && test -n "$ac_pwd" &&
     1086 ac_ls_di=`ls -di .` &&
     1087 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
     1088-  as_fn_error "working directory cannot be determined"
     1089+  as_fn_error $? "working directory cannot be determined"
     1090 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
     1091-  as_fn_error "pwd does not report name of working directory"
     1092+  as_fn_error $? "pwd does not report name of working directory"
     1093 
     1094 
     1095 # Find the source files, if location was not specified.
     1096@@ -1282,11 +1312,11 @@ else
     1097 fi
     1098 if test ! -r "$srcdir/$ac_unique_file"; then
     1099   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
     1100-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
     1101+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
     1102 fi
     1103 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
     1104 ac_abs_confdir=`(
     1105-       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
     1106+       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
     1107        pwd)`
     1108 # When building in place, set srcdir=.
     1109 if test "$ac_abs_confdir" = "$ac_pwd"; then
     1110@@ -1326,7 +1356,7 @@ Configuration:
     1111       --help=short        display options specific to this package
     1112       --help=recursive    display the short help of all the included packages
     1113   -V, --version           display version information and exit
     1114-  -q, --quiet, --silent   do not print \`checking...' messages
     1115+  -q, --quiet, --silent   do not print \`checking ...' messages
     1116       --cache-file=FILE   cache test results in FILE [disabled]
     1117   -C, --config-cache      alias for \`--cache-file=config.cache'
     1118   -n, --no-create         do not create output files
     1119@@ -1420,7 +1450,7 @@ Some influential environment variables:
     1120   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
     1121               nonstandard directory <lib dir>
     1122   LIBS        libraries to pass to the linker, e.g. -l<library>
     1123-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
     1124+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
     1125               you have headers in a nonstandard directory <include dir>
     1126   CPP         C preprocessor
     1127 
     1128@@ -1491,9 +1521,9 @@ test -n "$ac_init_help" && exit $ac_status
     1129 if $ac_init_version; then
     1130   cat <<\_ACEOF
     1131 configure
     1132-generated by GNU Autoconf 2.64
     1133+generated by GNU Autoconf 2.69
     1134 
     1135-Copyright (C) 2009 Free Software Foundation, Inc.
     1136+Copyright (C) 2012 Free Software Foundation, Inc.
     1137 This configure script is free software; the Free Software Foundation
     1138 gives unlimited permission to copy, distribute and modify it.
     1139 _ACEOF
     1140@@ -1537,8 +1567,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
     1141 
     1142        ac_retval=1
     1143 fi
     1144-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1145-  return $ac_retval
     1146+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1147+  as_fn_set_status $ac_retval
     1148 
     1149 } # ac_fn_c_try_compile
     1150 
     1151@@ -1563,7 +1593,7 @@ $as_echo "$ac_try_echo"; } >&5
     1152     mv -f conftest.er1 conftest.err
     1153   fi
     1154   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1155-  test $ac_status = 0; } >/dev/null && {
     1156+  test $ac_status = 0; } > conftest.i && {
     1157         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
     1158         test ! -s conftest.err
     1159        }; then :
     1160@@ -1574,8 +1604,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
     1161 
     1162     ac_retval=1
     1163 fi
     1164-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1165-  return $ac_retval
     1166+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1167+  as_fn_set_status $ac_retval
     1168 
     1169 } # ac_fn_c_try_cpp
     1170 
     1171@@ -1587,10 +1617,10 @@ fi
     1172 ac_fn_c_check_header_mongrel ()
     1173 {
     1174   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     1175-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1176+  if eval \${$3+:} false; then :
     1177   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     1178 $as_echo_n "checking for $2... " >&6; }
     1179-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1180+if eval \${$3+:} false; then :
     1181   $as_echo_n "(cached) " >&6
     1182 fi
     1183 eval ac_res=\$$3
     1184@@ -1626,7 +1656,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
     1185 else
     1186   ac_header_preproc=no
     1187 fi
     1188-rm -f conftest.err conftest.$ac_ext
     1189+rm -f conftest.err conftest.i conftest.$ac_ext
     1190 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
     1191 $as_echo "$ac_header_preproc" >&6; }
     1192 
     1193@@ -1653,7 +1683,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     1194 esac
     1195   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     1196 $as_echo_n "checking for $2... " >&6; }
     1197-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1198+if eval \${$3+:} false; then :
     1199   $as_echo_n "(cached) " >&6
     1200 else
     1201   eval "$3=\$ac_header_compiler"
     1202@@ -1662,7 +1692,7 @@ eval ac_res=\$$3
     1203               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     1204 $as_echo "$ac_res" >&6; }
     1205 fi
     1206-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1207+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1208 
     1209 } # ac_fn_c_check_header_mongrel
     1210 
     1211@@ -1703,8 +1733,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
     1212        ac_retval=$ac_status
     1213 fi
     1214   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
     1215-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1216-  return $ac_retval
     1217+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1218+  as_fn_set_status $ac_retval
     1219 
     1220 } # ac_fn_c_try_run
     1221 
     1222@@ -1717,7 +1747,7 @@ ac_fn_c_check_header_compile ()
     1223   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     1224   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     1225 $as_echo_n "checking for $2... " >&6; }
     1226-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1227+if eval \${$3+:} false; then :
     1228   $as_echo_n "(cached) " >&6
     1229 else
     1230   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1231@@ -1735,7 +1765,7 @@ fi
     1232 eval ac_res=\$$3
     1233               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     1234 $as_echo "$ac_res" >&6; }
     1235-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1236+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1237 
     1238 } # ac_fn_c_check_header_compile
     1239 
     1240@@ -1766,7 +1796,7 @@ $as_echo "$ac_try_echo"; } >&5
     1241         test ! -s conftest.err
     1242        } && test -s conftest$ac_exeext && {
     1243         test "$cross_compiling" = yes ||
     1244-        $as_test_x conftest$ac_exeext
     1245+        test -x conftest$ac_exeext
     1246        }; then :
     1247   ac_retval=0
     1248 else
     1249@@ -1780,8 +1810,8 @@ fi
     1250   # interfere with the next link command; also delete a directory that is
     1251   # left behind by Apple's compiler.  We do this before executing the actions.
     1252   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
     1253-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1254-  return $ac_retval
     1255+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1256+  as_fn_set_status $ac_retval
     1257 
     1258 } # ac_fn_c_try_link
     1259 
     1260@@ -1793,7 +1823,7 @@ ac_fn_c_check_func ()
     1261   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     1262   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     1263 $as_echo_n "checking for $2... " >&6; }
     1264-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     1265+if eval \${$3+:} false; then :
     1266   $as_echo_n "(cached) " >&6
     1267 else
     1268   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1269@@ -1848,7 +1878,7 @@ fi
     1270 eval ac_res=\$$3
     1271               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     1272 $as_echo "$ac_res" >&6; }
     1273-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     1274+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
     1275 
     1276 } # ac_fn_c_check_func
     1277 cat >config.log <<_ACEOF
     1278@@ -1856,7 +1886,7 @@ This file contains any messages produced by compilers while
     1279 running configure, to aid debugging if configure makes a mistake.
     1280 
     1281 It was created by $as_me, which was
     1282-generated by GNU Autoconf 2.64.  Invocation command line was
     1283+generated by GNU Autoconf 2.69.  Invocation command line was
     1284 
     1285   $ $0 $@
     1286 
     1287@@ -1966,11 +1996,9 @@ trap 'exit_status=$?
     1288   {
     1289     echo
     1290 
     1291-    cat <<\_ASBOX
     1292-## ---------------- ##
     1293+    $as_echo "## ---------------- ##
     1294 ## Cache variables. ##
     1295-## ---------------- ##
     1296-_ASBOX
     1297+## ---------------- ##"
     1298     echo
     1299     # The following way of writing the cache mishandles newlines in values,
     1300 (
     1301@@ -2004,11 +2032,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     1302 )
     1303     echo
     1304 
     1305-    cat <<\_ASBOX
     1306-## ----------------- ##
     1307+    $as_echo "## ----------------- ##
     1308 ## Output variables. ##
     1309-## ----------------- ##
     1310-_ASBOX
     1311+## ----------------- ##"
     1312     echo
     1313     for ac_var in $ac_subst_vars
     1314     do
     1315@@ -2021,11 +2047,9 @@ _ASBOX
     1316     echo
     1317 
     1318     if test -n "$ac_subst_files"; then
     1319-      cat <<\_ASBOX
     1320-## ------------------- ##
     1321+      $as_echo "## ------------------- ##
     1322 ## File substitutions. ##
     1323-## ------------------- ##
     1324-_ASBOX
     1325+## ------------------- ##"
     1326       echo
     1327       for ac_var in $ac_subst_files
     1328       do
     1329@@ -2039,11 +2063,9 @@ _ASBOX
     1330     fi
     1331 
     1332     if test -s confdefs.h; then
     1333-      cat <<\_ASBOX
     1334-## ----------- ##
     1335+      $as_echo "## ----------- ##
     1336 ## confdefs.h. ##
     1337-## ----------- ##
     1338-_ASBOX
     1339+## ----------- ##"
     1340       echo
     1341       cat confdefs.h
     1342       echo
     1343@@ -2098,7 +2120,12 @@ _ACEOF
     1344 ac_site_file1=NONE
     1345 ac_site_file2=NONE
     1346 if test -n "$CONFIG_SITE"; then
     1347-  ac_site_file1=$CONFIG_SITE
     1348+  # We do not want a PATH search for config.site.
     1349+  case $CONFIG_SITE in #((
     1350+    -*)  ac_site_file1=./$CONFIG_SITE;;
     1351+    */*) ac_site_file1=$CONFIG_SITE;;
     1352+    *)   ac_site_file1=./$CONFIG_SITE;;
     1353+  esac
     1354 elif test "x$prefix" != xNONE; then
     1355   ac_site_file1=$prefix/share/config.site
     1356   ac_site_file2=$prefix/etc/config.site
     1357@@ -2109,18 +2136,22 @@ fi
     1358 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
     1359 do
     1360   test "x$ac_site_file" = xNONE && continue
     1361-  if test -r "$ac_site_file"; then
     1362+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     1363     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
     1364 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     1365     sed 's/^/| /' "$ac_site_file" >&5
     1366-    . "$ac_site_file"
     1367+    . "$ac_site_file" \
     1368+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1369+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1370+as_fn_error $? "failed to load site script $ac_site_file
     1371+See \`config.log' for more details" "$LINENO" 5; }
     1372   fi
     1373 done
     1374 
     1375 if test -r "$cache_file"; then
     1376-  # Some versions of bash will fail to source /dev/null (special
     1377-  # files actually), so we avoid doing that.
     1378-  if test -f "$cache_file"; then
     1379+  # Some versions of bash will fail to source /dev/null (special files
     1380+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
     1381+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     1382     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
     1383 $as_echo "$as_me: loading cache $cache_file" >&6;}
     1384     case $cache_file in
     1385@@ -2189,7 +2220,7 @@ if $ac_cache_corrupted; then
     1386 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1387   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
     1388 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
     1389-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     1390+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     1391 fi
     1392 ## -------------------- ##
     1393 ## Main body of script. ##
     1394@@ -2249,21 +2280,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1395 
     1396 
     1397 
     1398-# _AC_CHECK_DECL_BODY
     1399-# -------------------
     1400-# Shell function body for AC_CHECK_DECL.
     1401-# _AC_CHECK_DECL_BODY
     1402-
     1403-# _AC_CHECK_DECLS(SYMBOL, ACTION-IF_FOUND, ACTION-IF-NOT-FOUND,
     1404-#                 INCLUDES)
     1405-# -------------------------------------------------------------
     1406-# Helper to AC_CHECK_DECLS, which generates the check for a single
     1407-# SYMBOL with INCLUDES, performs the AC_DEFINE, then expands
     1408-# ACTION-IF-FOUND or ACTION-IF-NOT-FOUND.
     1409-
     1410-
     1411-
     1412-
     1413 
     1414 
     1415 
     1416@@ -4057,7 +4073,7 @@ if test -n "$ac_tool_prefix"; then
     1417 set dummy ${ac_tool_prefix}gcc; ac_word=$2
     1418 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1419 $as_echo_n "checking for $ac_word... " >&6; }
     1420-if test "${ac_cv_prog_CC+set}" = set; then :
     1421+if ${ac_cv_prog_CC+:} false; then :
     1422   $as_echo_n "(cached) " >&6
     1423 else
     1424   if test -n "$CC"; then
     1425@@ -4069,7 +4085,7 @@ do
     1426   IFS=$as_save_IFS
     1427   test -z "$as_dir" && as_dir=.
     1428     for ac_exec_ext in '' $ac_executable_extensions; do
     1429-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     1430+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1431     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     1432     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1433     break 2
     1434@@ -4097,7 +4113,7 @@ if test -z "$ac_cv_prog_CC"; then
     1435 set dummy gcc; ac_word=$2
     1436 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1437 $as_echo_n "checking for $ac_word... " >&6; }
     1438-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     1439+if ${ac_cv_prog_ac_ct_CC+:} false; then :
     1440   $as_echo_n "(cached) " >&6
     1441 else
     1442   if test -n "$ac_ct_CC"; then
     1443@@ -4109,7 +4125,7 @@ do
     1444   IFS=$as_save_IFS
     1445   test -z "$as_dir" && as_dir=.
     1446     for ac_exec_ext in '' $ac_executable_extensions; do
     1447-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     1448+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1449     ac_cv_prog_ac_ct_CC="gcc"
     1450     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1451     break 2
     1452@@ -4150,7 +4166,7 @@ if test -z "$CC"; then
     1453 set dummy ${ac_tool_prefix}cc; ac_word=$2
     1454 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1455 $as_echo_n "checking for $ac_word... " >&6; }
     1456-if test "${ac_cv_prog_CC+set}" = set; then :
     1457+if ${ac_cv_prog_CC+:} false; then :
     1458   $as_echo_n "(cached) " >&6
     1459 else
     1460   if test -n "$CC"; then
     1461@@ -4162,7 +4178,7 @@ do
     1462   IFS=$as_save_IFS
     1463   test -z "$as_dir" && as_dir=.
     1464     for ac_exec_ext in '' $ac_executable_extensions; do
     1465-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     1466+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1467     ac_cv_prog_CC="${ac_tool_prefix}cc"
     1468     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1469     break 2
     1470@@ -4190,7 +4206,7 @@ if test -z "$CC"; then
     1471 set dummy cc; ac_word=$2
     1472 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1473 $as_echo_n "checking for $ac_word... " >&6; }
     1474-if test "${ac_cv_prog_CC+set}" = set; then :
     1475+if ${ac_cv_prog_CC+:} false; then :
     1476   $as_echo_n "(cached) " >&6
     1477 else
     1478   if test -n "$CC"; then
     1479@@ -4203,7 +4219,7 @@ do
     1480   IFS=$as_save_IFS
     1481   test -z "$as_dir" && as_dir=.
     1482     for ac_exec_ext in '' $ac_executable_extensions; do
     1483-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     1484+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1485     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
     1486        ac_prog_rejected=yes
     1487        continue
     1488@@ -4249,7 +4265,7 @@ if test -z "$CC"; then
     1489 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     1490 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1491 $as_echo_n "checking for $ac_word... " >&6; }
     1492-if test "${ac_cv_prog_CC+set}" = set; then :
     1493+if ${ac_cv_prog_CC+:} false; then :
     1494   $as_echo_n "(cached) " >&6
     1495 else
     1496   if test -n "$CC"; then
     1497@@ -4261,7 +4277,7 @@ do
     1498   IFS=$as_save_IFS
     1499   test -z "$as_dir" && as_dir=.
     1500     for ac_exec_ext in '' $ac_executable_extensions; do
     1501-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     1502+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1503     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     1504     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1505     break 2
     1506@@ -4293,7 +4309,7 @@ do
     1507 set dummy $ac_prog; ac_word=$2
     1508 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1509 $as_echo_n "checking for $ac_word... " >&6; }
     1510-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
     1511+if ${ac_cv_prog_ac_ct_CC+:} false; then :
     1512   $as_echo_n "(cached) " >&6
     1513 else
     1514   if test -n "$ac_ct_CC"; then
     1515@@ -4305,7 +4321,7 @@ do
     1516   IFS=$as_save_IFS
     1517   test -z "$as_dir" && as_dir=.
     1518     for ac_exec_ext in '' $ac_executable_extensions; do
     1519-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     1520+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1521     ac_cv_prog_ac_ct_CC="$ac_prog"
     1522     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1523     break 2
     1524@@ -4347,8 +4363,8 @@ fi
     1525 
     1526 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1527 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1528-as_fn_error "no acceptable C compiler found in \$PATH
     1529-See \`config.log' for more details." "$LINENO" 5; }
     1530+as_fn_error $? "no acceptable C compiler found in \$PATH
     1531+See \`config.log' for more details" "$LINENO" 5; }
     1532 
     1533 # Provide some information about the compiler.
     1534 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
     1535@@ -4369,8 +4385,8 @@ $as_echo "$ac_try_echo"; } >&5
     1536 ... rest of stderr output deleted ...
     1537          10q' conftest.err >conftest.er1
     1538     cat conftest.er1 >&5
     1539-    rm -f conftest.er1 conftest.err
     1540   fi
     1541+  rm -f conftest.er1 conftest.err
     1542   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1543   test $ac_status = 0; }
     1544 done
     1545@@ -4387,12 +4403,12 @@ main ()
     1546 }
     1547 _ACEOF
     1548 ac_clean_files_save=$ac_clean_files
     1549-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
     1550+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
     1551 # Try to create an executable without -o first, disregard a.out.
     1552 # It will help us diagnose broken compilers, and finding out an intuition
     1553 # of exeext.
     1554-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     1555-$as_echo_n "checking for C compiler default output file name... " >&6; }
     1556+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     1557+$as_echo_n "checking whether the C compiler works... " >&6; }
     1558 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
     1559 
     1560 # The possible output files:
     1561@@ -4454,62 +4470,28 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
     1562 else
     1563   ac_file=''
     1564 fi
     1565-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     1566-$as_echo "$ac_file" >&6; }
     1567 if test -z "$ac_file"; then :
     1568-  $as_echo "$as_me: failed program was:" >&5
     1569+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     1570+$as_echo "no" >&6; }
     1571+$as_echo "$as_me: failed program was:" >&5
     1572 sed 's/^/| /' conftest.$ac_ext >&5
     1573 
     1574 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1575 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1576-{ as_fn_set_status 77
     1577-as_fn_error "C compiler cannot create executables
     1578-See \`config.log' for more details." "$LINENO" 5; }; }
     1579+as_fn_error 77 "C compiler cannot create executables
     1580+See \`config.log' for more details" "$LINENO" 5; }
     1581+else
     1582+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     1583+$as_echo "yes" >&6; }
     1584 fi
     1585+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     1586+$as_echo_n "checking for C compiler default output file name... " >&6; }
     1587+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     1588+$as_echo "$ac_file" >&6; }
     1589 ac_exeext=$ac_cv_exeext
     1590 
     1591-# Check that the compiler produces executables we can run.  If not, either
     1592-# the compiler is broken, or we cross compile.
     1593-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     1594-$as_echo_n "checking whether the C compiler works... " >&6; }
     1595-# If not cross compiling, check that we can run a simple program.
     1596-if test "$cross_compiling" != yes; then
     1597-  if { ac_try='./$ac_file'
     1598-  { { case "(($ac_try" in
     1599-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1600-  *) ac_try_echo=$ac_try;;
     1601-esac
     1602-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1603-$as_echo "$ac_try_echo"; } >&5
     1604-  (eval "$ac_try") 2>&5
     1605-  ac_status=$?
     1606-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1607-  test $ac_status = 0; }; }; then
     1608-    cross_compiling=no
     1609-  else
     1610-    if test "$cross_compiling" = maybe; then
     1611-       cross_compiling=yes
     1612-    else
     1613-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1614-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1615-as_fn_error "cannot run C compiled programs.
     1616-If you meant to cross compile, use \`--host'.
     1617-See \`config.log' for more details." "$LINENO" 5; }
     1618-    fi
     1619-  fi
     1620-fi
     1621-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     1622-$as_echo "yes" >&6; }
     1623-
     1624-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
     1625+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
     1626 ac_clean_files=$ac_clean_files_save
     1627-# Check that the compiler produces executables we can run.  If not, either
     1628-# the compiler is broken, or we cross compile.
     1629-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     1630-$as_echo_n "checking whether we are cross compiling... " >&6; }
     1631-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     1632-$as_echo "$cross_compiling" >&6; }
     1633-
     1634 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
     1635 $as_echo_n "checking for suffix of executables... " >&6; }
     1636 if { { ac_try="$ac_link"
     1637@@ -4539,19 +4521,78 @@ done
     1638 else
     1639   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1640 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1641-as_fn_error "cannot compute suffix of executables: cannot compile and link
     1642-See \`config.log' for more details." "$LINENO" 5; }
     1643+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
     1644+See \`config.log' for more details" "$LINENO" 5; }
     1645 fi
     1646-rm -f conftest$ac_cv_exeext
     1647+rm -f conftest conftest$ac_cv_exeext
     1648 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
     1649 $as_echo "$ac_cv_exeext" >&6; }
     1650 
     1651 rm -f conftest.$ac_ext
     1652 EXEEXT=$ac_cv_exeext
     1653 ac_exeext=$EXEEXT
     1654+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1655+/* end confdefs.h.  */
     1656+#include <stdio.h>
     1657+int
     1658+main ()
     1659+{
     1660+FILE *f = fopen ("conftest.out", "w");
     1661+ return ferror (f) || fclose (f) != 0;
     1662+
     1663+  ;
     1664+  return 0;
     1665+}
     1666+_ACEOF
     1667+ac_clean_files="$ac_clean_files conftest.out"
     1668+# Check that the compiler produces executables we can run.  If not, either
     1669+# the compiler is broken, or we cross compile.
     1670+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     1671+$as_echo_n "checking whether we are cross compiling... " >&6; }
     1672+if test "$cross_compiling" != yes; then
     1673+  { { ac_try="$ac_link"
     1674+case "(($ac_try" in
     1675+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1676+  *) ac_try_echo=$ac_try;;
     1677+esac
     1678+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1679+$as_echo "$ac_try_echo"; } >&5
     1680+  (eval "$ac_link") 2>&5
     1681+  ac_status=$?
     1682+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1683+  test $ac_status = 0; }
     1684+  if { ac_try='./conftest$ac_cv_exeext'
     1685+  { { case "(($ac_try" in
     1686+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1687+  *) ac_try_echo=$ac_try;;
     1688+esac
     1689+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1690+$as_echo "$ac_try_echo"; } >&5
     1691+  (eval "$ac_try") 2>&5
     1692+  ac_status=$?
     1693+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1694+  test $ac_status = 0; }; }; then
     1695+    cross_compiling=no
     1696+  else
     1697+    if test "$cross_compiling" = maybe; then
     1698+       cross_compiling=yes
     1699+    else
     1700+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1701+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1702+as_fn_error $? "cannot run C compiled programs.
     1703+If you meant to cross compile, use \`--host'.
     1704+See \`config.log' for more details" "$LINENO" 5; }
     1705+    fi
     1706+  fi
     1707+fi
     1708+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     1709+$as_echo "$cross_compiling" >&6; }
     1710+
     1711+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     1712+ac_clean_files=$ac_clean_files_save
     1713 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
     1714 $as_echo_n "checking for suffix of object files... " >&6; }
     1715-if test "${ac_cv_objext+set}" = set; then :
     1716+if ${ac_cv_objext+:} false; then :
     1717   $as_echo_n "(cached) " >&6
     1718 else
     1719   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1720@@ -4591,8 +4632,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
     1721 
     1722 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1723 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1724-as_fn_error "cannot compute suffix of object files: cannot compile
     1725-See \`config.log' for more details." "$LINENO" 5; }
     1726+as_fn_error $? "cannot compute suffix of object files: cannot compile
     1727+See \`config.log' for more details" "$LINENO" 5; }
     1728 fi
     1729 rm -f conftest.$ac_cv_objext conftest.$ac_ext
     1730 fi
     1731@@ -4602,7 +4643,7 @@ OBJEXT=$ac_cv_objext
     1732 ac_objext=$OBJEXT
     1733 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
     1734 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
     1735-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
     1736+if ${ac_cv_c_compiler_gnu+:} false; then :
     1737   $as_echo_n "(cached) " >&6
     1738 else
     1739   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1740@@ -4639,7 +4680,7 @@ ac_test_CFLAGS=${CFLAGS+set}
     1741 ac_save_CFLAGS=$CFLAGS
     1742 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
     1743 $as_echo_n "checking whether $CC accepts -g... " >&6; }
     1744-if test "${ac_cv_prog_cc_g+set}" = set; then :
     1745+if ${ac_cv_prog_cc_g+:} false; then :
     1746   $as_echo_n "(cached) " >&6
     1747 else
     1748   ac_save_c_werror_flag=$ac_c_werror_flag
     1749@@ -4717,7 +4758,7 @@ else
     1750 fi
     1751 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
     1752 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
     1753-if test "${ac_cv_prog_cc_c89+set}" = set; then :
     1754+if ${ac_cv_prog_cc_c89+:} false; then :
     1755   $as_echo_n "(cached) " >&6
     1756 else
     1757   ac_cv_prog_cc_c89=no
     1758@@ -4726,8 +4767,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1759 /* end confdefs.h.  */
     1760 #include <stdarg.h>
     1761 #include <stdio.h>
     1762-#include <sys/types.h>
     1763-#include <sys/stat.h>
     1764+struct stat;
     1765 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
     1766 struct buf { int x; };
     1767 FILE * (*rcsopen) (struct buf *, struct stat *, int);
     1768@@ -4814,16 +4854,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1769 
     1770 ac_aux_dir=
     1771 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
     1772-  for ac_t in install-sh install.sh shtool; do
     1773-    if test -f "$ac_dir/$ac_t"; then
     1774-      ac_aux_dir=$ac_dir
     1775-      ac_install_sh="$ac_aux_dir/$ac_t -c"
     1776-      break 2
     1777-    fi
     1778-  done
     1779+  if test -f "$ac_dir/install-sh"; then
     1780+    ac_aux_dir=$ac_dir
     1781+    ac_install_sh="$ac_aux_dir/install-sh -c"
     1782+    break
     1783+  elif test -f "$ac_dir/install.sh"; then
     1784+    ac_aux_dir=$ac_dir
     1785+    ac_install_sh="$ac_aux_dir/install.sh -c"
     1786+    break
     1787+  elif test -f "$ac_dir/shtool"; then
     1788+    ac_aux_dir=$ac_dir
     1789+    ac_install_sh="$ac_aux_dir/shtool install -c"
     1790+    break
     1791+  fi
     1792 done
     1793 if test -z "$ac_aux_dir"; then
     1794-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     1795+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     1796 fi
     1797 
     1798 # These three variables are undocumented and unsupported,
     1799@@ -4837,27 +4883,27 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
     1800 
     1801 # Make sure we can run config.sub.
     1802 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
     1803-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     1804+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     1805 
     1806 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
     1807 $as_echo_n "checking build system type... " >&6; }
     1808-if test "${ac_cv_build+set}" = set; then :
     1809+if ${ac_cv_build+:} false; then :
     1810   $as_echo_n "(cached) " >&6
     1811 else
     1812   ac_build_alias=$build_alias
     1813 test "x$ac_build_alias" = x &&
     1814   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
     1815 test "x$ac_build_alias" = x &&
     1816-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
     1817+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     1818 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
     1819-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
     1820+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
     1821 
     1822 fi
     1823 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
     1824 $as_echo "$ac_cv_build" >&6; }
     1825 case $ac_cv_build in
     1826 *-*-*) ;;
     1827-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
     1828+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
     1829 esac
     1830 build=$ac_cv_build
     1831 ac_save_IFS=$IFS; IFS='-'
     1832@@ -4875,14 +4921,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
     1833 
     1834 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
     1835 $as_echo_n "checking host system type... " >&6; }
     1836-if test "${ac_cv_host+set}" = set; then :
     1837+if ${ac_cv_host+:} false; then :
     1838   $as_echo_n "(cached) " >&6
     1839 else
     1840   if test "x$host_alias" = x; then
     1841   ac_cv_host=$ac_cv_build
     1842 else
     1843   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
     1844-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
     1845+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
     1846 fi
     1847 
     1848 fi
     1849@@ -4890,7 +4936,7 @@ fi
     1850 $as_echo "$ac_cv_host" >&6; }
     1851 case $ac_cv_host in
     1852 *-*-*) ;;
     1853-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
     1854+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
     1855 esac
     1856 host=$ac_cv_host
     1857 ac_save_IFS=$IFS; IFS='-'
     1858@@ -4908,14 +4954,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
     1859 
     1860 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
     1861 $as_echo_n "checking target system type... " >&6; }
     1862-if test "${ac_cv_target+set}" = set; then :
     1863+if ${ac_cv_target+:} false; then :
     1864   $as_echo_n "(cached) " >&6
     1865 else
     1866   if test "x$target_alias" = x; then
     1867   ac_cv_target=$ac_cv_host
     1868 else
     1869   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
     1870-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
     1871+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
     1872 fi
     1873 
     1874 fi
     1875@@ -4923,7 +4969,7 @@ fi
     1876 $as_echo "$ac_cv_target" >&6; }
     1877 case $ac_cv_target in
     1878 *-*-*) ;;
     1879-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
     1880+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
     1881 esac
     1882 target=$ac_cv_target
     1883 ac_save_IFS=$IFS; IFS='-'
     1884@@ -4958,7 +5004,7 @@ if test -n "$CPP" && test -d "$CPP"; then
     1885   CPP=
     1886 fi
     1887 if test -z "$CPP"; then
     1888-  if test "${ac_cv_prog_CPP+set}" = set; then :
     1889+  if ${ac_cv_prog_CPP+:} false; then :
     1890   $as_echo_n "(cached) " >&6
     1891 else
     1892       # Double quotes because CPP needs to be expanded
     1893@@ -4988,7 +5034,7 @@ else
     1894   # Broken: fails on valid input.
     1895 continue
     1896 fi
     1897-rm -f conftest.err conftest.$ac_ext
     1898+rm -f conftest.err conftest.i conftest.$ac_ext
     1899 
     1900   # OK, works on sane cases.  Now check whether nonexistent headers
     1901   # can be detected and how.
     1902@@ -5004,11 +5050,11 @@ else
     1903 ac_preproc_ok=:
     1904 break
     1905 fi
     1906-rm -f conftest.err conftest.$ac_ext
     1907+rm -f conftest.err conftest.i conftest.$ac_ext
     1908 
     1909 done
     1910 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
     1911-rm -f conftest.err conftest.$ac_ext
     1912+rm -f conftest.i conftest.err conftest.$ac_ext
     1913 if $ac_preproc_ok; then :
     1914   break
     1915 fi
     1916@@ -5047,7 +5093,7 @@ else
     1917   # Broken: fails on valid input.
     1918 continue
     1919 fi
     1920-rm -f conftest.err conftest.$ac_ext
     1921+rm -f conftest.err conftest.i conftest.$ac_ext
     1922 
     1923   # OK, works on sane cases.  Now check whether nonexistent headers
     1924   # can be detected and how.
     1925@@ -5063,18 +5109,18 @@ else
     1926 ac_preproc_ok=:
     1927 break
     1928 fi
     1929-rm -f conftest.err conftest.$ac_ext
     1930+rm -f conftest.err conftest.i conftest.$ac_ext
     1931 
     1932 done
     1933 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
     1934-rm -f conftest.err conftest.$ac_ext
     1935+rm -f conftest.i conftest.err conftest.$ac_ext
     1936 if $ac_preproc_ok; then :
     1937 
     1938 else
     1939   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1940 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1941-as_fn_error "C preprocessor \"$CPP\" fails sanity check
     1942-See \`config.log' for more details." "$LINENO" 5; }
     1943+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
     1944+See \`config.log' for more details" "$LINENO" 5; }
     1945 fi
     1946 
     1947 ac_ext=c
     1948@@ -5086,7 +5132,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1949 
     1950 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
     1951 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
     1952-if test "${ac_cv_path_GREP+set}" = set; then :
     1953+if ${ac_cv_path_GREP+:} false; then :
     1954   $as_echo_n "(cached) " >&6
     1955 else
     1956   if test -z "$GREP"; then
     1957@@ -5100,7 +5146,7 @@ do
     1958     for ac_prog in grep ggrep; do
     1959     for ac_exec_ext in '' $ac_executable_extensions; do
     1960       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
     1961-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
     1962+      as_fn_executable_p "$ac_path_GREP" || continue
     1963 # Check for GNU ac_path_GREP and select it if it is found.
     1964   # Check for GNU $ac_path_GREP
     1965 case `"$ac_path_GREP" --version 2>&1` in
     1966@@ -5135,7 +5181,7 @@ esac
     1967   done
     1968 IFS=$as_save_IFS
     1969   if test -z "$ac_cv_path_GREP"; then
     1970-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     1971+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     1972   fi
     1973 else
     1974   ac_cv_path_GREP=$GREP
     1975@@ -5149,7 +5195,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
     1976 
     1977 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
     1978 $as_echo_n "checking for egrep... " >&6; }
     1979-if test "${ac_cv_path_EGREP+set}" = set; then :
     1980+if ${ac_cv_path_EGREP+:} false; then :
     1981   $as_echo_n "(cached) " >&6
     1982 else
     1983   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
     1984@@ -5166,7 +5212,7 @@ do
     1985     for ac_prog in egrep; do
     1986     for ac_exec_ext in '' $ac_executable_extensions; do
     1987       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
     1988-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
     1989+      as_fn_executable_p "$ac_path_EGREP" || continue
     1990 # Check for GNU ac_path_EGREP and select it if it is found.
     1991   # Check for GNU $ac_path_EGREP
     1992 case `"$ac_path_EGREP" --version 2>&1` in
     1993@@ -5201,7 +5247,7 @@ esac
     1994   done
     1995 IFS=$as_save_IFS
     1996   if test -z "$ac_cv_path_EGREP"; then
     1997-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     1998+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     1999   fi
     2000 else
     2001   ac_cv_path_EGREP=$EGREP
     2002@@ -5216,7 +5262,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
     2003 
     2004 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
     2005 $as_echo_n "checking for ANSI C header files... " >&6; }
     2006-if test "${ac_cv_header_stdc+set}" = set; then :
     2007+if ${ac_cv_header_stdc+:} false; then :
     2008   $as_echo_n "(cached) " >&6
     2009 else
     2010   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2011@@ -5333,8 +5379,7 @@ do :
     2012   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     2013 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
     2014 "
     2015-eval as_val=\$$as_ac_Header
     2016-   if test "x$as_val" = x""yes; then :
     2017+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     2018   cat >>confdefs.h <<_ACEOF
     2019 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     2020 _ACEOF
     2021@@ -5346,7 +5391,7 @@ done
     2022 
     2023 
     2024   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
     2025-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
     2026+if test "x$ac_cv_header_minix_config_h" = xyes; then :
     2027   MINIX=yes
     2028 else
     2029   MINIX=
     2030@@ -5368,14 +5413,14 @@ $as_echo "#define _MINIX 1" >>confdefs.h
     2031 
     2032   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
     2033 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
     2034-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
     2035+if ${ac_cv_safe_to_define___extensions__+:} false; then :
     2036   $as_echo_n "(cached) " >&6
     2037 else
     2038   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2039 /* end confdefs.h.  */
     2040 
     2041-#        define __EXTENSIONS__ 1
     2042-         $ac_includes_default
     2043+#         define __EXTENSIONS__ 1
     2044+          $ac_includes_default
     2045 int
     2046 main ()
     2047 {
     2048@@ -5432,7 +5477,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
     2049 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
     2050 $as_echo_n "checking for a BSD-compatible install... " >&6; }
     2051 if test -z "$INSTALL"; then
     2052-if test "${ac_cv_path_install+set}" = set; then :
     2053+if ${ac_cv_path_install+:} false; then :
     2054   $as_echo_n "(cached) " >&6
     2055 else
     2056   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2057@@ -5452,7 +5497,7 @@ case $as_dir/ in #((
     2058     # by default.
     2059     for ac_prog in ginstall scoinst install; do
     2060       for ac_exec_ext in '' $ac_executable_extensions; do
     2061-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
     2062+       if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
     2063          if test $ac_prog = install &&
     2064            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
     2065            # AIX install.  It has an incompatible calling convention.
     2066@@ -5615,7 +5660,7 @@ esac
     2067 
     2068 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
     2069 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
     2070-if test "${ac_cv_path_SED+set}" = set; then :
     2071+if ${ac_cv_path_SED+:} false; then :
     2072   $as_echo_n "(cached) " >&6
     2073 else
     2074             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
     2075@@ -5635,7 +5680,7 @@ do
     2076     for ac_prog in sed gsed; do
     2077     for ac_exec_ext in '' $ac_executable_extensions; do
     2078       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
     2079-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
     2080+      as_fn_executable_p "$ac_path_SED" || continue
     2081 # Check for GNU ac_path_SED and select it if it is found.
     2082   # Check for GNU $ac_path_SED
     2083 case `"$ac_path_SED" --version 2>&1` in
     2084@@ -5670,7 +5715,7 @@ esac
     2085   done
     2086 IFS=$as_save_IFS
     2087   if test -z "$ac_cv_path_SED"; then
     2088-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
     2089+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
     2090   fi
     2091 else
     2092   ac_cv_path_SED=$SED
     2093@@ -5697,7 +5742,7 @@ Xsed="$SED -e 1s/^X//"
     2094 
     2095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
     2096 $as_echo_n "checking for fgrep... " >&6; }
     2097-if test "${ac_cv_path_FGREP+set}" = set; then :
     2098+if ${ac_cv_path_FGREP+:} false; then :
     2099   $as_echo_n "(cached) " >&6
     2100 else
     2101   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
     2102@@ -5714,7 +5759,7 @@ do
     2103     for ac_prog in fgrep; do
     2104     for ac_exec_ext in '' $ac_executable_extensions; do
     2105       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
     2106-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
     2107+      as_fn_executable_p "$ac_path_FGREP" || continue
     2108 # Check for GNU ac_path_FGREP and select it if it is found.
     2109   # Check for GNU $ac_path_FGREP
     2110 case `"$ac_path_FGREP" --version 2>&1` in
     2111@@ -5749,7 +5794,7 @@ esac
     2112   done
     2113 IFS=$as_save_IFS
     2114   if test -z "$ac_cv_path_FGREP"; then
     2115-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     2116+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     2117   fi
     2118 else
     2119   ac_cv_path_FGREP=$FGREP
     2120@@ -5828,7 +5873,7 @@ else
     2121   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
     2122 $as_echo_n "checking for non-GNU ld... " >&6; }
     2123 fi
     2124-if test "${lt_cv_path_LD+set}" = set; then :
     2125+if ${lt_cv_path_LD+:} false; then :
     2126   $as_echo_n "(cached) " >&6
     2127 else
     2128   if test -z "$LD"; then
     2129@@ -5865,10 +5910,10 @@ else
     2130   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2131 $as_echo "no" >&6; }
     2132 fi
     2133-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
     2134+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
     2135 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
     2136 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
     2137-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
     2138+if ${lt_cv_prog_gnu_ld+:} false; then :
     2139   $as_echo_n "(cached) " >&6
     2140 else
     2141   # I'd rather use --version here, but apparently some GNU lds only accept -v.
     2142@@ -5895,7 +5940,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     2143 
     2144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
     2145 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
     2146-if test "${lt_cv_path_NM+set}" = set; then :
     2147+if ${lt_cv_path_NM+:} false; then :
     2148   $as_echo_n "(cached) " >&6
     2149 else
     2150   if test -n "$NM"; then
     2151@@ -5958,7 +6003,7 @@ else
     2152 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     2153 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2154 $as_echo_n "checking for $ac_word... " >&6; }
     2155-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
     2156+if ${ac_cv_prog_DUMPBIN+:} false; then :
     2157   $as_echo_n "(cached) " >&6
     2158 else
     2159   if test -n "$DUMPBIN"; then
     2160@@ -5970,7 +6015,7 @@ do
     2161   IFS=$as_save_IFS
     2162   test -z "$as_dir" && as_dir=.
     2163     for ac_exec_ext in '' $ac_executable_extensions; do
     2164-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2165+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2166     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     2167     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2168     break 2
     2169@@ -6002,7 +6047,7 @@ do
     2170 set dummy $ac_prog; ac_word=$2
     2171 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2172 $as_echo_n "checking for $ac_word... " >&6; }
     2173-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
     2174+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
     2175   $as_echo_n "(cached) " >&6
     2176 else
     2177   if test -n "$ac_ct_DUMPBIN"; then
     2178@@ -6014,7 +6059,7 @@ do
     2179   IFS=$as_save_IFS
     2180   test -z "$as_dir" && as_dir=.
     2181     for ac_exec_ext in '' $ac_executable_extensions; do
     2182-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2183+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2184     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     2185     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2186     break 2
     2187@@ -6074,7 +6119,7 @@ test -z "$NM" && NM=nm
     2188 
     2189 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
     2190 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
     2191-if test "${lt_cv_nm_interface+set}" = set; then :
     2192+if ${lt_cv_nm_interface+:} false; then :
     2193   $as_echo_n "(cached) " >&6
     2194 else
     2195   lt_cv_nm_interface="BSD nm"
     2196@@ -6109,7 +6154,7 @@ fi
     2197 # find the maximum length of command line arguments
     2198 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
     2199 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
     2200-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
     2201+if ${lt_cv_sys_max_cmd_len+:} false; then :
     2202   $as_echo_n "(cached) " >&6
     2203 else
     2204     i=0
     2205@@ -6306,7 +6351,7 @@ esac
     2206 
     2207 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
     2208 $as_echo_n "checking for $LD option to reload object files... " >&6; }
     2209-if test "${lt_cv_ld_reload_flag+set}" = set; then :
     2210+if ${lt_cv_ld_reload_flag+:} false; then :
     2211   $as_echo_n "(cached) " >&6
     2212 else
     2213   lt_cv_ld_reload_flag='-r'
     2214@@ -6342,7 +6387,7 @@ if test -n "$ac_tool_prefix"; then
     2215 set dummy ${ac_tool_prefix}objdump; ac_word=$2
     2216 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2217 $as_echo_n "checking for $ac_word... " >&6; }
     2218-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
     2219+if ${ac_cv_prog_OBJDUMP+:} false; then :
     2220   $as_echo_n "(cached) " >&6
     2221 else
     2222   if test -n "$OBJDUMP"; then
     2223@@ -6354,7 +6399,7 @@ do
     2224   IFS=$as_save_IFS
     2225   test -z "$as_dir" && as_dir=.
     2226     for ac_exec_ext in '' $ac_executable_extensions; do
     2227-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2228+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2229     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     2230     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2231     break 2
     2232@@ -6382,7 +6427,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
     2233 set dummy objdump; ac_word=$2
     2234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2235 $as_echo_n "checking for $ac_word... " >&6; }
     2236-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
     2237+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
     2238   $as_echo_n "(cached) " >&6
     2239 else
     2240   if test -n "$ac_ct_OBJDUMP"; then
     2241@@ -6394,7 +6439,7 @@ do
     2242   IFS=$as_save_IFS
     2243   test -z "$as_dir" && as_dir=.
     2244     for ac_exec_ext in '' $ac_executable_extensions; do
     2245-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2246+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2247     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     2248     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2249     break 2
     2250@@ -6441,7 +6486,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
     2251 
     2252 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
     2253 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
     2254-if test "${lt_cv_deplibs_check_method+set}" = set; then :
     2255+if ${lt_cv_deplibs_check_method+:} false; then :
     2256   $as_echo_n "(cached) " >&6
     2257 else
     2258   lt_cv_file_magic_cmd='$MAGIC_CMD'
     2259@@ -6662,7 +6707,7 @@ if test -n "$ac_tool_prefix"; then
     2260 set dummy ${ac_tool_prefix}ar; ac_word=$2
     2261 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2262 $as_echo_n "checking for $ac_word... " >&6; }
     2263-if test "${ac_cv_prog_AR+set}" = set; then :
     2264+if ${ac_cv_prog_AR+:} false; then :
     2265   $as_echo_n "(cached) " >&6
     2266 else
     2267   if test -n "$AR"; then
     2268@@ -6674,7 +6719,7 @@ do
     2269   IFS=$as_save_IFS
     2270   test -z "$as_dir" && as_dir=.
     2271     for ac_exec_ext in '' $ac_executable_extensions; do
     2272-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2273+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2274     ac_cv_prog_AR="${ac_tool_prefix}ar"
     2275     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2276     break 2
     2277@@ -6702,7 +6747,7 @@ if test -z "$ac_cv_prog_AR"; then
     2278 set dummy ar; ac_word=$2
     2279 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2280 $as_echo_n "checking for $ac_word... " >&6; }
     2281-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
     2282+if ${ac_cv_prog_ac_ct_AR+:} false; then :
     2283   $as_echo_n "(cached) " >&6
     2284 else
     2285   if test -n "$ac_ct_AR"; then
     2286@@ -6714,7 +6759,7 @@ do
     2287   IFS=$as_save_IFS
     2288   test -z "$as_dir" && as_dir=.
     2289     for ac_exec_ext in '' $ac_executable_extensions; do
     2290-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2291+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2292     ac_cv_prog_ac_ct_AR="ar"
     2293     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2294     break 2
     2295@@ -6767,7 +6812,7 @@ if test -n "$ac_tool_prefix"; then
     2296 set dummy ${ac_tool_prefix}strip; ac_word=$2
     2297 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2298 $as_echo_n "checking for $ac_word... " >&6; }
     2299-if test "${ac_cv_prog_STRIP+set}" = set; then :
     2300+if ${ac_cv_prog_STRIP+:} false; then :
     2301   $as_echo_n "(cached) " >&6
     2302 else
     2303   if test -n "$STRIP"; then
     2304@@ -6779,7 +6824,7 @@ do
     2305   IFS=$as_save_IFS
     2306   test -z "$as_dir" && as_dir=.
     2307     for ac_exec_ext in '' $ac_executable_extensions; do
     2308-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2309+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2310     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     2311     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2312     break 2
     2313@@ -6807,7 +6852,7 @@ if test -z "$ac_cv_prog_STRIP"; then
     2314 set dummy strip; ac_word=$2
     2315 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2316 $as_echo_n "checking for $ac_word... " >&6; }
     2317-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
     2318+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
     2319   $as_echo_n "(cached) " >&6
     2320 else
     2321   if test -n "$ac_ct_STRIP"; then
     2322@@ -6819,7 +6864,7 @@ do
     2323   IFS=$as_save_IFS
     2324   test -z "$as_dir" && as_dir=.
     2325     for ac_exec_ext in '' $ac_executable_extensions; do
     2326-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2327+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2328     ac_cv_prog_ac_ct_STRIP="strip"
     2329     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2330     break 2
     2331@@ -6866,7 +6911,7 @@ if test -n "$ac_tool_prefix"; then
     2332 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
     2333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2334 $as_echo_n "checking for $ac_word... " >&6; }
     2335-if test "${ac_cv_prog_RANLIB+set}" = set; then :
     2336+if ${ac_cv_prog_RANLIB+:} false; then :
     2337   $as_echo_n "(cached) " >&6
     2338 else
     2339   if test -n "$RANLIB"; then
     2340@@ -6878,7 +6923,7 @@ do
     2341   IFS=$as_save_IFS
     2342   test -z "$as_dir" && as_dir=.
     2343     for ac_exec_ext in '' $ac_executable_extensions; do
     2344-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2345+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2346     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     2347     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2348     break 2
     2349@@ -6906,7 +6951,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
     2350 set dummy ranlib; ac_word=$2
     2351 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2352 $as_echo_n "checking for $ac_word... " >&6; }
     2353-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
     2354+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
     2355   $as_echo_n "(cached) " >&6
     2356 else
     2357   if test -n "$ac_ct_RANLIB"; then
     2358@@ -6918,7 +6963,7 @@ do
     2359   IFS=$as_save_IFS
     2360   test -z "$as_dir" && as_dir=.
     2361     for ac_exec_ext in '' $ac_executable_extensions; do
     2362-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2363+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2364     ac_cv_prog_ac_ct_RANLIB="ranlib"
     2365     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2366     break 2
     2367@@ -7010,7 +7055,7 @@ do
     2368 set dummy $ac_prog; ac_word=$2
     2369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2370 $as_echo_n "checking for $ac_word... " >&6; }
     2371-if test "${ac_cv_prog_AWK+set}" = set; then :
     2372+if ${ac_cv_prog_AWK+:} false; then :
     2373   $as_echo_n "(cached) " >&6
     2374 else
     2375   if test -n "$AWK"; then
     2376@@ -7022,7 +7067,7 @@ do
     2377   IFS=$as_save_IFS
     2378   test -z "$as_dir" && as_dir=.
     2379     for ac_exec_ext in '' $ac_executable_extensions; do
     2380-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2381+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2382     ac_cv_prog_AWK="$ac_prog"
     2383     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2384     break 2
     2385@@ -7077,7 +7122,7 @@ compiler=$CC
     2386 # Check for command to grab the raw symbol name followed by C symbol from nm.
     2387 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
     2388 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
     2389-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
     2390+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
     2391   $as_echo_n "(cached) " >&6
     2392 else
     2393 
     2394@@ -7461,7 +7506,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     2395   CFLAGS="$CFLAGS -belf"
     2396   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
     2397 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
     2398-if test "${lt_cv_cc_needs_belf+set}" = set; then :
     2399+if ${lt_cv_cc_needs_belf+:} false; then :
     2400   $as_echo_n "(cached) " >&6
     2401 else
     2402   ac_ext=c
     2403@@ -7537,7 +7582,7 @@ need_locks="$enable_libtool_lock"
     2404 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
     2405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2406 $as_echo_n "checking for $ac_word... " >&6; }
     2407-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
     2408+if ${ac_cv_prog_DSYMUTIL+:} false; then :
     2409   $as_echo_n "(cached) " >&6
     2410 else
     2411   if test -n "$DSYMUTIL"; then
     2412@@ -7549,7 +7594,7 @@ do
     2413   IFS=$as_save_IFS
     2414   test -z "$as_dir" && as_dir=.
     2415     for ac_exec_ext in '' $ac_executable_extensions; do
     2416-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2417+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2418     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     2419     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2420     break 2
     2421@@ -7577,7 +7622,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
     2422 set dummy dsymutil; ac_word=$2
     2423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2424 $as_echo_n "checking for $ac_word... " >&6; }
     2425-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
     2426+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
     2427   $as_echo_n "(cached) " >&6
     2428 else
     2429   if test -n "$ac_ct_DSYMUTIL"; then
     2430@@ -7589,7 +7634,7 @@ do
     2431   IFS=$as_save_IFS
     2432   test -z "$as_dir" && as_dir=.
     2433     for ac_exec_ext in '' $ac_executable_extensions; do
     2434-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2435+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2436     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     2437     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2438     break 2
     2439@@ -7629,7 +7674,7 @@ fi
     2440 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
     2441 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2442 $as_echo_n "checking for $ac_word... " >&6; }
     2443-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
     2444+if ${ac_cv_prog_NMEDIT+:} false; then :
     2445   $as_echo_n "(cached) " >&6
     2446 else
     2447   if test -n "$NMEDIT"; then
     2448@@ -7641,7 +7686,7 @@ do
     2449   IFS=$as_save_IFS
     2450   test -z "$as_dir" && as_dir=.
     2451     for ac_exec_ext in '' $ac_executable_extensions; do
     2452-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2453+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2454     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     2455     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2456     break 2
     2457@@ -7669,7 +7714,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
     2458 set dummy nmedit; ac_word=$2
     2459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2460 $as_echo_n "checking for $ac_word... " >&6; }
     2461-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
     2462+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
     2463   $as_echo_n "(cached) " >&6
     2464 else
     2465   if test -n "$ac_ct_NMEDIT"; then
     2466@@ -7681,7 +7726,7 @@ do
     2467   IFS=$as_save_IFS
     2468   test -z "$as_dir" && as_dir=.
     2469     for ac_exec_ext in '' $ac_executable_extensions; do
     2470-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2471+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2472     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     2473     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2474     break 2
     2475@@ -7721,7 +7766,7 @@ fi
     2476 set dummy ${ac_tool_prefix}lipo; ac_word=$2
     2477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2478 $as_echo_n "checking for $ac_word... " >&6; }
     2479-if test "${ac_cv_prog_LIPO+set}" = set; then :
     2480+if ${ac_cv_prog_LIPO+:} false; then :
     2481   $as_echo_n "(cached) " >&6
     2482 else
     2483   if test -n "$LIPO"; then
     2484@@ -7733,7 +7778,7 @@ do
     2485   IFS=$as_save_IFS
     2486   test -z "$as_dir" && as_dir=.
     2487     for ac_exec_ext in '' $ac_executable_extensions; do
     2488-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2489+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2490     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     2491     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2492     break 2
     2493@@ -7761,7 +7806,7 @@ if test -z "$ac_cv_prog_LIPO"; then
     2494 set dummy lipo; ac_word=$2
     2495 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2496 $as_echo_n "checking for $ac_word... " >&6; }
     2497-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
     2498+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
     2499   $as_echo_n "(cached) " >&6
     2500 else
     2501   if test -n "$ac_ct_LIPO"; then
     2502@@ -7773,7 +7818,7 @@ do
     2503   IFS=$as_save_IFS
     2504   test -z "$as_dir" && as_dir=.
     2505     for ac_exec_ext in '' $ac_executable_extensions; do
     2506-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2507+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2508     ac_cv_prog_ac_ct_LIPO="lipo"
     2509     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2510     break 2
     2511@@ -7813,7 +7858,7 @@ fi
     2512 set dummy ${ac_tool_prefix}otool; ac_word=$2
     2513 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2514 $as_echo_n "checking for $ac_word... " >&6; }
     2515-if test "${ac_cv_prog_OTOOL+set}" = set; then :
     2516+if ${ac_cv_prog_OTOOL+:} false; then :
     2517   $as_echo_n "(cached) " >&6
     2518 else
     2519   if test -n "$OTOOL"; then
     2520@@ -7825,7 +7870,7 @@ do
     2521   IFS=$as_save_IFS
     2522   test -z "$as_dir" && as_dir=.
     2523     for ac_exec_ext in '' $ac_executable_extensions; do
     2524-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2525+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2526     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     2527     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2528     break 2
     2529@@ -7853,7 +7898,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
     2530 set dummy otool; ac_word=$2
     2531 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2532 $as_echo_n "checking for $ac_word... " >&6; }
     2533-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
     2534+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
     2535   $as_echo_n "(cached) " >&6
     2536 else
     2537   if test -n "$ac_ct_OTOOL"; then
     2538@@ -7865,7 +7910,7 @@ do
     2539   IFS=$as_save_IFS
     2540   test -z "$as_dir" && as_dir=.
     2541     for ac_exec_ext in '' $ac_executable_extensions; do
     2542-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2543+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2544     ac_cv_prog_ac_ct_OTOOL="otool"
     2545     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2546     break 2
     2547@@ -7905,7 +7950,7 @@ fi
     2548 set dummy ${ac_tool_prefix}otool64; ac_word=$2
     2549 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2550 $as_echo_n "checking for $ac_word... " >&6; }
     2551-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
     2552+if ${ac_cv_prog_OTOOL64+:} false; then :
     2553   $as_echo_n "(cached) " >&6
     2554 else
     2555   if test -n "$OTOOL64"; then
     2556@@ -7917,7 +7962,7 @@ do
     2557   IFS=$as_save_IFS
     2558   test -z "$as_dir" && as_dir=.
     2559     for ac_exec_ext in '' $ac_executable_extensions; do
     2560-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2561+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2562     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     2563     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2564     break 2
     2565@@ -7945,7 +7990,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
     2566 set dummy otool64; ac_word=$2
     2567 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2568 $as_echo_n "checking for $ac_word... " >&6; }
     2569-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
     2570+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
     2571   $as_echo_n "(cached) " >&6
     2572 else
     2573   if test -n "$ac_ct_OTOOL64"; then
     2574@@ -7957,7 +8002,7 @@ do
     2575   IFS=$as_save_IFS
     2576   test -z "$as_dir" && as_dir=.
     2577     for ac_exec_ext in '' $ac_executable_extensions; do
     2578-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2579+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2580     ac_cv_prog_ac_ct_OTOOL64="otool64"
     2581     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2582     break 2
     2583@@ -8020,7 +8065,7 @@ fi
     2584 
     2585     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
     2586 $as_echo_n "checking for -single_module linker flag... " >&6; }
     2587-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
     2588+if ${lt_cv_apple_cc_single_mod+:} false; then :
     2589   $as_echo_n "(cached) " >&6
     2590 else
     2591   lt_cv_apple_cc_single_mod=no
     2592@@ -8049,7 +8094,7 @@ fi
     2593 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
     2594     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
     2595 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
     2596-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
     2597+if ${lt_cv_ld_exported_symbols_list+:} false; then :
     2598   $as_echo_n "(cached) " >&6
     2599 else
     2600   lt_cv_ld_exported_symbols_list=no
     2601@@ -8081,7 +8126,7 @@ fi
     2602 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     2603     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
     2604 $as_echo_n "checking for -force_load linker flag... " >&6; }
     2605-if test "${lt_cv_ld_force_load+set}" = set; then :
     2606+if ${lt_cv_ld_force_load+:} false; then :
     2607   $as_echo_n "(cached) " >&6
     2608 else
     2609   lt_cv_ld_force_load=no
     2610@@ -8148,7 +8193,7 @@ for ac_header in dlfcn.h
     2611 do :
     2612   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
     2613 "
     2614-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
     2615+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
     2616   cat >>confdefs.h <<_ACEOF
     2617 #define HAVE_DLFCN_H 1
     2618 _ACEOF
     2619@@ -8184,7 +8229,7 @@ if test -n "$ac_tool_prefix"; then
     2620 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
     2621 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2622 $as_echo_n "checking for $ac_word... " >&6; }
     2623-if test "${ac_cv_prog_RANLIB+set}" = set; then :
     2624+if ${ac_cv_prog_RANLIB+:} false; then :
     2625   $as_echo_n "(cached) " >&6
     2626 else
     2627   if test -n "$RANLIB"; then
     2628@@ -8196,7 +8241,7 @@ do
     2629   IFS=$as_save_IFS
     2630   test -z "$as_dir" && as_dir=.
     2631     for ac_exec_ext in '' $ac_executable_extensions; do
     2632-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2633+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2634     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     2635     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2636     break 2
     2637@@ -8224,7 +8269,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
     2638 set dummy ranlib; ac_word=$2
     2639 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2640 $as_echo_n "checking for $ac_word... " >&6; }
     2641-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
     2642+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
     2643   $as_echo_n "(cached) " >&6
     2644 else
     2645   if test -n "$ac_ct_RANLIB"; then
     2646@@ -8236,7 +8281,7 @@ do
     2647   IFS=$as_save_IFS
     2648   test -z "$as_dir" && as_dir=.
     2649     for ac_exec_ext in '' $ac_executable_extensions; do
     2650-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2651+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2652     ac_cv_prog_ac_ct_RANLIB="ranlib"
     2653     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2654     break 2
     2655@@ -8292,7 +8337,7 @@ depcc="$CC"   am_compiler_list=
     2656 am_depcomp=$ac_aux_dir/depcomp
     2657 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
     2658 $as_echo_n "checking dependency style of $depcc... " >&6; }
     2659-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
     2660+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
     2661   $as_echo_n "(cached) " >&6
     2662 else
     2663   if test -f "$am_depcomp"; then
     2664@@ -8378,7 +8423,7 @@ fi
     2665 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
     2666 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
     2667 if test x${am_cv_CC_dependencies_compiler_type-none} = xnone
     2668-then as_fn_error "no usable dependency style found" "$LINENO" 5
     2669+then as_fn_error $? "no usable dependency style found" "$LINENO" 5
     2670 else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
     2671 
     2672 fi
     2673@@ -8391,7 +8436,7 @@ do
     2674 set dummy $ac_prog; ac_word=$2
     2675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2676 $as_echo_n "checking for $ac_word... " >&6; }
     2677-if test "${ac_cv_prog_MAKE+set}" = set; then :
     2678+if ${ac_cv_prog_MAKE+:} false; then :
     2679   $as_echo_n "(cached) " >&6
     2680 else
     2681   if test -n "$MAKE"; then
     2682@@ -8403,7 +8448,7 @@ do
     2683   IFS=$as_save_IFS
     2684   test -z "$as_dir" && as_dir=.
     2685     for ac_exec_ext in '' $ac_executable_extensions; do
     2686-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     2687+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2688     ac_cv_prog_MAKE="$ac_prog"
     2689     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2690     break 2
     2691@@ -8521,8 +8566,7 @@ for ac_header in stdlib.h string.h strings.h unistd.h time.h
     2692 do :
     2693   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     2694 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
     2695-eval as_val=\$$as_ac_Header
     2696-   if test "x$as_val" = x""yes; then :
     2697+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     2698   cat >>confdefs.h <<_ACEOF
     2699 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     2700 _ACEOF
     2701@@ -8535,8 +8579,7 @@ for ac_header in sys/time.h sys/resource.h
     2702 do :
     2703   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     2704 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
     2705-eval as_val=\$$as_ac_Header
     2706-   if test "x$as_val" = x""yes; then :
     2707+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     2708   cat >>confdefs.h <<_ACEOF
     2709 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     2710 _ACEOF
     2711@@ -8549,8 +8592,7 @@ for ac_header in fcntl.h fpu_control.h
     2712 do :
     2713   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     2714 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
     2715-eval as_val=\$$as_ac_Header
     2716-   if test "x$as_val" = x""yes; then :
     2717+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     2718   cat >>confdefs.h <<_ACEOF
     2719 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     2720 _ACEOF
     2721@@ -8563,8 +8605,7 @@ for ac_header in dlfcn.h errno.h sys/stat.h
     2722 do :
     2723   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
     2724 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
     2725-eval as_val=\$$as_ac_Header
     2726-   if test "x$as_val" = x""yes; then :
     2727+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     2728   cat >>confdefs.h <<_ACEOF
     2729 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
     2730 _ACEOF
     2731@@ -8577,8 +8618,7 @@ for ac_func in getrusage time sigaction __setfpucw
     2732 do :
     2733   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     2734 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     2735-eval as_val=\$$as_ac_var
     2736-   if test "x$as_val" = x""yes; then :
     2737+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     2738   cat >>confdefs.h <<_ACEOF
     2739 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
     2740 _ACEOF
     2741@@ -8590,7 +8630,7 @@ done
     2742 # Check for socket libraries
     2743 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
     2744 $as_echo_n "checking for bind in -lsocket... " >&6; }
     2745-if test "${ac_cv_lib_socket_bind+set}" = set; then :
     2746+if ${ac_cv_lib_socket_bind+:} false; then :
     2747   $as_echo_n "(cached) " >&6
     2748 else
     2749   ac_check_lib_save_LIBS=$LIBS
     2750@@ -8624,7 +8664,7 @@ LIBS=$ac_check_lib_save_LIBS
     2751 fi
     2752 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5
     2753 $as_echo "$ac_cv_lib_socket_bind" >&6; }
     2754-if test "x$ac_cv_lib_socket_bind" = x""yes; then :
     2755+if test "x$ac_cv_lib_socket_bind" = xyes; then :
     2756   cat >>confdefs.h <<_ACEOF
     2757 #define HAVE_LIBSOCKET 1
     2758 _ACEOF
     2759@@ -8635,7 +8675,7 @@ fi
     2760 
     2761 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
     2762 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
     2763-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
     2764+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
     2765   $as_echo_n "(cached) " >&6
     2766 else
     2767   ac_check_lib_save_LIBS=$LIBS
     2768@@ -8669,7 +8709,7 @@ LIBS=$ac_check_lib_save_LIBS
     2769 fi
     2770 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
     2771 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
     2772-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
     2773+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
     2774   cat >>confdefs.h <<_ACEOF
     2775 #define HAVE_LIBNSL 1
     2776 _ACEOF
     2777@@ -8695,7 +8735,7 @@ fi
     2778   if test "$with_zlib" != "no"; then
     2779     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
     2780 $as_echo_n "checking for library containing zlibVersion... " >&6; }
     2781-if test "${ac_cv_search_zlibVersion+set}" = set; then :
     2782+if ${ac_cv_search_zlibVersion+:} false; then :
     2783   $as_echo_n "(cached) " >&6
     2784 else
     2785   ac_func_search_save_LIBS=$LIBS
     2786@@ -8729,11 +8769,11 @@ for ac_lib in '' z; do
     2787 fi
     2788 rm -f core conftest.err conftest.$ac_objext \
     2789     conftest$ac_exeext
     2790-  if test "${ac_cv_search_zlibVersion+set}" = set; then :
     2791+  if ${ac_cv_search_zlibVersion+:} false; then :
     2792   break
     2793 fi
     2794 done
     2795-if test "${ac_cv_search_zlibVersion+set}" = set; then :
     2796+if ${ac_cv_search_zlibVersion+:} false; then :
     2797 
     2798 else
     2799   ac_cv_search_zlibVersion=no
     2800@@ -8749,7 +8789,7 @@ if test "$ac_res" != no; then :
     2801   for ac_header in zlib.h
     2802 do :
     2803   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
     2804-if test "x$ac_cv_header_zlib_h" = x""yes; then :
     2805+if test "x$ac_cv_header_zlib_h" = xyes; then :
     2806   cat >>confdefs.h <<_ACEOF
     2807 #define HAVE_ZLIB_H 1
     2808 _ACEOF
     2809@@ -8761,7 +8801,7 @@ done
     2810 fi
     2811 
     2812     if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
     2813-      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
     2814+      as_fn_error $? "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
     2815     fi
     2816   fi
     2817 
     2818@@ -8965,7 +9005,7 @@ fi
     2819 
     2820 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
     2821 $as_echo_n "checking for objdir... " >&6; }
     2822-if test "${lt_cv_objdir+set}" = set; then :
     2823+if ${lt_cv_objdir+:} false; then :
     2824   $as_echo_n "(cached) " >&6
     2825 else
     2826   rm -f .libs 2>/dev/null
     2827@@ -9043,7 +9083,7 @@ file_magic*)
     2828   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     2829     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
     2830 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
     2831-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
     2832+if ${lt_cv_path_MAGIC_CMD+:} false; then :
     2833   $as_echo_n "(cached) " >&6
     2834 else
     2835   case $MAGIC_CMD in
     2836@@ -9109,7 +9149,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
     2837   if test -n "$ac_tool_prefix"; then
     2838     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
     2839 $as_echo_n "checking for file... " >&6; }
     2840-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
     2841+if ${lt_cv_path_MAGIC_CMD+:} false; then :
     2842   $as_echo_n "(cached) " >&6
     2843 else
     2844   case $MAGIC_CMD in
     2845@@ -9251,7 +9291,7 @@ if test "$GCC" = yes; then
     2846 
     2847   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
     2848 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
     2849-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
     2850+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
     2851   $as_echo_n "(cached) " >&6
     2852 else
     2853   lt_cv_prog_compiler_rtti_exceptions=no
     2854@@ -9604,7 +9644,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
     2855 if test -n "$lt_prog_compiler_pic"; then
     2856   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
     2857 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
     2858-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
     2859+if ${lt_cv_prog_compiler_pic_works+:} false; then :
     2860   $as_echo_n "(cached) " >&6
     2861 else
     2862   lt_cv_prog_compiler_pic_works=no
     2863@@ -9663,7 +9703,7 @@ fi
     2864 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
     2865 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
     2866 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
     2867-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
     2868+if ${lt_cv_prog_compiler_static_works+:} false; then :
     2869   $as_echo_n "(cached) " >&6
     2870 else
     2871   lt_cv_prog_compiler_static_works=no
     2872@@ -9706,7 +9746,7 @@ fi
     2873 
     2874   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
     2875 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
     2876-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
     2877+if ${lt_cv_prog_compiler_c_o+:} false; then :
     2878   $as_echo_n "(cached) " >&6
     2879 else
     2880   lt_cv_prog_compiler_c_o=no
     2881@@ -9761,7 +9801,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
     2882 
     2883   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
     2884 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
     2885-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
     2886+if ${lt_cv_prog_compiler_c_o+:} false; then :
     2887   $as_echo_n "(cached) " >&6
     2888 else
     2889   lt_cv_prog_compiler_c_o=no
     2890@@ -10577,7 +10617,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     2891          # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
     2892          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
     2893 $as_echo_n "checking if $CC understands -b... " >&6; }
     2894-if test "${lt_cv_prog_compiler__b+set}" = set; then :
     2895+if ${lt_cv_prog_compiler__b+:} false; then :
     2896   $as_echo_n "(cached) " >&6
     2897 else
     2898   lt_cv_prog_compiler__b=no
     2899@@ -10949,7 +10989,7 @@ x|xyes)
     2900       # to ld, don't add -lc before -lgcc.
     2901       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
     2902 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
     2903-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
     2904+if ${lt_cv_archive_cmds_need_lc+:} false; then :
     2905   $as_echo_n "(cached) " >&6
     2906 else
     2907   $RM conftest*
     2908@@ -11587,7 +11627,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
     2909   shlibpath_overrides_runpath=no
     2910 
     2911   # Some binutils ld are patched to set DT_RUNPATH
     2912-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
     2913+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
     2914   $as_echo_n "(cached) " >&6
     2915 else
     2916   lt_cv_shlibpath_overrides_runpath=no
     2917@@ -12007,7 +12047,7 @@ else
     2918   # if libdl is installed we need to link against it
     2919     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
     2920 $as_echo_n "checking for dlopen in -ldl... " >&6; }
     2921-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
     2922+if ${ac_cv_lib_dl_dlopen+:} false; then :
     2923   $as_echo_n "(cached) " >&6
     2924 else
     2925   ac_check_lib_save_LIBS=$LIBS
     2926@@ -12041,7 +12081,7 @@ LIBS=$ac_check_lib_save_LIBS
     2927 fi
     2928 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
     2929 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
     2930-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
     2931+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
     2932   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
     2933 else
     2934 
     2935@@ -12055,12 +12095,12 @@ fi
     2936 
     2937   *)
     2938     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
     2939-if test "x$ac_cv_func_shl_load" = x""yes; then :
     2940+if test "x$ac_cv_func_shl_load" = xyes; then :
     2941   lt_cv_dlopen="shl_load"
     2942 else
     2943   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
     2944 $as_echo_n "checking for shl_load in -ldld... " >&6; }
     2945-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
     2946+if ${ac_cv_lib_dld_shl_load+:} false; then :
     2947   $as_echo_n "(cached) " >&6
     2948 else
     2949   ac_check_lib_save_LIBS=$LIBS
     2950@@ -12094,16 +12134,16 @@ LIBS=$ac_check_lib_save_LIBS
     2951 fi
     2952 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
     2953 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
     2954-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
     2955+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
     2956   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
     2957 else
     2958   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
     2959-if test "x$ac_cv_func_dlopen" = x""yes; then :
     2960+if test "x$ac_cv_func_dlopen" = xyes; then :
     2961   lt_cv_dlopen="dlopen"
     2962 else
     2963   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
     2964 $as_echo_n "checking for dlopen in -ldl... " >&6; }
     2965-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
     2966+if ${ac_cv_lib_dl_dlopen+:} false; then :
     2967   $as_echo_n "(cached) " >&6
     2968 else
     2969   ac_check_lib_save_LIBS=$LIBS
     2970@@ -12137,12 +12177,12 @@ LIBS=$ac_check_lib_save_LIBS
     2971 fi
     2972 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
     2973 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
     2974-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
     2975+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
     2976   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
     2977 else
     2978   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
     2979 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
     2980-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
     2981+if ${ac_cv_lib_svld_dlopen+:} false; then :
     2982   $as_echo_n "(cached) " >&6
     2983 else
     2984   ac_check_lib_save_LIBS=$LIBS
     2985@@ -12176,12 +12216,12 @@ LIBS=$ac_check_lib_save_LIBS
     2986 fi
     2987 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
     2988 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
     2989-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
     2990+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
     2991   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
     2992 else
     2993   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
     2994 $as_echo_n "checking for dld_link in -ldld... " >&6; }
     2995-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
     2996+if ${ac_cv_lib_dld_dld_link+:} false; then :
     2997   $as_echo_n "(cached) " >&6
     2998 else
     2999   ac_check_lib_save_LIBS=$LIBS
     3000@@ -12215,7 +12255,7 @@ LIBS=$ac_check_lib_save_LIBS
     3001 fi
     3002 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
     3003 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
     3004-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
     3005+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
     3006   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
     3007 fi
     3008 
     3009@@ -12256,7 +12296,7 @@ fi
     3010 
     3011     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
     3012 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
     3013-if test "${lt_cv_dlopen_self+set}" = set; then :
     3014+if ${lt_cv_dlopen_self+:} false; then :
     3015   $as_echo_n "(cached) " >&6
     3016 else
     3017          if test "$cross_compiling" = yes; then :
     3018@@ -12265,7 +12305,7 @@ else
     3019   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
     3020   lt_status=$lt_dlunknown
     3021   cat > conftest.$ac_ext <<_LT_EOF
     3022-#line 12268 "configure"
     3023+#line 12308 "configure"
     3024 #include "confdefs.h"
     3025 
     3026 #if HAVE_DLFCN_H
     3027@@ -12362,7 +12402,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
     3028       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
     3029       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
     3030 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
     3031-if test "${lt_cv_dlopen_self_static+set}" = set; then :
     3032+if ${lt_cv_dlopen_self_static+:} false; then :
     3033   $as_echo_n "(cached) " >&6
     3034 else
     3035          if test "$cross_compiling" = yes; then :
     3036@@ -12371,7 +12411,7 @@ else
     3037   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
     3038   lt_status=$lt_dlunknown
     3039   cat > conftest.$ac_ext <<_LT_EOF
     3040-#line 12374 "configure"
     3041+#line 12414 "configure"
     3042 #include "confdefs.h"
     3043 
     3044 #if HAVE_DLFCN_H
     3045@@ -12644,7 +12684,7 @@ if test "${enable_sim_bswap+set}" = set; then :
     3046   enableval=$enable_sim_bswap; case "${enableval}" in
     3047   yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
     3048   no)  sim_bswap="-DWITH_BSWAP=0";;
     3049-  *)   as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
     3050+  *)   as_fn_error $? "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
     3051 esac
     3052 if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
     3053   echo "Setting bswap flags = $sim_bswap" 6>&1
     3054@@ -12659,7 +12699,7 @@ fi
     3055 if test "${enable_sim_cflags+set}" = set; then :
     3056   enableval=$enable_sim_cflags; case "${enableval}" in
     3057   yes)  sim_cflags="-O2 -fomit-frame-pointer";;
     3058-  trace) as_fn_error "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";;
     3059+  trace) as_fn_error $? "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";;
     3060   no)   sim_cflags="";;
     3061   *)    sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
     3062 esac
     3063@@ -12693,7 +12733,7 @@ if test "${enable_sim_stdio+set}" = set; then :
     3064   enableval=$enable_sim_stdio; case "${enableval}" in
     3065   yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
     3066   no)  sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
     3067-  *)   as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
     3068+  *)   as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
     3069 esac
     3070 if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
     3071   echo "Setting stdio flags = $sim_stdio" 6>&1
     3072@@ -12762,7 +12802,7 @@ fi
     3073 # Check whether --with-pkgversion was given.
     3074 if test "${with_pkgversion+set}" = set; then :
     3075   withval=$with_pkgversion; case "$withval" in
     3076-      yes) as_fn_error "package version not specified" "$LINENO" 5 ;;
     3077+      yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;;
     3078       no)  PKGVERSION= ;;
     3079       *)   PKGVERSION="($withval) " ;;
     3080      esac
     3081@@ -12778,7 +12818,7 @@ fi
     3082 # Check whether --with-bugurl was given.
     3083 if test "${with_bugurl+set}" = set; then :
     3084   withval=$with_bugurl; case "$withval" in
     3085-      yes) as_fn_error "bug URL not specified" "$LINENO" 5 ;;
     3086+      yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;;
     3087       no)  BUGURL=
     3088           ;;
     3089       *)   BUGURL="$withval"
     3090@@ -12815,7 +12855,7 @@ _ACEOF
     3091 
     3092 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
     3093 $as_echo_n "checking return type of signal handlers... " >&6; }
     3094-if test "${ac_cv_type_signal+set}" = set; then :
     3095+if ${ac_cv_type_signal+:} false; then :
     3096   $as_echo_n "(cached) " >&6
     3097 else
     3098   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3099@@ -12872,7 +12912,7 @@ sim_link_links="${sim_link_links} targ-vals.def"
     3100 for ac_header in stdlib.h
     3101 do :
     3102   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
     3103-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
     3104+if test "x$ac_cv_header_stdlib_h" = xyes; then :
     3105   cat >>confdefs.h <<_ACEOF
     3106 #define HAVE_STDLIB_H 1
     3107 _ACEOF
     3108@@ -12885,7 +12925,7 @@ done
     3109 # In the Cygwin environment, we need some additional flags.
     3110 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
     3111 $as_echo_n "checking for cygwin... " >&6; }
     3112-if test "${sim_cv_os_cygwin+set}" = set; then :
     3113+if ${sim_cv_os_cygwin+:} false; then :
     3114   $as_echo_n "(cached) " >&6
     3115 else
     3116   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3117@@ -12913,7 +12953,7 @@ else
     3118   # Keep in sync with gdb's configure.ac list.
     3119   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
     3120 $as_echo_n "checking for library containing tgetent... " >&6; }
     3121-if test "${ac_cv_search_tgetent+set}" = set; then :
     3122+if ${ac_cv_search_tgetent+:} false; then :
     3123   $as_echo_n "(cached) " >&6
     3124 else
     3125   ac_func_search_save_LIBS=$LIBS
     3126@@ -12947,11 +12987,11 @@ for ac_lib in '' termcap tinfo curses ncurses; do
     3127 fi
     3128 rm -f core conftest.err conftest.$ac_objext \
     3129     conftest$ac_exeext
     3130-  if test "${ac_cv_search_tgetent+set}" = set; then :
     3131+  if ${ac_cv_search_tgetent+:} false; then :
     3132   break
     3133 fi
     3134 done
     3135-if test "${ac_cv_search_tgetent+set}" = set; then :
     3136+if ${ac_cv_search_tgetent+:} false; then :
     3137 
     3138 else
     3139   ac_cv_search_tgetent=no
     3140@@ -12979,7 +13019,7 @@ if test -r ../../readline/Makefile; then
     3141 else
     3142   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
     3143 $as_echo_n "checking for readline in -lreadline... " >&6; }
     3144-if test "${ac_cv_lib_readline_readline+set}" = set; then :
     3145+if ${ac_cv_lib_readline_readline+:} false; then :
     3146   $as_echo_n "(cached) " >&6
     3147 else
     3148   ac_check_lib_save_LIBS=$LIBS
     3149@@ -13013,14 +13053,238 @@ LIBS=$ac_check_lib_save_LIBS
     3150 fi
     3151 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
     3152 $as_echo "$ac_cv_lib_readline_readline" >&6; }
     3153-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
     3154+if test "x$ac_cv_lib_readline_readline" = xyes; then :
     3155   READLINE=-lreadline
     3156 else
     3157-  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
     3158+  as_fn_error $? "the required \"readline\" library is missing" "$LINENO" 5
     3159 fi
     3160 
     3161 fi
     3162 
     3163+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
     3164+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
     3165+if ${ac_cv_c_bigendian+:} false; then :
     3166+  $as_echo_n "(cached) " >&6
     3167+else
     3168+  ac_cv_c_bigendian=unknown
     3169+    # See if we're dealing with a universal compiler.
     3170+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3171+/* end confdefs.h.  */
     3172+#ifndef __APPLE_CC__
     3173+              not a universal capable compiler
     3174+            #endif
     3175+            typedef int dummy;
     3176+
     3177+_ACEOF
     3178+if ac_fn_c_try_compile "$LINENO"; then :
     3179+
     3180+       # Check for potential -arch flags.  It is not universal unless
     3181+       # there are at least two -arch flags with different values.
     3182+       ac_arch=
     3183+       ac_prev=
     3184+       for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
     3185+        if test -n "$ac_prev"; then
     3186+          case $ac_word in
     3187+            i?86 | x86_64 | ppc | ppc64)
     3188+              if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
     3189+                ac_arch=$ac_word
     3190+              else
     3191+                ac_cv_c_bigendian=universal
     3192+                break
     3193+              fi
     3194+              ;;
     3195+          esac
     3196+          ac_prev=
     3197+        elif test "x$ac_word" = "x-arch"; then
     3198+          ac_prev=arch
     3199+        fi
     3200+       done
     3201+fi
     3202+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3203+    if test $ac_cv_c_bigendian = unknown; then
     3204+      # See if sys/param.h defines the BYTE_ORDER macro.
     3205+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3206+/* end confdefs.h.  */
     3207+#include <sys/types.h>
     3208+            #include <sys/param.h>
     3209+
     3210+int
     3211+main ()
     3212+{
     3213+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
     3214+                    && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
     3215+                    && LITTLE_ENDIAN)
     3216+             bogus endian macros
     3217+            #endif
     3218+
     3219+  ;
     3220+  return 0;
     3221+}
     3222+_ACEOF
     3223+if ac_fn_c_try_compile "$LINENO"; then :
     3224+  # It does; now see whether it defined to BIG_ENDIAN or not.
     3225+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3226+/* end confdefs.h.  */
     3227+#include <sys/types.h>
     3228+               #include <sys/param.h>
     3229+
     3230+int
     3231+main ()
     3232+{
     3233+#if BYTE_ORDER != BIG_ENDIAN
     3234+                not big endian
     3235+               #endif
     3236+
     3237+  ;
     3238+  return 0;
     3239+}
     3240+_ACEOF
     3241+if ac_fn_c_try_compile "$LINENO"; then :
     3242+  ac_cv_c_bigendian=yes
     3243+else
     3244+  ac_cv_c_bigendian=no
     3245+fi
     3246+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3247+fi
     3248+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3249+    fi
     3250+    if test $ac_cv_c_bigendian = unknown; then
     3251+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
     3252+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3253+/* end confdefs.h.  */
     3254+#include <limits.h>
     3255+
     3256+int
     3257+main ()
     3258+{
     3259+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
     3260+             bogus endian macros
     3261+            #endif
     3262+
     3263+  ;
     3264+  return 0;
     3265+}
     3266+_ACEOF
     3267+if ac_fn_c_try_compile "$LINENO"; then :
     3268+  # It does; now see whether it defined to _BIG_ENDIAN or not.
     3269+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3270+/* end confdefs.h.  */
     3271+#include <limits.h>
     3272+
     3273+int
     3274+main ()
     3275+{
     3276+#ifndef _BIG_ENDIAN
     3277+                not big endian
     3278+               #endif
     3279+
     3280+  ;
     3281+  return 0;
     3282+}
     3283+_ACEOF
     3284+if ac_fn_c_try_compile "$LINENO"; then :
     3285+  ac_cv_c_bigendian=yes
     3286+else
     3287+  ac_cv_c_bigendian=no
     3288+fi
     3289+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3290+fi
     3291+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3292+    fi
     3293+    if test $ac_cv_c_bigendian = unknown; then
     3294+      # Compile a test program.
     3295+      if test "$cross_compiling" = yes; then :
     3296+  # Try to guess by grepping values from an object file.
     3297+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3298+/* end confdefs.h.  */
     3299+short int ascii_mm[] =
     3300+                 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
     3301+               short int ascii_ii[] =
     3302+                 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
     3303+               int use_ascii (int i) {
     3304+                 return ascii_mm[i] + ascii_ii[i];
     3305+               }
     3306+               short int ebcdic_ii[] =
     3307+                 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
     3308+               short int ebcdic_mm[] =
     3309+                 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
     3310+               int use_ebcdic (int i) {
     3311+                 return ebcdic_mm[i] + ebcdic_ii[i];
     3312+               }
     3313+               extern int foo;
     3314+
     3315+int
     3316+main ()
     3317+{
     3318+return use_ascii (foo) == use_ebcdic (foo);
     3319+  ;
     3320+  return 0;
     3321+}
     3322+_ACEOF
     3323+if ac_fn_c_try_compile "$LINENO"; then :
     3324+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
     3325+             ac_cv_c_bigendian=yes
     3326+           fi
     3327+           if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
     3328+             if test "$ac_cv_c_bigendian" = unknown; then
     3329+               ac_cv_c_bigendian=no
     3330+             else
     3331+               # finding both strings is unlikely to happen, but who knows?
     3332+               ac_cv_c_bigendian=unknown
     3333+             fi
     3334+           fi
     3335+fi
     3336+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     3337+else
     3338+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     3339+/* end confdefs.h.  */
     3340+$ac_includes_default
     3341+int
     3342+main ()
     3343+{
     3344+
     3345+            /* Are we little or big endian?  From Harbison&Steele.  */
     3346+            union
     3347+            {
     3348+              long int l;
     3349+              char c[sizeof (long int)];
     3350+            } u;
     3351+            u.l = 1;
     3352+            return u.c[sizeof (long int) - 1] == 1;
     3353+
     3354+  ;
     3355+  return 0;
     3356+}
     3357+_ACEOF
     3358+if ac_fn_c_try_run "$LINENO"; then :
     3359+  ac_cv_c_bigendian=no
     3360+else
     3361+  ac_cv_c_bigendian=yes
     3362+fi
     3363+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
     3364+  conftest.$ac_objext conftest.beam conftest.$ac_ext
     3365+fi
     3366+
     3367+    fi
     3368+fi
     3369+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
     3370+$as_echo "$ac_cv_c_bigendian" >&6; }
     3371+ case $ac_cv_c_bigendian in #(
     3372+   yes)
     3373+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
     3374+;; #(
     3375+   no)
     3376+      ;; #(
     3377+   universal)
     3378+
     3379+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
     3380+
     3381+     ;; #(
     3382+   *)
     3383+     as_fn_error $? "unknown endianness
     3384+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
    12103385+ esac
    1211 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    1212 + $as_echo_n "checking for $2... " >&6; }
    1213 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    1214 ++if eval \${$3+:} false; then :
    1215 +   $as_echo_n "(cached) " >&6
    1216 + else
    1217 +   eval "$3=\$ac_header_compiler"
    1218 +@@ -1662,7 +1692,7 @@ eval ac_res=\$$3
    1219 +              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    1220 + $as_echo "$ac_res" >&6; }
    1221 + fi
    1222 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1223 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1224 +
    1225 + } # ac_fn_c_check_header_mongrel
    1226 +
    1227 +@@ -1703,8 +1733,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
    1228 +        ac_retval=$ac_status
    1229 + fi
    1230 +   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    1231 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1232 +-  return $ac_retval
    1233 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1234 ++  as_fn_set_status $ac_retval
    1235 +
    1236 + } # ac_fn_c_try_run
    1237 +
    1238 +@@ -1717,7 +1747,7 @@ ac_fn_c_check_header_compile ()
    1239 +   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1240 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    1241 + $as_echo_n "checking for $2... " >&6; }
    1242 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    1243 ++if eval \${$3+:} false; then :
    1244 +   $as_echo_n "(cached) " >&6
    1245 + else
    1246 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1247 +@@ -1735,7 +1765,7 @@ fi
    1248 + eval ac_res=\$$3
    1249 +              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    1250 + $as_echo "$ac_res" >&6; }
    1251 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1252 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1253 +
    1254 + } # ac_fn_c_check_header_compile
    1255 +
    1256 +@@ -1766,7 +1796,7 @@ $as_echo "$ac_try_echo"; } >&5
    1257 +        test ! -s conftest.err
    1258 +        } && test -s conftest$ac_exeext && {
    1259 +        test "$cross_compiling" = yes ||
    1260 +-       $as_test_x conftest$ac_exeext
    1261 ++       test -x conftest$ac_exeext
    1262 +        }; then :
    1263 +   ac_retval=0
    1264 + else
    1265 +@@ -1780,8 +1810,8 @@ fi
    1266 +   # interfere with the next link command; also delete a directory that is
    1267 +   # left behind by Apple's compiler.  We do this before executing the actions.
    1268 +   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
    1269 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1270 +-  return $ac_retval
    1271 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1272 ++  as_fn_set_status $ac_retval
    1273 +
    1274 + } # ac_fn_c_try_link
    1275 +
    1276 +@@ -1793,7 +1823,7 @@ ac_fn_c_check_func ()
    1277 +   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1278 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    1279 + $as_echo_n "checking for $2... " >&6; }
    1280 +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    1281 ++if eval \${$3+:} false; then :
    1282 +   $as_echo_n "(cached) " >&6
    1283 + else
    1284 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1285 +@@ -1848,7 +1878,7 @@ fi
    1286 + eval ac_res=\$$3
    1287 +              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    1288 + $as_echo "$ac_res" >&6; }
    1289 +-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1290 ++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1291 +
    1292 + } # ac_fn_c_check_func
    1293 + cat >config.log <<_ACEOF
    1294 +@@ -1856,7 +1886,7 @@ This file contains any messages produced by compilers while
    1295 + running configure, to aid debugging if configure makes a mistake.
    1296 +
    1297 + It was created by $as_me, which was
    1298 +-generated by GNU Autoconf 2.64.  Invocation command line was
    1299 ++generated by GNU Autoconf 2.69.  Invocation command line was
    1300 +
    1301 +   $ $0 $@
    1302 +
    1303 +@@ -1966,11 +1996,9 @@ trap 'exit_status=$?
    1304 +   {
    1305 +     echo
    1306 +
    1307 +-    cat <<\_ASBOX
    1308 +-## ---------------- ##
    1309 ++    $as_echo "## ---------------- ##
    1310 + ## Cache variables. ##
    1311 +-## ---------------- ##
    1312 +-_ASBOX
    1313 ++## ---------------- ##"
    1314 +     echo
    1315 +     # The following way of writing the cache mishandles newlines in values,
    1316 + (
    1317 +@@ -2004,11 +2032,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
    1318 + )
    1319 +     echo
    1320 +
    1321 +-    cat <<\_ASBOX
    1322 +-## ----------------- ##
    1323 ++    $as_echo "## ----------------- ##
    1324 + ## Output variables. ##
    1325 +-## ----------------- ##
    1326 +-_ASBOX
    1327 ++## ----------------- ##"
    1328 +     echo
    1329 +     for ac_var in $ac_subst_vars
    1330 +     do
    1331 +@@ -2021,11 +2047,9 @@ _ASBOX
    1332 +     echo
    1333 +
    1334 +     if test -n "$ac_subst_files"; then
    1335 +-      cat <<\_ASBOX
    1336 +-## ------------------- ##
    1337 ++      $as_echo "## ------------------- ##
    1338 + ## File substitutions. ##
    1339 +-## ------------------- ##
    1340 +-_ASBOX
    1341 ++## ------------------- ##"
    1342 +       echo
    1343 +       for ac_var in $ac_subst_files
    1344 +       do
    1345 +@@ -2039,11 +2063,9 @@ _ASBOX
    1346 +     fi
    1347 +
    1348 +     if test -s confdefs.h; then
    1349 +-      cat <<\_ASBOX
    1350 +-## ----------- ##
    1351 ++      $as_echo "## ----------- ##
    1352 + ## confdefs.h. ##
    1353 +-## ----------- ##
    1354 +-_ASBOX
    1355 ++## ----------- ##"
    1356 +       echo
    1357 +       cat confdefs.h
    1358 +       echo
    1359 +@@ -2098,7 +2120,12 @@ _ACEOF
    1360 + ac_site_file1=NONE
    1361 + ac_site_file2=NONE
    1362 + if test -n "$CONFIG_SITE"; then
    1363 +-  ac_site_file1=$CONFIG_SITE
    1364 ++  # We do not want a PATH search for config.site.
    1365 ++  case $CONFIG_SITE in #((
    1366 ++    -*)  ac_site_file1=./$CONFIG_SITE;;
    1367 ++    */*) ac_site_file1=$CONFIG_SITE;;
    1368 ++    *)   ac_site_file1=./$CONFIG_SITE;;
    1369 ++  esac
    1370 + elif test "x$prefix" != xNONE; then
    1371 +   ac_site_file1=$prefix/share/config.site
    1372 +   ac_site_file2=$prefix/etc/config.site
    1373 +@@ -2109,18 +2136,22 @@ fi
    1374 + for ac_site_file in "$ac_site_file1" "$ac_site_file2"
    1375 + do
    1376 +   test "x$ac_site_file" = xNONE && continue
    1377 +-  if test -r "$ac_site_file"; then
    1378 ++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
    1379 +     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
    1380 + $as_echo "$as_me: loading site script $ac_site_file" >&6;}
    1381 +     sed 's/^/| /' "$ac_site_file" >&5
    1382 +-    . "$ac_site_file"
    1383 ++    . "$ac_site_file" \
    1384 ++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1385 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1386 ++as_fn_error $? "failed to load site script $ac_site_file
    1387 ++See \`config.log' for more details" "$LINENO" 5; }
    1388 +   fi
    1389 + done
    1390 +
    1391 + if test -r "$cache_file"; then
    1392 +-  # Some versions of bash will fail to source /dev/null (special
    1393 +-  # files actually), so we avoid doing that.
    1394 +-  if test -f "$cache_file"; then
    1395 ++  # Some versions of bash will fail to source /dev/null (special files
    1396 ++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
    1397 ++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
    1398 +     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
    1399 + $as_echo "$as_me: loading cache $cache_file" >&6;}
    1400 +     case $cache_file in
    1401 +@@ -2189,7 +2220,7 @@ if $ac_cache_corrupted; then
    1402 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1403 +   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    1404 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    1405 +-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    1406 ++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    1407 + fi
    1408 + ## -------------------- ##
    1409 + ## Main body of script. ##
    1410 +@@ -2249,21 +2280,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    1411 +
    1412 +
    1413 +
    1414 +-# _AC_CHECK_DECL_BODY
    1415 +-# -------------------
    1416 +-# Shell function body for AC_CHECK_DECL.
    1417 +-# _AC_CHECK_DECL_BODY
    1418 +-
    1419 +-# _AC_CHECK_DECLS(SYMBOL, ACTION-IF_FOUND, ACTION-IF-NOT-FOUND,
    1420 +-#                 INCLUDES)
    1421 +-# -------------------------------------------------------------
    1422 +-# Helper to AC_CHECK_DECLS, which generates the check for a single
    1423 +-# SYMBOL with INCLUDES, performs the AC_DEFINE, then expands
    1424 +-# ACTION-IF-FOUND or ACTION-IF-NOT-FOUND.
    1425 +-
    1426 +-
    1427 +-
    1428 +-
    1429 +
    1430 +
    1431 +
    1432 +@@ -4057,7 +4073,7 @@ if test -n "$ac_tool_prefix"; then
    1433 + set dummy ${ac_tool_prefix}gcc; ac_word=$2
    1434 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1435 + $as_echo_n "checking for $ac_word... " >&6; }
    1436 +-if test "${ac_cv_prog_CC+set}" = set; then :
    1437 ++if ${ac_cv_prog_CC+:} false; then :
    1438 +   $as_echo_n "(cached) " >&6
    1439 + else
    1440 +   if test -n "$CC"; then
    1441 +@@ -4069,7 +4085,7 @@ do
    1442 +   IFS=$as_save_IFS
    1443 +   test -z "$as_dir" && as_dir=.
    1444 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1445 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1446 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1447 +     ac_cv_prog_CC="${ac_tool_prefix}gcc"
    1448 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1449 +     break 2
    1450 +@@ -4097,7 +4113,7 @@ if test -z "$ac_cv_prog_CC"; then
    1451 + set dummy gcc; ac_word=$2
    1452 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1453 + $as_echo_n "checking for $ac_word... " >&6; }
    1454 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
    1455 ++if ${ac_cv_prog_ac_ct_CC+:} false; then :
    1456 +   $as_echo_n "(cached) " >&6
    1457 + else
    1458 +   if test -n "$ac_ct_CC"; then
    1459 +@@ -4109,7 +4125,7 @@ do
    1460 +   IFS=$as_save_IFS
    1461 +   test -z "$as_dir" && as_dir=.
    1462 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1463 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1464 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1465 +     ac_cv_prog_ac_ct_CC="gcc"
    1466 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1467 +     break 2
    1468 +@@ -4150,7 +4166,7 @@ if test -z "$CC"; then
    1469 + set dummy ${ac_tool_prefix}cc; ac_word=$2
    1470 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1471 + $as_echo_n "checking for $ac_word... " >&6; }
    1472 +-if test "${ac_cv_prog_CC+set}" = set; then :
    1473 ++if ${ac_cv_prog_CC+:} false; then :
    1474 +   $as_echo_n "(cached) " >&6
    1475 + else
    1476 +   if test -n "$CC"; then
    1477 +@@ -4162,7 +4178,7 @@ do
    1478 +   IFS=$as_save_IFS
    1479 +   test -z "$as_dir" && as_dir=.
    1480 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1481 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1482 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1483 +     ac_cv_prog_CC="${ac_tool_prefix}cc"
    1484 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1485 +     break 2
    1486 +@@ -4190,7 +4206,7 @@ if test -z "$CC"; then
    1487 + set dummy cc; ac_word=$2
    1488 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1489 + $as_echo_n "checking for $ac_word... " >&6; }
    1490 +-if test "${ac_cv_prog_CC+set}" = set; then :
    1491 ++if ${ac_cv_prog_CC+:} false; then :
    1492 +   $as_echo_n "(cached) " >&6
    1493 + else
    1494 +   if test -n "$CC"; then
    1495 +@@ -4203,7 +4219,7 @@ do
    1496 +   IFS=$as_save_IFS
    1497 +   test -z "$as_dir" && as_dir=.
    1498 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1499 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1500 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1501 +     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
    1502 +        ac_prog_rejected=yes
    1503 +        continue
    1504 +@@ -4249,7 +4265,7 @@ if test -z "$CC"; then
    1505 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    1506 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1507 + $as_echo_n "checking for $ac_word... " >&6; }
    1508 +-if test "${ac_cv_prog_CC+set}" = set; then :
    1509 ++if ${ac_cv_prog_CC+:} false; then :
    1510 +   $as_echo_n "(cached) " >&6
    1511 + else
    1512 +   if test -n "$CC"; then
    1513 +@@ -4261,7 +4277,7 @@ do
    1514 +   IFS=$as_save_IFS
    1515 +   test -z "$as_dir" && as_dir=.
    1516 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1517 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1518 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1519 +     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    1520 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1521 +     break 2
    1522 +@@ -4293,7 +4309,7 @@ do
    1523 + set dummy $ac_prog; ac_word=$2
    1524 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1525 + $as_echo_n "checking for $ac_word... " >&6; }
    1526 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
    1527 ++if ${ac_cv_prog_ac_ct_CC+:} false; then :
    1528 +   $as_echo_n "(cached) " >&6
    1529 + else
    1530 +   if test -n "$ac_ct_CC"; then
    1531 +@@ -4305,7 +4321,7 @@ do
    1532 +   IFS=$as_save_IFS
    1533 +   test -z "$as_dir" && as_dir=.
    1534 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1535 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1536 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1537 +     ac_cv_prog_ac_ct_CC="$ac_prog"
    1538 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1539 +     break 2
    1540 +@@ -4347,8 +4363,8 @@ fi
    1541 +
    1542 + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1543 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1544 +-as_fn_error "no acceptable C compiler found in \$PATH
    1545 +-See \`config.log' for more details." "$LINENO" 5; }
    1546 ++as_fn_error $? "no acceptable C compiler found in \$PATH
    1547 ++See \`config.log' for more details" "$LINENO" 5; }
    1548 +
    1549 + # Provide some information about the compiler.
    1550 + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
    1551 +@@ -4369,8 +4385,8 @@ $as_echo "$ac_try_echo"; } >&5
    1552 + ... rest of stderr output deleted ...
    1553 +          10q' conftest.err >conftest.er1
    1554 +     cat conftest.er1 >&5
    1555 +-    rm -f conftest.er1 conftest.err
    1556 +   fi
    1557 ++  rm -f conftest.er1 conftest.err
    1558 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1559 +   test $ac_status = 0; }
    1560 + done
    1561 +@@ -4387,12 +4403,12 @@ main ()
    1562 + }
    1563 + _ACEOF
    1564 + ac_clean_files_save=$ac_clean_files
    1565 +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
    1566 ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
    1567 + # Try to create an executable without -o first, disregard a.out.
    1568 + # It will help us diagnose broken compilers, and finding out an intuition
    1569 + # of exeext.
    1570 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
    1571 +-$as_echo_n "checking for C compiler default output file name... " >&6; }
    1572 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
    1573 ++$as_echo_n "checking whether the C compiler works... " >&6; }
    1574 + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    1575 +
    1576 + # The possible output files:
    1577 +@@ -4454,62 +4470,28 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
    1578 + else
    1579 +   ac_file=''
    1580 + fi
    1581 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
    1582 +-$as_echo "$ac_file" >&6; }
    1583 + if test -z "$ac_file"; then :
    1584 +-  $as_echo "$as_me: failed program was:" >&5
    1585 ++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1586 ++$as_echo "no" >&6; }
    1587 ++$as_echo "$as_me: failed program was:" >&5
    1588 + sed 's/^/| /' conftest.$ac_ext >&5
    1589 +
    1590 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1591 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1592 +-{ as_fn_set_status 77
    1593 +-as_fn_error "C compiler cannot create executables
    1594 +-See \`config.log' for more details." "$LINENO" 5; }; }
    1595 ++as_fn_error 77 "C compiler cannot create executables
    1596 ++See \`config.log' for more details" "$LINENO" 5; }
    1597 ++else
    1598 ++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    1599 ++$as_echo "yes" >&6; }
    1600 + fi
    1601 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
    1602 ++$as_echo_n "checking for C compiler default output file name... " >&6; }
    1603 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
    1604 ++$as_echo "$ac_file" >&6; }
    1605 + ac_exeext=$ac_cv_exeext
    1606 +
    1607 +-# Check that the compiler produces executables we can run.  If not, either
    1608 +-# the compiler is broken, or we cross compile.
    1609 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
    1610 +-$as_echo_n "checking whether the C compiler works... " >&6; }
    1611 +-# If not cross compiling, check that we can run a simple program.
    1612 +-if test "$cross_compiling" != yes; then
    1613 +-  if { ac_try='./$ac_file'
    1614 +-  { { case "(($ac_try" in
    1615 +-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    1616 +-  *) ac_try_echo=$ac_try;;
    1617 +-esac
    1618 +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
    1619 +-$as_echo "$ac_try_echo"; } >&5
    1620 +-  (eval "$ac_try") 2>&5
    1621 +-  ac_status=$?
    1622 +-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1623 +-  test $ac_status = 0; }; }; then
    1624 +-    cross_compiling=no
    1625 +-  else
    1626 +-    if test "$cross_compiling" = maybe; then
    1627 +-      cross_compiling=yes
    1628 +-    else
    1629 +-      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1630 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1631 +-as_fn_error "cannot run C compiled programs.
    1632 +-If you meant to cross compile, use \`--host'.
    1633 +-See \`config.log' for more details." "$LINENO" 5; }
    1634 +-    fi
    1635 +-  fi
    1636 +-fi
    1637 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    1638 +-$as_echo "yes" >&6; }
    1639 +-
    1640 +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
    1641 ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
    1642 + ac_clean_files=$ac_clean_files_save
    1643 +-# Check that the compiler produces executables we can run.  If not, either
    1644 +-# the compiler is broken, or we cross compile.
    1645 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
    1646 +-$as_echo_n "checking whether we are cross compiling... " >&6; }
    1647 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
    1648 +-$as_echo "$cross_compiling" >&6; }
    1649 +-
    1650 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
    1651 + $as_echo_n "checking for suffix of executables... " >&6; }
    1652 + if { { ac_try="$ac_link"
    1653 +@@ -4539,19 +4521,78 @@ done
    1654 + else
    1655 +   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1656 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1657 +-as_fn_error "cannot compute suffix of executables: cannot compile and link
    1658 +-See \`config.log' for more details." "$LINENO" 5; }
    1659 ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    1660 ++See \`config.log' for more details" "$LINENO" 5; }
    1661 + fi
    1662 +-rm -f conftest$ac_cv_exeext
    1663 ++rm -f conftest conftest$ac_cv_exeext
    1664 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
    1665 + $as_echo "$ac_cv_exeext" >&6; }
    1666 +
    1667 + rm -f conftest.$ac_ext
    1668 + EXEEXT=$ac_cv_exeext
    1669 + ac_exeext=$EXEEXT
    1670 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1671 ++/* end confdefs.h.  */
    1672 ++#include <stdio.h>
    1673 ++int
    1674 ++main ()
    1675 ++{
    1676 ++FILE *f = fopen ("conftest.out", "w");
    1677 ++ return ferror (f) || fclose (f) != 0;
    1678 ++
    1679 ++  ;
    1680 ++  return 0;
    1681 ++}
    1682 ++_ACEOF
    1683 ++ac_clean_files="$ac_clean_files conftest.out"
    1684 ++# Check that the compiler produces executables we can run.  If not, either
    1685 ++# the compiler is broken, or we cross compile.
    1686 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
    1687 ++$as_echo_n "checking whether we are cross compiling... " >&6; }
    1688 ++if test "$cross_compiling" != yes; then
    1689 ++  { { ac_try="$ac_link"
    1690 ++case "(($ac_try" in
    1691 ++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    1692 ++  *) ac_try_echo=$ac_try;;
    1693 ++esac
    1694 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
    1695 ++$as_echo "$ac_try_echo"; } >&5
    1696 ++  (eval "$ac_link") 2>&5
    1697 ++  ac_status=$?
    1698 ++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1699 ++  test $ac_status = 0; }
    1700 ++  if { ac_try='./conftest$ac_cv_exeext'
    1701 ++  { { case "(($ac_try" in
    1702 ++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    1703 ++  *) ac_try_echo=$ac_try;;
    1704 ++esac
    1705 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
    1706 ++$as_echo "$ac_try_echo"; } >&5
    1707 ++  (eval "$ac_try") 2>&5
    1708 ++  ac_status=$?
    1709 ++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1710 ++  test $ac_status = 0; }; }; then
    1711 ++    cross_compiling=no
    1712 ++  else
    1713 ++    if test "$cross_compiling" = maybe; then
    1714 ++      cross_compiling=yes
    1715 ++    else
    1716 ++      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1717 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1718 ++as_fn_error $? "cannot run C compiled programs.
    1719 ++If you meant to cross compile, use \`--host'.
    1720 ++See \`config.log' for more details" "$LINENO" 5; }
    1721 ++    fi
    1722 ++  fi
    1723 ++fi
    1724 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
    1725 ++$as_echo "$cross_compiling" >&6; }
    1726 ++
    1727 ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
    1728 ++ac_clean_files=$ac_clean_files_save
    1729 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
    1730 + $as_echo_n "checking for suffix of object files... " >&6; }
    1731 +-if test "${ac_cv_objext+set}" = set; then :
    1732 ++if ${ac_cv_objext+:} false; then :
    1733 +   $as_echo_n "(cached) " >&6
    1734 + else
    1735 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1736 +@@ -4591,8 +4632,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
    1737 +
    1738 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1739 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1740 +-as_fn_error "cannot compute suffix of object files: cannot compile
    1741 +-See \`config.log' for more details." "$LINENO" 5; }
    1742 ++as_fn_error $? "cannot compute suffix of object files: cannot compile
    1743 ++See \`config.log' for more details" "$LINENO" 5; }
    1744 + fi
    1745 + rm -f conftest.$ac_cv_objext conftest.$ac_ext
    1746 + fi
    1747 +@@ -4602,7 +4643,7 @@ OBJEXT=$ac_cv_objext
    1748 + ac_objext=$OBJEXT
    1749 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
    1750 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
    1751 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
    1752 ++if ${ac_cv_c_compiler_gnu+:} false; then :
    1753 +   $as_echo_n "(cached) " >&6
    1754 + else
    1755 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1756 +@@ -4639,7 +4680,7 @@ ac_test_CFLAGS=${CFLAGS+set}
    1757 + ac_save_CFLAGS=$CFLAGS
    1758 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
    1759 + $as_echo_n "checking whether $CC accepts -g... " >&6; }
    1760 +-if test "${ac_cv_prog_cc_g+set}" = set; then :
    1761 ++if ${ac_cv_prog_cc_g+:} false; then :
    1762 +   $as_echo_n "(cached) " >&6
    1763 + else
    1764 +   ac_save_c_werror_flag=$ac_c_werror_flag
    1765 +@@ -4717,7 +4758,7 @@ else
    1766 + fi
    1767 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
    1768 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
    1769 +-if test "${ac_cv_prog_cc_c89+set}" = set; then :
    1770 ++if ${ac_cv_prog_cc_c89+:} false; then :
    1771 +   $as_echo_n "(cached) " >&6
    1772 + else
    1773 +   ac_cv_prog_cc_c89=no
    1774 +@@ -4726,8 +4767,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1775 + /* end confdefs.h.  */
    1776 + #include <stdarg.h>
    1777 + #include <stdio.h>
    1778 +-#include <sys/types.h>
    1779 +-#include <sys/stat.h>
    1780 ++struct stat;
    1781 + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
    1782 + struct buf { int x; };
    1783 + FILE * (*rcsopen) (struct buf *, struct stat *, int);
    1784 +@@ -4814,16 +4854,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    1785 +
    1786 + ac_aux_dir=
    1787 + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
    1788 +-  for ac_t in install-sh install.sh shtool; do
    1789 +-    if test -f "$ac_dir/$ac_t"; then
    1790 +-      ac_aux_dir=$ac_dir
    1791 +-      ac_install_sh="$ac_aux_dir/$ac_t -c"
    1792 +-      break 2
    1793 +-    fi
    1794 +-  done
    1795 ++  if test -f "$ac_dir/install-sh"; then
    1796 ++    ac_aux_dir=$ac_dir
    1797 ++    ac_install_sh="$ac_aux_dir/install-sh -c"
    1798 ++    break
    1799 ++  elif test -f "$ac_dir/install.sh"; then
    1800 ++    ac_aux_dir=$ac_dir
    1801 ++    ac_install_sh="$ac_aux_dir/install.sh -c"
    1802 ++    break
    1803 ++  elif test -f "$ac_dir/shtool"; then
    1804 ++    ac_aux_dir=$ac_dir
    1805 ++    ac_install_sh="$ac_aux_dir/shtool install -c"
    1806 ++    break
    1807 ++  fi
    1808 + done
    1809 + if test -z "$ac_aux_dir"; then
    1810 +-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    1811 ++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    1812 + fi
    1813 +
    1814 + # These three variables are undocumented and unsupported,
    1815 +@@ -4837,27 +4883,27 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
    1816 +
    1817 + # Make sure we can run config.sub.
    1818 + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    1819 +-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    1820 ++  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    1821 +
    1822 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    1823 + $as_echo_n "checking build system type... " >&6; }
    1824 +-if test "${ac_cv_build+set}" = set; then :
    1825 ++if ${ac_cv_build+:} false; then :
    1826 +   $as_echo_n "(cached) " >&6
    1827 + else
    1828 +   ac_build_alias=$build_alias
    1829 + test "x$ac_build_alias" = x &&
    1830 +   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    1831 + test "x$ac_build_alias" = x &&
    1832 +-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    1833 ++  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
    1834 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
    1835 +-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    1836 ++  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    1837 +
    1838 + fi
    1839 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
    1840 + $as_echo "$ac_cv_build" >&6; }
    1841 + case $ac_cv_build in
    1842 + *-*-*) ;;
    1843 +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    1844 ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
    1845 + esac
    1846 + build=$ac_cv_build
    1847 + ac_save_IFS=$IFS; IFS='-'
    1848 +@@ -4875,14 +4921,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
    1849 +
    1850 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
    1851 + $as_echo_n "checking host system type... " >&6; }
    1852 +-if test "${ac_cv_host+set}" = set; then :
    1853 ++if ${ac_cv_host+:} false; then :
    1854 +   $as_echo_n "(cached) " >&6
    1855 + else
    1856 +   if test "x$host_alias" = x; then
    1857 +   ac_cv_host=$ac_cv_build
    1858 + else
    1859 +   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
    1860 +-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    1861 ++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    1862 + fi
    1863 +
    1864 + fi
    1865 +@@ -4890,7 +4936,7 @@ fi
    1866 + $as_echo "$ac_cv_host" >&6; }
    1867 + case $ac_cv_host in
    1868 + *-*-*) ;;
    1869 +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    1870 ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
    1871 + esac
    1872 + host=$ac_cv_host
    1873 + ac_save_IFS=$IFS; IFS='-'
    1874 +@@ -4908,14 +4954,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
    1875 +
    1876 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
    1877 + $as_echo_n "checking target system type... " >&6; }
    1878 +-if test "${ac_cv_target+set}" = set; then :
    1879 ++if ${ac_cv_target+:} false; then :
    1880 +   $as_echo_n "(cached) " >&6
    1881 + else
    1882 +   if test "x$target_alias" = x; then
    1883 +   ac_cv_target=$ac_cv_host
    1884 + else
    1885 +   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
    1886 +-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    1887 ++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    1888 + fi
    1889 +
    1890 + fi
    1891 +@@ -4923,7 +4969,7 @@ fi
    1892 + $as_echo "$ac_cv_target" >&6; }
    1893 + case $ac_cv_target in
    1894 + *-*-*) ;;
    1895 +-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    1896 ++*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
    1897 + esac
    1898 + target=$ac_cv_target
    1899 + ac_save_IFS=$IFS; IFS='-'
    1900 +@@ -4958,7 +5004,7 @@ if test -n "$CPP" && test -d "$CPP"; then
    1901 +   CPP=
    1902 + fi
    1903 + if test -z "$CPP"; then
    1904 +-  if test "${ac_cv_prog_CPP+set}" = set; then :
    1905 ++  if ${ac_cv_prog_CPP+:} false; then :
    1906 +   $as_echo_n "(cached) " >&6
    1907 + else
    1908 +       # Double quotes because CPP needs to be expanded
    1909 +@@ -4988,7 +5034,7 @@ else
    1910 +   # Broken: fails on valid input.
    1911 + continue
    1912 + fi
    1913 +-rm -f conftest.err conftest.$ac_ext
    1914 ++rm -f conftest.err conftest.i conftest.$ac_ext
    1915 +
    1916 +   # OK, works on sane cases.  Now check whether nonexistent headers
    1917 +   # can be detected and how.
    1918 +@@ -5004,11 +5050,11 @@ else
    1919 + ac_preproc_ok=:
    1920 + break
    1921 + fi
    1922 +-rm -f conftest.err conftest.$ac_ext
    1923 ++rm -f conftest.err conftest.i conftest.$ac_ext
    1924 +
    1925 + done
    1926 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    1927 +-rm -f conftest.err conftest.$ac_ext
    1928 ++rm -f conftest.i conftest.err conftest.$ac_ext
    1929 + if $ac_preproc_ok; then :
    1930 +   break
    1931 + fi
    1932 +@@ -5047,7 +5093,7 @@ else
    1933 +   # Broken: fails on valid input.
    1934 + continue
    1935 + fi
    1936 +-rm -f conftest.err conftest.$ac_ext
    1937 ++rm -f conftest.err conftest.i conftest.$ac_ext
    1938 +
    1939 +   # OK, works on sane cases.  Now check whether nonexistent headers
    1940 +   # can be detected and how.
    1941 +@@ -5063,18 +5109,18 @@ else
    1942 + ac_preproc_ok=:
    1943 + break
    1944 + fi
    1945 +-rm -f conftest.err conftest.$ac_ext
    1946 ++rm -f conftest.err conftest.i conftest.$ac_ext
    1947 +
    1948 + done
    1949 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    1950 +-rm -f conftest.err conftest.$ac_ext
    1951 ++rm -f conftest.i conftest.err conftest.$ac_ext
    1952 + if $ac_preproc_ok; then :
    1953 +
    1954 + else
    1955 +   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    1956 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    1957 +-as_fn_error "C preprocessor \"$CPP\" fails sanity check
    1958 +-See \`config.log' for more details." "$LINENO" 5; }
    1959 ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    1960 ++See \`config.log' for more details" "$LINENO" 5; }
    1961 + fi
    1962 +
    1963 + ac_ext=c
    1964 +@@ -5086,7 +5132,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    1965 +
    1966 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
    1967 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
    1968 +-if test "${ac_cv_path_GREP+set}" = set; then :
    1969 ++if ${ac_cv_path_GREP+:} false; then :
    1970 +   $as_echo_n "(cached) " >&6
    1971 + else
    1972 +   if test -z "$GREP"; then
    1973 +@@ -5100,7 +5146,7 @@ do
    1974 +     for ac_prog in grep ggrep; do
    1975 +     for ac_exec_ext in '' $ac_executable_extensions; do
    1976 +       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
    1977 +-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
    1978 ++      as_fn_executable_p "$ac_path_GREP" || continue
    1979 + # Check for GNU ac_path_GREP and select it if it is found.
    1980 +   # Check for GNU $ac_path_GREP
    1981 + case `"$ac_path_GREP" --version 2>&1` in
    1982 +@@ -5135,7 +5181,7 @@ esac
    1983 +   done
    1984 + IFS=$as_save_IFS
    1985 +   if test -z "$ac_cv_path_GREP"; then
    1986 +-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    1987 ++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    1988 +   fi
    1989 + else
    1990 +   ac_cv_path_GREP=$GREP
    1991 +@@ -5149,7 +5195,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
    1992 +
    1993 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
    1994 + $as_echo_n "checking for egrep... " >&6; }
    1995 +-if test "${ac_cv_path_EGREP+set}" = set; then :
    1996 ++if ${ac_cv_path_EGREP+:} false; then :
    1997 +   $as_echo_n "(cached) " >&6
    1998 + else
    1999 +   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    2000 +@@ -5166,7 +5212,7 @@ do
    2001 +     for ac_prog in egrep; do
    2002 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2003 +       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
    2004 +-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
    2005 ++      as_fn_executable_p "$ac_path_EGREP" || continue
    2006 + # Check for GNU ac_path_EGREP and select it if it is found.
    2007 +   # Check for GNU $ac_path_EGREP
    2008 + case `"$ac_path_EGREP" --version 2>&1` in
    2009 +@@ -5201,7 +5247,7 @@ esac
    2010 +   done
    2011 + IFS=$as_save_IFS
    2012 +   if test -z "$ac_cv_path_EGREP"; then
    2013 +-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    2014 ++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    2015 +   fi
    2016 + else
    2017 +   ac_cv_path_EGREP=$EGREP
    2018 +@@ -5216,7 +5262,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
    2019 +
    2020 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
    2021 + $as_echo_n "checking for ANSI C header files... " >&6; }
    2022 +-if test "${ac_cv_header_stdc+set}" = set; then :
    2023 ++if ${ac_cv_header_stdc+:} false; then :
    2024 +   $as_echo_n "(cached) " >&6
    2025 + else
    2026 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    2027 +@@ -5333,8 +5379,7 @@ do :
    2028 +   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    2029 + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    2030 + "
    2031 +-eval as_val=\$$as_ac_Header
    2032 +-   if test "x$as_val" = x""yes; then :
    2033 ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    2034 +   cat >>confdefs.h <<_ACEOF
    2035 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    2036 + _ACEOF
    2037 +@@ -5346,7 +5391,7 @@ done
    2038 +
    2039 +
    2040 +   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
    2041 +-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
    2042 ++if test "x$ac_cv_header_minix_config_h" = xyes; then :
    2043 +   MINIX=yes
    2044 + else
    2045 +   MINIX=
    2046 +@@ -5368,14 +5413,14 @@ $as_echo "#define _MINIX 1" >>confdefs.h
    2047 +
    2048 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
    2049 + $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
    2050 +-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
    2051 ++if ${ac_cv_safe_to_define___extensions__+:} false; then :
    2052 +   $as_echo_n "(cached) " >&6
    2053 + else
    2054 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    2055 + /* end confdefs.h.  */
    2056 +
    2057 +-#       define __EXTENSIONS__ 1
    2058 +-        $ac_includes_default
    2059 ++#         define __EXTENSIONS__ 1
    2060 ++          $ac_includes_default
    2061 + int
    2062 + main ()
    2063 + {
    2064 +@@ -5432,7 +5477,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
    2065 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
    2066 + $as_echo_n "checking for a BSD-compatible install... " >&6; }
    2067 + if test -z "$INSTALL"; then
    2068 +-if test "${ac_cv_path_install+set}" = set; then :
    2069 ++if ${ac_cv_path_install+:} false; then :
    2070 +   $as_echo_n "(cached) " >&6
    2071 + else
    2072 +   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2073 +@@ -5452,7 +5497,7 @@ case $as_dir/ in #((
    2074 +     # by default.
    2075 +     for ac_prog in ginstall scoinst install; do
    2076 +       for ac_exec_ext in '' $ac_executable_extensions; do
    2077 +-      if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
    2078 ++      if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
    2079 +         if test $ac_prog = install &&
    2080 +           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
    2081 +           # AIX install.  It has an incompatible calling convention.
    2082 +@@ -5615,7 +5660,7 @@ esac
    2083 +
    2084 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
    2085 + $as_echo_n "checking for a sed that does not truncate output... " >&6; }
    2086 +-if test "${ac_cv_path_SED+set}" = set; then :
    2087 ++if ${ac_cv_path_SED+:} false; then :
    2088 +   $as_echo_n "(cached) " >&6
    2089 + else
    2090 +             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
    2091 +@@ -5635,7 +5680,7 @@ do
    2092 +     for ac_prog in sed gsed; do
    2093 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2094 +       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
    2095 +-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
    2096 ++      as_fn_executable_p "$ac_path_SED" || continue
    2097 + # Check for GNU ac_path_SED and select it if it is found.
    2098 +   # Check for GNU $ac_path_SED
    2099 + case `"$ac_path_SED" --version 2>&1` in
    2100 +@@ -5670,7 +5715,7 @@ esac
    2101 +   done
    2102 + IFS=$as_save_IFS
    2103 +   if test -z "$ac_cv_path_SED"; then
    2104 +-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
    2105 ++    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
    2106 +   fi
    2107 + else
    2108 +   ac_cv_path_SED=$SED
    2109 +@@ -5697,7 +5742,7 @@ Xsed="$SED -e 1s/^X//"
    2110 +
    2111 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
    2112 + $as_echo_n "checking for fgrep... " >&6; }
    2113 +-if test "${ac_cv_path_FGREP+set}" = set; then :
    2114 ++if ${ac_cv_path_FGREP+:} false; then :
    2115 +   $as_echo_n "(cached) " >&6
    2116 + else
    2117 +   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    2118 +@@ -5714,7 +5759,7 @@ do
    2119 +     for ac_prog in fgrep; do
    2120 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2121 +       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
    2122 +-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
    2123 ++      as_fn_executable_p "$ac_path_FGREP" || continue
    2124 + # Check for GNU ac_path_FGREP and select it if it is found.
    2125 +   # Check for GNU $ac_path_FGREP
    2126 + case `"$ac_path_FGREP" --version 2>&1` in
    2127 +@@ -5749,7 +5794,7 @@ esac
    2128 +   done
    2129 + IFS=$as_save_IFS
    2130 +   if test -z "$ac_cv_path_FGREP"; then
    2131 +-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    2132 ++    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    2133 +   fi
    2134 + else
    2135 +   ac_cv_path_FGREP=$FGREP
    2136 +@@ -5828,7 +5873,7 @@ else
    2137 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
    2138 + $as_echo_n "checking for non-GNU ld... " >&6; }
    2139 + fi
    2140 +-if test "${lt_cv_path_LD+set}" = set; then :
    2141 ++if ${lt_cv_path_LD+:} false; then :
    2142 +   $as_echo_n "(cached) " >&6
    2143 + else
    2144 +   if test -z "$LD"; then
    2145 +@@ -5865,10 +5910,10 @@ else
    2146 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2147 + $as_echo "no" >&6; }
    2148 + fi
    2149 +-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
    2150 ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
    2151 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
    2152 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
    2153 +-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
    2154 ++if ${lt_cv_prog_gnu_ld+:} false; then :
    2155 +   $as_echo_n "(cached) " >&6
    2156 + else
    2157 +   # I'd rather use --version here, but apparently some GNU lds only accept -v.
    2158 +@@ -5895,7 +5940,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
    2159 +
    2160 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
    2161 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
    2162 +-if test "${lt_cv_path_NM+set}" = set; then :
    2163 ++if ${lt_cv_path_NM+:} false; then :
    2164 +   $as_echo_n "(cached) " >&6
    2165 + else
    2166 +   if test -n "$NM"; then
    2167 +@@ -5958,7 +6003,7 @@ else
    2168 + set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    2169 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2170 + $as_echo_n "checking for $ac_word... " >&6; }
    2171 +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
    2172 ++if ${ac_cv_prog_DUMPBIN+:} false; then :
    2173 +   $as_echo_n "(cached) " >&6
    2174 + else
    2175 +   if test -n "$DUMPBIN"; then
    2176 +@@ -5970,7 +6015,7 @@ do
    2177 +   IFS=$as_save_IFS
    2178 +   test -z "$as_dir" && as_dir=.
    2179 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2180 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2181 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2182 +     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
    2183 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2184 +     break 2
    2185 +@@ -6002,7 +6047,7 @@ do
    2186 + set dummy $ac_prog; ac_word=$2
    2187 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2188 + $as_echo_n "checking for $ac_word... " >&6; }
    2189 +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
    2190 ++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
    2191 +   $as_echo_n "(cached) " >&6
    2192 + else
    2193 +   if test -n "$ac_ct_DUMPBIN"; then
    2194 +@@ -6014,7 +6059,7 @@ do
    2195 +   IFS=$as_save_IFS
    2196 +   test -z "$as_dir" && as_dir=.
    2197 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2198 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2199 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2200 +     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
    2201 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2202 +     break 2
    2203 +@@ -6074,7 +6119,7 @@ test -z "$NM" && NM=nm
    2204 +
    2205 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
    2206 + $as_echo_n "checking the name lister ($NM) interface... " >&6; }
    2207 +-if test "${lt_cv_nm_interface+set}" = set; then :
    2208 ++if ${lt_cv_nm_interface+:} false; then :
    2209 +   $as_echo_n "(cached) " >&6
    2210 + else
    2211 +   lt_cv_nm_interface="BSD nm"
    2212 +@@ -6109,7 +6154,7 @@ fi
    2213 + # find the maximum length of command line arguments
    2214 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
    2215 + $as_echo_n "checking the maximum length of command line arguments... " >&6; }
    2216 +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
    2217 ++if ${lt_cv_sys_max_cmd_len+:} false; then :
    2218 +   $as_echo_n "(cached) " >&6
    2219 + else
    2220 +     i=0
    2221 +@@ -6306,7 +6351,7 @@ esac
    2222 +
    2223 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
    2224 + $as_echo_n "checking for $LD option to reload object files... " >&6; }
    2225 +-if test "${lt_cv_ld_reload_flag+set}" = set; then :
    2226 ++if ${lt_cv_ld_reload_flag+:} false; then :
    2227 +   $as_echo_n "(cached) " >&6
    2228 + else
    2229 +   lt_cv_ld_reload_flag='-r'
    2230 +@@ -6342,7 +6387,7 @@ if test -n "$ac_tool_prefix"; then
    2231 + set dummy ${ac_tool_prefix}objdump; ac_word=$2
    2232 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2233 + $as_echo_n "checking for $ac_word... " >&6; }
    2234 +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
    2235 ++if ${ac_cv_prog_OBJDUMP+:} false; then :
    2236 +   $as_echo_n "(cached) " >&6
    2237 + else
    2238 +   if test -n "$OBJDUMP"; then
    2239 +@@ -6354,7 +6399,7 @@ do
    2240 +   IFS=$as_save_IFS
    2241 +   test -z "$as_dir" && as_dir=.
    2242 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2243 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2244 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2245 +     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
    2246 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2247 +     break 2
    2248 +@@ -6382,7 +6427,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
    2249 + set dummy objdump; ac_word=$2
    2250 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2251 + $as_echo_n "checking for $ac_word... " >&6; }
    2252 +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
    2253 ++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
    2254 +   $as_echo_n "(cached) " >&6
    2255 + else
    2256 +   if test -n "$ac_ct_OBJDUMP"; then
    2257 +@@ -6394,7 +6439,7 @@ do
    2258 +   IFS=$as_save_IFS
    2259 +   test -z "$as_dir" && as_dir=.
    2260 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2261 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2262 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2263 +     ac_cv_prog_ac_ct_OBJDUMP="objdump"
    2264 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2265 +     break 2
    2266 +@@ -6441,7 +6486,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
    2267 +
    2268 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
    2269 + $as_echo_n "checking how to recognize dependent libraries... " >&6; }
    2270 +-if test "${lt_cv_deplibs_check_method+set}" = set; then :
    2271 ++if ${lt_cv_deplibs_check_method+:} false; then :
    2272 +   $as_echo_n "(cached) " >&6
    2273 + else
    2274 +   lt_cv_file_magic_cmd='$MAGIC_CMD'
    2275 +@@ -6662,7 +6707,7 @@ if test -n "$ac_tool_prefix"; then
    2276 + set dummy ${ac_tool_prefix}ar; ac_word=$2
    2277 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2278 + $as_echo_n "checking for $ac_word... " >&6; }
    2279 +-if test "${ac_cv_prog_AR+set}" = set; then :
    2280 ++if ${ac_cv_prog_AR+:} false; then :
    2281 +   $as_echo_n "(cached) " >&6
    2282 + else
    2283 +   if test -n "$AR"; then
    2284 +@@ -6674,7 +6719,7 @@ do
    2285 +   IFS=$as_save_IFS
    2286 +   test -z "$as_dir" && as_dir=.
    2287 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2288 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2289 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2290 +     ac_cv_prog_AR="${ac_tool_prefix}ar"
    2291 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2292 +     break 2
    2293 +@@ -6702,7 +6747,7 @@ if test -z "$ac_cv_prog_AR"; then
    2294 + set dummy ar; ac_word=$2
    2295 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2296 + $as_echo_n "checking for $ac_word... " >&6; }
    2297 +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
    2298 ++if ${ac_cv_prog_ac_ct_AR+:} false; then :
    2299 +   $as_echo_n "(cached) " >&6
    2300 + else
    2301 +   if test -n "$ac_ct_AR"; then
    2302 +@@ -6714,7 +6759,7 @@ do
    2303 +   IFS=$as_save_IFS
    2304 +   test -z "$as_dir" && as_dir=.
    2305 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2306 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2307 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2308 +     ac_cv_prog_ac_ct_AR="ar"
    2309 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2310 +     break 2
    2311 +@@ -6767,7 +6812,7 @@ if test -n "$ac_tool_prefix"; then
    2312 + set dummy ${ac_tool_prefix}strip; ac_word=$2
    2313 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2314 + $as_echo_n "checking for $ac_word... " >&6; }
    2315 +-if test "${ac_cv_prog_STRIP+set}" = set; then :
    2316 ++if ${ac_cv_prog_STRIP+:} false; then :
    2317 +   $as_echo_n "(cached) " >&6
    2318 + else
    2319 +   if test -n "$STRIP"; then
    2320 +@@ -6779,7 +6824,7 @@ do
    2321 +   IFS=$as_save_IFS
    2322 +   test -z "$as_dir" && as_dir=.
    2323 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2324 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2325 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2326 +     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
    2327 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2328 +     break 2
    2329 +@@ -6807,7 +6852,7 @@ if test -z "$ac_cv_prog_STRIP"; then
    2330 + set dummy strip; ac_word=$2
    2331 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2332 + $as_echo_n "checking for $ac_word... " >&6; }
    2333 +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
    2334 ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
    2335 +   $as_echo_n "(cached) " >&6
    2336 + else
    2337 +   if test -n "$ac_ct_STRIP"; then
    2338 +@@ -6819,7 +6864,7 @@ do
    2339 +   IFS=$as_save_IFS
    2340 +   test -z "$as_dir" && as_dir=.
    2341 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2342 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2343 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2344 +     ac_cv_prog_ac_ct_STRIP="strip"
    2345 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2346 +     break 2
    2347 +@@ -6866,7 +6911,7 @@ if test -n "$ac_tool_prefix"; then
    2348 + set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    2349 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2350 + $as_echo_n "checking for $ac_word... " >&6; }
    2351 +-if test "${ac_cv_prog_RANLIB+set}" = set; then :
    2352 ++if ${ac_cv_prog_RANLIB+:} false; then :
    2353 +   $as_echo_n "(cached) " >&6
    2354 + else
    2355 +   if test -n "$RANLIB"; then
    2356 +@@ -6878,7 +6923,7 @@ do
    2357 +   IFS=$as_save_IFS
    2358 +   test -z "$as_dir" && as_dir=.
    2359 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2360 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2361 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2362 +     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    2363 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2364 +     break 2
    2365 +@@ -6906,7 +6951,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
    2366 + set dummy ranlib; ac_word=$2
    2367 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2368 + $as_echo_n "checking for $ac_word... " >&6; }
    2369 +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
    2370 ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
    2371 +   $as_echo_n "(cached) " >&6
    2372 + else
    2373 +   if test -n "$ac_ct_RANLIB"; then
    2374 +@@ -6918,7 +6963,7 @@ do
    2375 +   IFS=$as_save_IFS
    2376 +   test -z "$as_dir" && as_dir=.
    2377 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2378 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2379 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2380 +     ac_cv_prog_ac_ct_RANLIB="ranlib"
    2381 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2382 +     break 2
    2383 +@@ -7010,7 +7055,7 @@ do
    2384 + set dummy $ac_prog; ac_word=$2
    2385 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2386 + $as_echo_n "checking for $ac_word... " >&6; }
    2387 +-if test "${ac_cv_prog_AWK+set}" = set; then :
    2388 ++if ${ac_cv_prog_AWK+:} false; then :
    2389 +   $as_echo_n "(cached) " >&6
    2390 + else
    2391 +   if test -n "$AWK"; then
    2392 +@@ -7022,7 +7067,7 @@ do
    2393 +   IFS=$as_save_IFS
    2394 +   test -z "$as_dir" && as_dir=.
    2395 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2396 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2397 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2398 +     ac_cv_prog_AWK="$ac_prog"
    2399 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2400 +     break 2
    2401 +@@ -7077,7 +7122,7 @@ compiler=$CC
    2402 + # Check for command to grab the raw symbol name followed by C symbol from nm.
    2403 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
    2404 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
    2405 +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
    2406 ++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
    2407 +   $as_echo_n "(cached) " >&6
    2408 + else
    2409 +
    2410 +@@ -7461,7 +7506,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    2411 +   CFLAGS="$CFLAGS -belf"
    2412 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
    2413 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
    2414 +-if test "${lt_cv_cc_needs_belf+set}" = set; then :
    2415 ++if ${lt_cv_cc_needs_belf+:} false; then :
    2416 +   $as_echo_n "(cached) " >&6
    2417 + else
    2418 +   ac_ext=c
    2419 +@@ -7537,7 +7582,7 @@ need_locks="$enable_libtool_lock"
    2420 + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
    2421 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2422 + $as_echo_n "checking for $ac_word... " >&6; }
    2423 +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
    2424 ++if ${ac_cv_prog_DSYMUTIL+:} false; then :
    2425 +   $as_echo_n "(cached) " >&6
    2426 + else
    2427 +   if test -n "$DSYMUTIL"; then
    2428 +@@ -7549,7 +7594,7 @@ do
    2429 +   IFS=$as_save_IFS
    2430 +   test -z "$as_dir" && as_dir=.
    2431 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2432 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2433 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2434 +     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
    2435 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2436 +     break 2
    2437 +@@ -7577,7 +7622,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
    2438 + set dummy dsymutil; ac_word=$2
    2439 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2440 + $as_echo_n "checking for $ac_word... " >&6; }
    2441 +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
    2442 ++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
    2443 +   $as_echo_n "(cached) " >&6
    2444 + else
    2445 +   if test -n "$ac_ct_DSYMUTIL"; then
    2446 +@@ -7589,7 +7634,7 @@ do
    2447 +   IFS=$as_save_IFS
    2448 +   test -z "$as_dir" && as_dir=.
    2449 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2450 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2451 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2452 +     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
    2453 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2454 +     break 2
    2455 +@@ -7629,7 +7674,7 @@ fi
    2456 + set dummy ${ac_tool_prefix}nmedit; ac_word=$2
    2457 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2458 + $as_echo_n "checking for $ac_word... " >&6; }
    2459 +-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
    2460 ++if ${ac_cv_prog_NMEDIT+:} false; then :
    2461 +   $as_echo_n "(cached) " >&6
    2462 + else
    2463 +   if test -n "$NMEDIT"; then
    2464 +@@ -7641,7 +7686,7 @@ do
    2465 +   IFS=$as_save_IFS
    2466 +   test -z "$as_dir" && as_dir=.
    2467 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2468 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2469 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2470 +     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
    2471 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2472 +     break 2
    2473 +@@ -7669,7 +7714,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
    2474 + set dummy nmedit; ac_word=$2
    2475 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2476 + $as_echo_n "checking for $ac_word... " >&6; }
    2477 +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
    2478 ++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
    2479 +   $as_echo_n "(cached) " >&6
    2480 + else
    2481 +   if test -n "$ac_ct_NMEDIT"; then
    2482 +@@ -7681,7 +7726,7 @@ do
    2483 +   IFS=$as_save_IFS
    2484 +   test -z "$as_dir" && as_dir=.
    2485 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2486 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2487 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2488 +     ac_cv_prog_ac_ct_NMEDIT="nmedit"
    2489 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2490 +     break 2
    2491 +@@ -7721,7 +7766,7 @@ fi
    2492 + set dummy ${ac_tool_prefix}lipo; ac_word=$2
    2493 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2494 + $as_echo_n "checking for $ac_word... " >&6; }
    2495 +-if test "${ac_cv_prog_LIPO+set}" = set; then :
    2496 ++if ${ac_cv_prog_LIPO+:} false; then :
    2497 +   $as_echo_n "(cached) " >&6
    2498 + else
    2499 +   if test -n "$LIPO"; then
    2500 +@@ -7733,7 +7778,7 @@ do
    2501 +   IFS=$as_save_IFS
    2502 +   test -z "$as_dir" && as_dir=.
    2503 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2504 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2505 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2506 +     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
    2507 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2508 +     break 2
    2509 +@@ -7761,7 +7806,7 @@ if test -z "$ac_cv_prog_LIPO"; then
    2510 + set dummy lipo; ac_word=$2
    2511 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2512 + $as_echo_n "checking for $ac_word... " >&6; }
    2513 +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
    2514 ++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
    2515 +   $as_echo_n "(cached) " >&6
    2516 + else
    2517 +   if test -n "$ac_ct_LIPO"; then
    2518 +@@ -7773,7 +7818,7 @@ do
    2519 +   IFS=$as_save_IFS
    2520 +   test -z "$as_dir" && as_dir=.
    2521 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2522 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2523 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2524 +     ac_cv_prog_ac_ct_LIPO="lipo"
    2525 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2526 +     break 2
    2527 +@@ -7813,7 +7858,7 @@ fi
    2528 + set dummy ${ac_tool_prefix}otool; ac_word=$2
    2529 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2530 + $as_echo_n "checking for $ac_word... " >&6; }
    2531 +-if test "${ac_cv_prog_OTOOL+set}" = set; then :
    2532 ++if ${ac_cv_prog_OTOOL+:} false; then :
    2533 +   $as_echo_n "(cached) " >&6
    2534 + else
    2535 +   if test -n "$OTOOL"; then
    2536 +@@ -7825,7 +7870,7 @@ do
    2537 +   IFS=$as_save_IFS
    2538 +   test -z "$as_dir" && as_dir=.
    2539 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2540 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2541 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2542 +     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
    2543 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2544 +     break 2
    2545 +@@ -7853,7 +7898,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
    2546 + set dummy otool; ac_word=$2
    2547 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2548 + $as_echo_n "checking for $ac_word... " >&6; }
    2549 +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
    2550 ++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
    2551 +   $as_echo_n "(cached) " >&6
    2552 + else
    2553 +   if test -n "$ac_ct_OTOOL"; then
    2554 +@@ -7865,7 +7910,7 @@ do
    2555 +   IFS=$as_save_IFS
    2556 +   test -z "$as_dir" && as_dir=.
    2557 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2558 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2559 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2560 +     ac_cv_prog_ac_ct_OTOOL="otool"
    2561 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2562 +     break 2
    2563 +@@ -7905,7 +7950,7 @@ fi
    2564 + set dummy ${ac_tool_prefix}otool64; ac_word=$2
    2565 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2566 + $as_echo_n "checking for $ac_word... " >&6; }
    2567 +-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
    2568 ++if ${ac_cv_prog_OTOOL64+:} false; then :
    2569 +   $as_echo_n "(cached) " >&6
    2570 + else
    2571 +   if test -n "$OTOOL64"; then
    2572 +@@ -7917,7 +7962,7 @@ do
    2573 +   IFS=$as_save_IFS
    2574 +   test -z "$as_dir" && as_dir=.
    2575 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2576 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2577 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2578 +     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
    2579 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2580 +     break 2
    2581 +@@ -7945,7 +7990,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
    2582 + set dummy otool64; ac_word=$2
    2583 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2584 + $as_echo_n "checking for $ac_word... " >&6; }
    2585 +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
    2586 ++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
    2587 +   $as_echo_n "(cached) " >&6
    2588 + else
    2589 +   if test -n "$ac_ct_OTOOL64"; then
    2590 +@@ -7957,7 +8002,7 @@ do
    2591 +   IFS=$as_save_IFS
    2592 +   test -z "$as_dir" && as_dir=.
    2593 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2594 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2595 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2596 +     ac_cv_prog_ac_ct_OTOOL64="otool64"
    2597 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2598 +     break 2
    2599 +@@ -8020,7 +8065,7 @@ fi
    2600 +
    2601 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
    2602 + $as_echo_n "checking for -single_module linker flag... " >&6; }
    2603 +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
    2604 ++if ${lt_cv_apple_cc_single_mod+:} false; then :
    2605 +   $as_echo_n "(cached) " >&6
    2606 + else
    2607 +   lt_cv_apple_cc_single_mod=no
    2608 +@@ -8049,7 +8094,7 @@ fi
    2609 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
    2610 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
    2611 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
    2612 +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
    2613 ++if ${lt_cv_ld_exported_symbols_list+:} false; then :
    2614 +   $as_echo_n "(cached) " >&6
    2615 + else
    2616 +   lt_cv_ld_exported_symbols_list=no
    2617 +@@ -8081,7 +8126,7 @@ fi
    2618 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
    2619 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
    2620 + $as_echo_n "checking for -force_load linker flag... " >&6; }
    2621 +-if test "${lt_cv_ld_force_load+set}" = set; then :
    2622 ++if ${lt_cv_ld_force_load+:} false; then :
    2623 +   $as_echo_n "(cached) " >&6
    2624 + else
    2625 +   lt_cv_ld_force_load=no
    2626 +@@ -8148,7 +8193,7 @@ for ac_header in dlfcn.h
    2627 + do :
    2628 +   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
    2629 + "
    2630 +-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
    2631 ++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
    2632 +   cat >>confdefs.h <<_ACEOF
    2633 + #define HAVE_DLFCN_H 1
    2634 + _ACEOF
    2635 +@@ -8184,7 +8229,7 @@ if test -n "$ac_tool_prefix"; then
    2636 + set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    2637 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2638 + $as_echo_n "checking for $ac_word... " >&6; }
    2639 +-if test "${ac_cv_prog_RANLIB+set}" = set; then :
    2640 ++if ${ac_cv_prog_RANLIB+:} false; then :
    2641 +   $as_echo_n "(cached) " >&6
    2642 + else
    2643 +   if test -n "$RANLIB"; then
    2644 +@@ -8196,7 +8241,7 @@ do
    2645 +   IFS=$as_save_IFS
    2646 +   test -z "$as_dir" && as_dir=.
    2647 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2648 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2649 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2650 +     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    2651 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2652 +     break 2
    2653 +@@ -8224,7 +8269,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
    2654 + set dummy ranlib; ac_word=$2
    2655 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2656 + $as_echo_n "checking for $ac_word... " >&6; }
    2657 +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
    2658 ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
    2659 +   $as_echo_n "(cached) " >&6
    2660 + else
    2661 +   if test -n "$ac_ct_RANLIB"; then
    2662 +@@ -8236,7 +8281,7 @@ do
    2663 +   IFS=$as_save_IFS
    2664 +   test -z "$as_dir" && as_dir=.
    2665 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2666 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2667 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2668 +     ac_cv_prog_ac_ct_RANLIB="ranlib"
    2669 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2670 +     break 2
    2671 +@@ -8292,7 +8337,7 @@ depcc="$CC"   am_compiler_list=
    2672 + am_depcomp=$ac_aux_dir/depcomp
    2673 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
    2674 + $as_echo_n "checking dependency style of $depcc... " >&6; }
    2675 +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
    2676 ++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
    2677 +   $as_echo_n "(cached) " >&6
    2678 + else
    2679 +   if test -f "$am_depcomp"; then
    2680 +@@ -8378,7 +8423,7 @@ fi
    2681 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
    2682 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
    2683 + if test x${am_cv_CC_dependencies_compiler_type-none} = xnone
    2684 +-then as_fn_error "no usable dependency style found" "$LINENO" 5
    2685 ++then as_fn_error $? "no usable dependency style found" "$LINENO" 5
    2686 + else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
    2687 +
    2688 + fi
    2689 +@@ -8391,7 +8436,7 @@ do
    2690 + set dummy $ac_prog; ac_word=$2
    2691 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2692 + $as_echo_n "checking for $ac_word... " >&6; }
    2693 +-if test "${ac_cv_prog_MAKE+set}" = set; then :
    2694 ++if ${ac_cv_prog_MAKE+:} false; then :
    2695 +   $as_echo_n "(cached) " >&6
    2696 + else
    2697 +   if test -n "$MAKE"; then
    2698 +@@ -8403,7 +8448,7 @@ do
    2699 +   IFS=$as_save_IFS
    2700 +   test -z "$as_dir" && as_dir=.
    2701 +     for ac_exec_ext in '' $ac_executable_extensions; do
    2702 +-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2703 ++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2704 +     ac_cv_prog_MAKE="$ac_prog"
    2705 +     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2706 +     break 2
    2707 +@@ -8521,8 +8566,7 @@ for ac_header in stdlib.h string.h strings.h unistd.h time.h
    2708 + do :
    2709 +   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    2710 + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    2711 +-eval as_val=\$$as_ac_Header
    2712 +-   if test "x$as_val" = x""yes; then :
    2713 ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    2714 +   cat >>confdefs.h <<_ACEOF
    2715 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    2716 + _ACEOF
    2717 +@@ -8535,8 +8579,7 @@ for ac_header in sys/time.h sys/resource.h
    2718 + do :
    2719 +   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    2720 + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    2721 +-eval as_val=\$$as_ac_Header
    2722 +-   if test "x$as_val" = x""yes; then :
    2723 ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    2724 +   cat >>confdefs.h <<_ACEOF
    2725 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    2726 + _ACEOF
    2727 +@@ -8549,8 +8592,7 @@ for ac_header in fcntl.h fpu_control.h
    2728 + do :
    2729 +   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    2730 + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    2731 +-eval as_val=\$$as_ac_Header
    2732 +-   if test "x$as_val" = x""yes; then :
    2733 ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    2734 +   cat >>confdefs.h <<_ACEOF
    2735 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    2736 + _ACEOF
    2737 +@@ -8563,8 +8605,7 @@ for ac_header in dlfcn.h errno.h sys/stat.h
    2738 + do :
    2739 +   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    2740 + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    2741 +-eval as_val=\$$as_ac_Header
    2742 +-   if test "x$as_val" = x""yes; then :
    2743 ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    2744 +   cat >>confdefs.h <<_ACEOF
    2745 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    2746 + _ACEOF
    2747 +@@ -8577,8 +8618,7 @@ for ac_func in getrusage time sigaction __setfpucw
    2748 + do :
    2749 +   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    2750 + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    2751 +-eval as_val=\$$as_ac_var
    2752 +-   if test "x$as_val" = x""yes; then :
    2753 ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
    2754 +   cat >>confdefs.h <<_ACEOF
    2755 + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    2756 + _ACEOF
    2757 +@@ -8590,7 +8630,7 @@ done
    2758 + # Check for socket libraries
    2759 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
    2760 + $as_echo_n "checking for bind in -lsocket... " >&6; }
    2761 +-if test "${ac_cv_lib_socket_bind+set}" = set; then :
    2762 ++if ${ac_cv_lib_socket_bind+:} false; then :
    2763 +   $as_echo_n "(cached) " >&6
    2764 + else
    2765 +   ac_check_lib_save_LIBS=$LIBS
    2766 +@@ -8624,7 +8664,7 @@ LIBS=$ac_check_lib_save_LIBS
    2767 + fi
    2768 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5
    2769 + $as_echo "$ac_cv_lib_socket_bind" >&6; }
    2770 +-if test "x$ac_cv_lib_socket_bind" = x""yes; then :
    2771 ++if test "x$ac_cv_lib_socket_bind" = xyes; then :
    2772 +   cat >>confdefs.h <<_ACEOF
    2773 + #define HAVE_LIBSOCKET 1
    2774 + _ACEOF
    2775 +@@ -8635,7 +8675,7 @@ fi
    2776 +
    2777 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
    2778 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
    2779 +-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
    2780 ++if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
    2781 +   $as_echo_n "(cached) " >&6
    2782 + else
    2783 +   ac_check_lib_save_LIBS=$LIBS
    2784 +@@ -8669,7 +8709,7 @@ LIBS=$ac_check_lib_save_LIBS
    2785 + fi
    2786 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
    2787 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
    2788 +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
    2789 ++if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
    2790 +   cat >>confdefs.h <<_ACEOF
    2791 + #define HAVE_LIBNSL 1
    2792 + _ACEOF
    2793 +@@ -8695,7 +8735,7 @@ fi
    2794 +   if test "$with_zlib" != "no"; then
    2795 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
    2796 + $as_echo_n "checking for library containing zlibVersion... " >&6; }
    2797 +-if test "${ac_cv_search_zlibVersion+set}" = set; then :
    2798 ++if ${ac_cv_search_zlibVersion+:} false; then :
    2799 +   $as_echo_n "(cached) " >&6
    2800 + else
    2801 +   ac_func_search_save_LIBS=$LIBS
    2802 +@@ -8729,11 +8769,11 @@ for ac_lib in '' z; do
    2803 + fi
    2804 + rm -f core conftest.err conftest.$ac_objext \
    2805 +     conftest$ac_exeext
    2806 +-  if test "${ac_cv_search_zlibVersion+set}" = set; then :
    2807 ++  if ${ac_cv_search_zlibVersion+:} false; then :
    2808 +   break
    2809 + fi
    2810 + done
    2811 +-if test "${ac_cv_search_zlibVersion+set}" = set; then :
    2812 ++if ${ac_cv_search_zlibVersion+:} false; then :
    2813 +
    2814 + else
    2815 +   ac_cv_search_zlibVersion=no
    2816 +@@ -8749,7 +8789,7 @@ if test "$ac_res" != no; then :
    2817 +   for ac_header in zlib.h
    2818 + do :
    2819 +   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
    2820 +-if test "x$ac_cv_header_zlib_h" = x""yes; then :
    2821 ++if test "x$ac_cv_header_zlib_h" = xyes; then :
    2822 +   cat >>confdefs.h <<_ACEOF
    2823 + #define HAVE_ZLIB_H 1
    2824 + _ACEOF
    2825 +@@ -8761,7 +8801,7 @@ done
    2826 + fi
    2827 +
    2828 +     if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
    2829 +-      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
    2830 ++      as_fn_error $? "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
    2831 +     fi
    2832 +   fi
    2833 +
    2834 +@@ -8965,7 +9005,7 @@ fi
    2835 +
    2836 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
    2837 + $as_echo_n "checking for objdir... " >&6; }
    2838 +-if test "${lt_cv_objdir+set}" = set; then :
    2839 ++if ${lt_cv_objdir+:} false; then :
    2840 +   $as_echo_n "(cached) " >&6
    2841 + else
    2842 +   rm -f .libs 2>/dev/null
    2843 +@@ -9043,7 +9083,7 @@ file_magic*)
    2844 +   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
    2845 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
    2846 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
    2847 +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
    2848 ++if ${lt_cv_path_MAGIC_CMD+:} false; then :
    2849 +   $as_echo_n "(cached) " >&6
    2850 + else
    2851 +   case $MAGIC_CMD in
    2852 +@@ -9109,7 +9149,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
    2853 +   if test -n "$ac_tool_prefix"; then
    2854 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
    2855 + $as_echo_n "checking for file... " >&6; }
    2856 +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
    2857 ++if ${lt_cv_path_MAGIC_CMD+:} false; then :
    2858 +   $as_echo_n "(cached) " >&6
    2859 + else
    2860 +   case $MAGIC_CMD in
    2861 +@@ -9251,7 +9291,7 @@ if test "$GCC" = yes; then
    2862 +
    2863 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
    2864 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
    2865 +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
    2866 ++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
    2867 +   $as_echo_n "(cached) " >&6
    2868 + else
    2869 +   lt_cv_prog_compiler_rtti_exceptions=no
    2870 +@@ -9604,7 +9644,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
    2871 + if test -n "$lt_prog_compiler_pic"; then
    2872 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
    2873 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
    2874 +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
    2875 ++if ${lt_cv_prog_compiler_pic_works+:} false; then :
    2876 +   $as_echo_n "(cached) " >&6
    2877 + else
    2878 +   lt_cv_prog_compiler_pic_works=no
    2879 +@@ -9663,7 +9703,7 @@ fi
    2880 + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
    2881 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
    2882 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
    2883 +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
    2884 ++if ${lt_cv_prog_compiler_static_works+:} false; then :
    2885 +   $as_echo_n "(cached) " >&6
    2886 + else
    2887 +   lt_cv_prog_compiler_static_works=no
    2888 +@@ -9706,7 +9746,7 @@ fi
    2889 +
    2890 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
    2891 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
    2892 +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
    2893 ++if ${lt_cv_prog_compiler_c_o+:} false; then :
    2894 +   $as_echo_n "(cached) " >&6
    2895 + else
    2896 +   lt_cv_prog_compiler_c_o=no
    2897 +@@ -9761,7 +9801,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
    2898 +
    2899 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
    2900 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
    2901 +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
    2902 ++if ${lt_cv_prog_compiler_c_o+:} false; then :
    2903 +   $as_echo_n "(cached) " >&6
    2904 + else
    2905 +   lt_cv_prog_compiler_c_o=no
    2906 +@@ -10577,7 +10617,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
    2907 +         # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
    2908 +         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
    2909 + $as_echo_n "checking if $CC understands -b... " >&6; }
    2910 +-if test "${lt_cv_prog_compiler__b+set}" = set; then :
    2911 ++if ${lt_cv_prog_compiler__b+:} false; then :
    2912 +   $as_echo_n "(cached) " >&6
    2913 + else
    2914 +   lt_cv_prog_compiler__b=no
    2915 +@@ -10949,7 +10989,7 @@ x|xyes)
    2916 +       # to ld, don't add -lc before -lgcc.
    2917 +       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
    2918 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
    2919 +-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
    2920 ++if ${lt_cv_archive_cmds_need_lc+:} false; then :
    2921 +   $as_echo_n "(cached) " >&6
    2922 + else
    2923 +   $RM conftest*
    2924 +@@ -11587,7 +11627,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    2925 +   shlibpath_overrides_runpath=no
    2926 +
    2927 +   # Some binutils ld are patched to set DT_RUNPATH
    2928 +-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
    2929 ++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
    2930 +   $as_echo_n "(cached) " >&6
    2931 + else
    2932 +   lt_cv_shlibpath_overrides_runpath=no
    2933 +@@ -12007,7 +12047,7 @@ else
    2934 +   # if libdl is installed we need to link against it
    2935 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
    2936 + $as_echo_n "checking for dlopen in -ldl... " >&6; }
    2937 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
    2938 ++if ${ac_cv_lib_dl_dlopen+:} false; then :
    2939 +   $as_echo_n "(cached) " >&6
    2940 + else
    2941 +   ac_check_lib_save_LIBS=$LIBS
    2942 +@@ -12041,7 +12081,7 @@ LIBS=$ac_check_lib_save_LIBS
    2943 + fi
    2944 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
    2945 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
    2946 +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
    2947 ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
    2948 +   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
    2949 + else
    2950 +
    2951 +@@ -12055,12 +12095,12 @@ fi
    2952 +
    2953 +   *)
    2954 +     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
    2955 +-if test "x$ac_cv_func_shl_load" = x""yes; then :
    2956 ++if test "x$ac_cv_func_shl_load" = xyes; then :
    2957 +   lt_cv_dlopen="shl_load"
    2958 + else
    2959 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
    2960 + $as_echo_n "checking for shl_load in -ldld... " >&6; }
    2961 +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
    2962 ++if ${ac_cv_lib_dld_shl_load+:} false; then :
    2963 +   $as_echo_n "(cached) " >&6
    2964 + else
    2965 +   ac_check_lib_save_LIBS=$LIBS
    2966 +@@ -12094,16 +12134,16 @@ LIBS=$ac_check_lib_save_LIBS
    2967 + fi
    2968 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
    2969 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
    2970 +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
    2971 ++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
    2972 +   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
    2973 + else
    2974 +   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
    2975 +-if test "x$ac_cv_func_dlopen" = x""yes; then :
    2976 ++if test "x$ac_cv_func_dlopen" = xyes; then :
    2977 +   lt_cv_dlopen="dlopen"
    2978 + else
    2979 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
    2980 + $as_echo_n "checking for dlopen in -ldl... " >&6; }
    2981 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
    2982 ++if ${ac_cv_lib_dl_dlopen+:} false; then :
    2983 +   $as_echo_n "(cached) " >&6
    2984 + else
    2985 +   ac_check_lib_save_LIBS=$LIBS
    2986 +@@ -12137,12 +12177,12 @@ LIBS=$ac_check_lib_save_LIBS
    2987 + fi
    2988 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
    2989 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
    2990 +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
    2991 ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
    2992 +   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
    2993 + else
    2994 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
    2995 + $as_echo_n "checking for dlopen in -lsvld... " >&6; }
    2996 +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
    2997 ++if ${ac_cv_lib_svld_dlopen+:} false; then :
    2998 +   $as_echo_n "(cached) " >&6
    2999 + else
    3000 +   ac_check_lib_save_LIBS=$LIBS
    3001 +@@ -12176,12 +12216,12 @@ LIBS=$ac_check_lib_save_LIBS
    3002 + fi
    3003 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
    3004 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
    3005 +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
    3006 ++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
    3007 +   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
    3008 + else
    3009 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
    3010 + $as_echo_n "checking for dld_link in -ldld... " >&6; }
    3011 +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
    3012 ++if ${ac_cv_lib_dld_dld_link+:} false; then :
    3013 +   $as_echo_n "(cached) " >&6
    3014 + else
    3015 +   ac_check_lib_save_LIBS=$LIBS
    3016 +@@ -12215,7 +12255,7 @@ LIBS=$ac_check_lib_save_LIBS
    3017 + fi
    3018 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
    3019 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
    3020 +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
    3021 ++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
    3022 +   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
    3023 + fi
    3024 +
    3025 +@@ -12256,7 +12296,7 @@ fi
    3026 +
    3027 +     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
    3028 + $as_echo_n "checking whether a program can dlopen itself... " >&6; }
    3029 +-if test "${lt_cv_dlopen_self+set}" = set; then :
    3030 ++if ${lt_cv_dlopen_self+:} false; then :
    3031 +   $as_echo_n "(cached) " >&6
    3032 + else
    3033 +         if test "$cross_compiling" = yes; then :
    3034 +@@ -12265,7 +12305,7 @@ else
    3035 +   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    3036 +   lt_status=$lt_dlunknown
    3037 +   cat > conftest.$ac_ext <<_LT_EOF
    3038 +-#line 12268 "configure"
    3039 ++#line 12308 "configure"
    3040 + #include "confdefs.h"
    3041 +
    3042 + #if HAVE_DLFCN_H
    3043 +@@ -12362,7 +12402,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
    3044 +       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
    3045 +       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
    3046 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
    3047 +-if test "${lt_cv_dlopen_self_static+set}" = set; then :
    3048 ++if ${lt_cv_dlopen_self_static+:} false; then :
    3049 +   $as_echo_n "(cached) " >&6
    3050 + else
    3051 +         if test "$cross_compiling" = yes; then :
    3052 +@@ -12371,7 +12411,7 @@ else
    3053 +   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    3054 +   lt_status=$lt_dlunknown
    3055 +   cat > conftest.$ac_ext <<_LT_EOF
    3056 +-#line 12374 "configure"
    3057 ++#line 12414 "configure"
    3058 + #include "confdefs.h"
    3059 +
    3060 + #if HAVE_DLFCN_H
    3061 +@@ -12644,7 +12684,7 @@ if test "${enable_sim_bswap+set}" = set; then :
    3062 +   enableval=$enable_sim_bswap; case "${enableval}" in
    3063 +   yes)        sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
    3064 +   no) sim_bswap="-DWITH_BSWAP=0";;
    3065 +-  *)  as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
    3066 ++  *)  as_fn_error $? "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
    3067 + esac
    3068 + if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
    3069 +   echo "Setting bswap flags = $sim_bswap" 6>&1
    3070 +@@ -12659,7 +12699,7 @@ fi
    3071 + if test "${enable_sim_cflags+set}" = set; then :
    3072 +   enableval=$enable_sim_cflags; case "${enableval}" in
    3073 +   yes)         sim_cflags="-O2 -fomit-frame-pointer";;
    3074 +-  trace) as_fn_error "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";;
    3075 ++  trace) as_fn_error $? "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";;
    3076 +   no)  sim_cflags="";;
    3077 +   *)   sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
    3078 + esac
    3079 +@@ -12693,7 +12733,7 @@ if test "${enable_sim_stdio+set}" = set; then :
    3080 +   enableval=$enable_sim_stdio; case "${enableval}" in
    3081 +   yes)        sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
    3082 +   no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
    3083 +-  *)  as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
    3084 ++  *)  as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
    3085 + esac
    3086 + if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
    3087 +   echo "Setting stdio flags = $sim_stdio" 6>&1
    3088 +@@ -12762,7 +12802,7 @@ fi
    3089 + # Check whether --with-pkgversion was given.
    3090 + if test "${with_pkgversion+set}" = set; then :
    3091 +   withval=$with_pkgversion; case "$withval" in
    3092 +-      yes) as_fn_error "package version not specified" "$LINENO" 5 ;;
    3093 ++      yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;;
    3094 +       no)  PKGVERSION= ;;
    3095 +       *)   PKGVERSION="($withval) " ;;
    3096 +      esac
    3097 +@@ -12778,7 +12818,7 @@ fi
    3098 + # Check whether --with-bugurl was given.
    3099 + if test "${with_bugurl+set}" = set; then :
    3100 +   withval=$with_bugurl; case "$withval" in
    3101 +-      yes) as_fn_error "bug URL not specified" "$LINENO" 5 ;;
    3102 ++      yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;;
    3103 +       no)  BUGURL=
    3104 +          ;;
    3105 +       *)   BUGURL="$withval"
    3106 +@@ -12815,7 +12855,7 @@ _ACEOF
    3107 +
    3108 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
    3109 + $as_echo_n "checking return type of signal handlers... " >&6; }
    3110 +-if test "${ac_cv_type_signal+set}" = set; then :
    3111 ++if ${ac_cv_type_signal+:} false; then :
    3112 +   $as_echo_n "(cached) " >&6
    3113 + else
    3114 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    3115 +@@ -12872,7 +12912,7 @@ sim_link_links="${sim_link_links} targ-vals.def"
    3116 + for ac_header in stdlib.h
    3117 + do :
    3118 +   ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
    3119 +-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
    3120 ++if test "x$ac_cv_header_stdlib_h" = xyes; then :
    3121 +   cat >>confdefs.h <<_ACEOF
    3122 + #define HAVE_STDLIB_H 1
    3123 + _ACEOF
    3124 +@@ -12885,7 +12925,7 @@ done
    3125 + # In the Cygwin environment, we need some additional flags.
    3126 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
    3127 + $as_echo_n "checking for cygwin... " >&6; }
    3128 +-if test "${sim_cv_os_cygwin+set}" = set; then :
    3129 ++if ${sim_cv_os_cygwin+:} false; then :
    3130 +   $as_echo_n "(cached) " >&6
    3131 + else
    3132 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    3133 +@@ -12913,7 +12953,7 @@ else
    3134 +   # Keep in sync with gdb's configure.ac list.
    3135 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
    3136 + $as_echo_n "checking for library containing tgetent... " >&6; }
    3137 +-if test "${ac_cv_search_tgetent+set}" = set; then :
    3138 ++if ${ac_cv_search_tgetent+:} false; then :
    3139 +   $as_echo_n "(cached) " >&6
    3140 + else
    3141 +   ac_func_search_save_LIBS=$LIBS
    3142 +@@ -12947,11 +12987,11 @@ for ac_lib in '' termcap tinfo curses ncurses; do
    3143 + fi
    3144 + rm -f core conftest.err conftest.$ac_objext \
    3145 +     conftest$ac_exeext
    3146 +-  if test "${ac_cv_search_tgetent+set}" = set; then :
    3147 ++  if ${ac_cv_search_tgetent+:} false; then :
    3148 +   break
    3149 + fi
    3150 + done
    3151 +-if test "${ac_cv_search_tgetent+set}" = set; then :
    3152 ++if ${ac_cv_search_tgetent+:} false; then :
    3153 +
    3154 + else
    3155 +   ac_cv_search_tgetent=no
    3156 +@@ -12979,7 +13019,7 @@ if test -r ../../readline/Makefile; then
    3157 + else
    3158 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
    3159 + $as_echo_n "checking for readline in -lreadline... " >&6; }
    3160 +-if test "${ac_cv_lib_readline_readline+set}" = set; then :
    3161 ++if ${ac_cv_lib_readline_readline+:} false; then :
    3162 +   $as_echo_n "(cached) " >&6
    3163 + else
    3164 +   ac_check_lib_save_LIBS=$LIBS
    3165 +@@ -13013,14 +13053,238 @@ LIBS=$ac_check_lib_save_LIBS
    3166 + fi
    3167 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
    3168 + $as_echo "$ac_cv_lib_readline_readline" >&6; }
    3169 +-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
    3170 ++if test "x$ac_cv_lib_readline_readline" = xyes; then :
    3171 +   READLINE=-lreadline
    3172 + else
    3173 +-  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
    3174 ++  as_fn_error $? "the required \"readline\" library is missing" "$LINENO" 5
    3175 + fi
    3176 +
    3177 + fi
    3178 +
    3179 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
    3180 ++$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
    3181 ++if ${ac_cv_c_bigendian+:} false; then :
    3182 ++  $as_echo_n "(cached) " >&6
    3183 ++else
    3184 ++  ac_cv_c_bigendian=unknown
    3185 ++    # See if we're dealing with a universal compiler.
    3186 ++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    3187 ++/* end confdefs.h.  */
    3188 ++#ifndef __APPLE_CC__
    3189 ++             not a universal capable compiler
    3190 ++           #endif
    3191 ++           typedef int dummy;
    3192 ++
    3193 ++_ACEOF
    3194 ++if ac_fn_c_try_compile "$LINENO"; then :
    3195 ++
    3196 ++      # Check for potential -arch flags.  It is not universal unless
    3197 ++      # there are at least two -arch flags with different values.
    3198 ++      ac_arch=
    3199 ++      ac_prev=
    3200 ++      for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
    3201 ++       if test -n "$ac_prev"; then
    3202 ++         case $ac_word in
    3203 ++           i?86 | x86_64 | ppc | ppc64)
    3204 ++             if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
    3205 ++               ac_arch=$ac_word
    3