forked from Imagelibrary/rtems
10740 lines
337 KiB
Diff
10740 lines
337 KiB
Diff
diff -Naur gdb-6.8.orig/bfd/config.bfd gdb-6.8/bfd/config.bfd
|
||
--- gdb-6.8.orig/bfd/config.bfd 2008-02-14 16:20:24.000000000 +0100
|
||
+++ gdb-6.8/bfd/config.bfd 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -712,7 +712,7 @@
|
||
targ_defvec=bfd_elf32_iq2000_vec
|
||
;;
|
||
|
||
- m32c-*-elf)
|
||
+ m32c-*-elf | m32c-*-rtems*)
|
||
targ_defvec=bfd_elf32_m32c_vec
|
||
;;
|
||
|
||
@@ -728,6 +728,9 @@
|
||
targ_defvec=bfd_elf32_m32rle_vec
|
||
targ_selvecs="bfd_elf32_m32r_vec bfd_elf32_m32rle_vec"
|
||
;;
|
||
+ m32r-*-rtems*)
|
||
+ targ_defvec=bfd_elf32_m32r_vec
|
||
+ ;;
|
||
m32r-*-*)
|
||
targ_defvec=bfd_elf32_m32r_vec
|
||
;;
|
||
diff -Naur gdb-6.8.orig/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c
|
||
--- gdb-6.8.orig/gdb/breakpoint.c 2008-02-26 09:14:11.000000000 +0100
|
||
+++ gdb-6.8/gdb/breakpoint.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -55,6 +55,7 @@
|
||
#include "memattr.h"
|
||
#include "ada-lang.h"
|
||
#include "top.h"
|
||
+#include "wrapper.h"
|
||
|
||
#include "gdb-events.h"
|
||
#include "mi/mi-common.h"
|
||
@@ -826,7 +827,65 @@
|
||
|| bpt->type == bp_access_watchpoint);
|
||
}
|
||
|
||
-/* Assuming that B is a hardware breakpoint:
|
||
+/* Find the current value of a watchpoint on EXP. Return the value in
|
||
+ *VALP and *RESULTP and the chain of intermediate and final values
|
||
+ in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does
|
||
+ not need them.
|
||
+
|
||
+ If an error occurs while evaluating the expression, *RESULTP will
|
||
+ be set to NULL. *RESULTP may be a lazy value, if the result could
|
||
+ not be read from memory. It is used to determine whether a value
|
||
+ is user-specified (we should watch the whole value) or intermediate
|
||
+ (we should watch only the bit used to locate the final value).
|
||
+
|
||
+ If the final value, or any intermediate value, could not be read
|
||
+ from memory, *VALP will be set to NULL. *VAL_CHAIN will still be
|
||
+ set to any referenced values. *VALP will never be a lazy value.
|
||
+ This is the value which we store in struct breakpoint.
|
||
+
|
||
+ If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the
|
||
+ value chain. The caller must free the values individually. If
|
||
+ VAL_CHAIN is NULL, all generated values will be left on the value
|
||
+ chain. */
|
||
+
|
||
+static void
|
||
+fetch_watchpoint_value (struct expression *exp, struct value **valp,
|
||
+ struct value **resultp, struct value **val_chain)
|
||
+{
|
||
+ struct value *mark, *new_mark, *result;
|
||
+
|
||
+ *valp = NULL;
|
||
+ if (resultp)
|
||
+ *resultp = NULL;
|
||
+ if (val_chain)
|
||
+ *val_chain = NULL;
|
||
+
|
||
+ /* Evaluate the expression. */
|
||
+ mark = value_mark ();
|
||
+ result = NULL;
|
||
+ gdb_evaluate_expression (exp, &result);
|
||
+ new_mark = value_mark ();
|
||
+ if (mark == new_mark)
|
||
+ return;
|
||
+ if (resultp)
|
||
+ *resultp = result;
|
||
+
|
||
+ /* Make sure it's not lazy, so that after the target stops again we
|
||
+ have a non-lazy previous value to compare with. */
|
||
+ if (result != NULL
|
||
+ && (!value_lazy (result) || gdb_value_fetch_lazy (result)))
|
||
+ *valp = result;
|
||
+
|
||
+ if (val_chain)
|
||
+ {
|
||
+ /* Return the chain of intermediate values. We use this to
|
||
+ decide which addresses to watch. */
|
||
+ *val_chain = new_mark;
|
||
+ value_release_to_mark (mark);
|
||
+ }
|
||
+}
|
||
+
|
||
+/* Assuming that B is a hardware watchpoint:
|
||
- Reparse watchpoint expression, is REPARSE is non-zero
|
||
- Evaluate expression and store the result in B->val
|
||
- Update the list of values that must be watched in B->loc.
|
||
@@ -837,7 +896,6 @@
|
||
update_watchpoint (struct breakpoint *b, int reparse)
|
||
{
|
||
int within_current_scope;
|
||
- struct value *mark = value_mark ();
|
||
struct frame_id saved_frame_id;
|
||
struct bp_location *loc;
|
||
bpstat bs;
|
||
@@ -889,9 +947,9 @@
|
||
to the user when the old value and the new value may actually
|
||
be completely different objects. */
|
||
value_free (b->val);
|
||
- b->val = NULL;
|
||
+ b->val = NULL;
|
||
+ b->val_valid = 0;
|
||
}
|
||
-
|
||
|
||
/* If we failed to parse the expression, for example because
|
||
it refers to a global variable in a not-yet-loaded shared library,
|
||
@@ -900,43 +958,37 @@
|
||
is different from out-of-scope watchpoint. */
|
||
if (within_current_scope && b->exp)
|
||
{
|
||
- struct value *v, *next;
|
||
+ struct value *val_chain, *v, *result, *next;
|
||
+
|
||
+ fetch_watchpoint_value (b->exp, &v, &result, &val_chain);
|
||
|
||
- /* Evaluate the expression and make sure it's not lazy, so that
|
||
- after target stops again, we have a non-lazy previous value
|
||
- to compare with. Also, making the value non-lazy will fetch
|
||
- intermediate values as needed, which we use to decide which
|
||
- addresses to watch.
|
||
-
|
||
- The value returned by evaluate_expression is stored in b->val.
|
||
- In addition, we look at all values which were created
|
||
- during evaluation, and set watchoints at addresses as needed.
|
||
- Those values are explicitly deleted here. */
|
||
- v = evaluate_expression (b->exp);
|
||
/* Avoid setting b->val if it's already set. The meaning of
|
||
b->val is 'the last value' user saw, and we should update
|
||
it only if we reported that last value to user. As it
|
||
happens, the code that reports it updates b->val directly. */
|
||
- if (b->val == NULL)
|
||
- b->val = v;
|
||
- value_contents (v);
|
||
- value_release_to_mark (mark);
|
||
+ if (!b->val_valid)
|
||
+ {
|
||
+ b->val = v;
|
||
+ b->val_valid = 1;
|
||
+ }
|
||
|
||
/* Look at each value on the value chain. */
|
||
- for (; v; v = next)
|
||
+ for (v = val_chain; v; v = next)
|
||
{
|
||
/* If it's a memory location, and GDB actually needed
|
||
its contents to evaluate the expression, then we
|
||
- must watch it. */
|
||
+ must watch it. If the first value returned is
|
||
+ still lazy, that means an error occurred reading it;
|
||
+ watch it anyway in case it becomes readable. */
|
||
if (VALUE_LVAL (v) == lval_memory
|
||
- && ! value_lazy (v))
|
||
+ && (v == val_chain || ! value_lazy (v)))
|
||
{
|
||
struct type *vtype = check_typedef (value_type (v));
|
||
|
||
/* We only watch structs and arrays if user asked
|
||
for it explicitly, never if they just happen to
|
||
appear in the middle of some value chain. */
|
||
- if (v == b->val
|
||
+ if (v == result
|
||
|| (TYPE_CODE (vtype) != TYPE_CODE_STRUCT
|
||
&& TYPE_CODE (vtype) != TYPE_CODE_ARRAY))
|
||
{
|
||
@@ -1681,6 +1733,7 @@
|
||
if (b->val)
|
||
value_free (b->val);
|
||
b->val = NULL;
|
||
+ b->val_valid = 0;
|
||
}
|
||
break;
|
||
default:
|
||
@@ -2103,6 +2156,17 @@
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
+/* Print out the (old or new) value associated with a watchpoint. */
|
||
+
|
||
+static void
|
||
+watchpoint_value_print (struct value *val, struct ui_file *stream)
|
||
+{
|
||
+ if (val == NULL)
|
||
+ fprintf_unfiltered (stream, _("<unreadable>"));
|
||
+ else
|
||
+ value_print (val, stream, 0, Val_pretty_default);
|
||
+}
|
||
+
|
||
/* This is the normal print function for a bpstat. In the future,
|
||
much of this logic could (should?) be moved to bpstat_stop_status,
|
||
by having it set different print_it values.
|
||
@@ -2221,26 +2285,21 @@
|
||
|
||
case bp_watchpoint:
|
||
case bp_hardware_watchpoint:
|
||
- if (bs->old_val != NULL)
|
||
- {
|
||
- annotate_watchpoint (b->number);
|
||
- if (ui_out_is_mi_like_p (uiout))
|
||
- ui_out_field_string
|
||
- (uiout, "reason",
|
||
- async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER));
|
||
- mention (b);
|
||
- ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value");
|
||
- ui_out_text (uiout, "\nOld value = ");
|
||
- value_print (bs->old_val, stb->stream, 0, Val_pretty_default);
|
||
- ui_out_field_stream (uiout, "old", stb);
|
||
- ui_out_text (uiout, "\nNew value = ");
|
||
- value_print (b->val, stb->stream, 0, Val_pretty_default);
|
||
- ui_out_field_stream (uiout, "new", stb);
|
||
- do_cleanups (ui_out_chain);
|
||
- ui_out_text (uiout, "\n");
|
||
- value_free (bs->old_val);
|
||
- bs->old_val = NULL;
|
||
- }
|
||
+ annotate_watchpoint (b->number);
|
||
+ if (ui_out_is_mi_like_p (uiout))
|
||
+ ui_out_field_string
|
||
+ (uiout, "reason",
|
||
+ async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER));
|
||
+ mention (b);
|
||
+ ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value");
|
||
+ ui_out_text (uiout, "\nOld value = ");
|
||
+ watchpoint_value_print (bs->old_val, stb->stream);
|
||
+ ui_out_field_stream (uiout, "old", stb);
|
||
+ ui_out_text (uiout, "\nNew value = ");
|
||
+ watchpoint_value_print (b->val, stb->stream);
|
||
+ ui_out_field_stream (uiout, "new", stb);
|
||
+ do_cleanups (ui_out_chain);
|
||
+ ui_out_text (uiout, "\n");
|
||
/* More than one watchpoint may have been triggered. */
|
||
return PRINT_UNKNOWN;
|
||
break;
|
||
@@ -2253,7 +2312,7 @@
|
||
mention (b);
|
||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value");
|
||
ui_out_text (uiout, "\nValue = ");
|
||
- value_print (b->val, stb->stream, 0, Val_pretty_default);
|
||
+ watchpoint_value_print (b->val, stb->stream);
|
||
ui_out_field_stream (uiout, "value", stb);
|
||
do_cleanups (ui_out_chain);
|
||
ui_out_text (uiout, "\n");
|
||
@@ -2261,7 +2320,7 @@
|
||
break;
|
||
|
||
case bp_access_watchpoint:
|
||
- if (bs->old_val != NULL)
|
||
+ if (bs->old_val != NULL)
|
||
{
|
||
annotate_watchpoint (b->number);
|
||
if (ui_out_is_mi_like_p (uiout))
|
||
@@ -2271,10 +2330,8 @@
|
||
mention (b);
|
||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value");
|
||
ui_out_text (uiout, "\nOld value = ");
|
||
- value_print (bs->old_val, stb->stream, 0, Val_pretty_default);
|
||
+ watchpoint_value_print (bs->old_val, stb->stream);
|
||
ui_out_field_stream (uiout, "old", stb);
|
||
- value_free (bs->old_val);
|
||
- bs->old_val = NULL;
|
||
ui_out_text (uiout, "\nNew value = ");
|
||
}
|
||
else
|
||
@@ -2287,7 +2344,7 @@
|
||
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value");
|
||
ui_out_text (uiout, "\nValue = ");
|
||
}
|
||
- value_print (b->val, stb->stream, 0,Val_pretty_default);
|
||
+ watchpoint_value_print (b->val, stb->stream);
|
||
ui_out_field_stream (uiout, "new", stb);
|
||
do_cleanups (ui_out_chain);
|
||
ui_out_text (uiout, "\n");
|
||
@@ -2574,13 +2631,20 @@
|
||
we might be in the middle of evaluating a function call. */
|
||
|
||
struct value *mark = value_mark ();
|
||
- struct value *new_val = evaluate_expression (b->exp);
|
||
- if (!value_equal (b->val, new_val))
|
||
+ struct value *new_val;
|
||
+
|
||
+ fetch_watchpoint_value (b->exp, &new_val, NULL, NULL);
|
||
+ if ((b->val != NULL) != (new_val != NULL)
|
||
+ || (b->val != NULL && !value_equal (b->val, new_val)))
|
||
{
|
||
- release_value (new_val);
|
||
- value_free_to_mark (mark);
|
||
+ if (new_val != NULL)
|
||
+ {
|
||
+ release_value (new_val);
|
||
+ value_free_to_mark (mark);
|
||
+ }
|
||
bs->old_val = b->val;
|
||
b->val = new_val;
|
||
+ b->val_valid = 1;
|
||
/* We will stop here */
|
||
return WP_VALUE_CHANGED;
|
||
}
|
||
@@ -5722,10 +5786,9 @@
|
||
exp_end = arg;
|
||
exp_valid_block = innermost_block;
|
||
mark = value_mark ();
|
||
- val = evaluate_expression (exp);
|
||
- release_value (val);
|
||
- if (value_lazy (val))
|
||
- value_fetch_lazy (val);
|
||
+ fetch_watchpoint_value (exp, &val, NULL, NULL);
|
||
+ if (val != NULL)
|
||
+ release_value (val);
|
||
|
||
tok = arg;
|
||
while (*tok == ' ' || *tok == '\t')
|
||
@@ -5814,6 +5877,7 @@
|
||
b->exp_valid_block = exp_valid_block;
|
||
b->exp_string = savestring (exp_start, exp_end - exp_start);
|
||
b->val = val;
|
||
+ b->val_valid = 1;
|
||
b->loc->cond = cond;
|
||
if (cond_start)
|
||
b->cond_string = savestring (cond_start, cond_end - cond_start);
|
||
@@ -7697,11 +7761,11 @@
|
||
if (bpt->val)
|
||
value_free (bpt->val);
|
||
mark = value_mark ();
|
||
- bpt->val = evaluate_expression (bpt->exp);
|
||
- release_value (bpt->val);
|
||
- if (value_lazy (bpt->val))
|
||
- value_fetch_lazy (bpt->val);
|
||
-
|
||
+ fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL);
|
||
+ if (bpt->val)
|
||
+ release_value (bpt->val);
|
||
+ bpt->val_valid = 1;
|
||
+
|
||
if (bpt->type == bp_hardware_watchpoint ||
|
||
bpt->type == bp_read_watchpoint ||
|
||
bpt->type == bp_access_watchpoint)
|
||
diff -Naur gdb-6.8.orig/gdb/breakpoint.h gdb-6.8/gdb/breakpoint.h
|
||
--- gdb-6.8.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100
|
||
+++ gdb-6.8/gdb/breakpoint.h 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -391,8 +391,13 @@
|
||
/* The largest block within which it is valid, or NULL if it is
|
||
valid anywhere (e.g. consists just of global symbols). */
|
||
struct block *exp_valid_block;
|
||
- /* Value of the watchpoint the last time we checked it. */
|
||
+ /* Value of the watchpoint the last time we checked it, or NULL
|
||
+ when we do not know the value yet or the value was not
|
||
+ readable. VAL is never lazy. */
|
||
struct value *val;
|
||
+ /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL,
|
||
+ then an error occurred reading the value. */
|
||
+ int val_valid;
|
||
|
||
/* Holds the address of the related watchpoint_scope breakpoint
|
||
when using watchpoints on local variables (might the concept
|
||
diff -Naur gdb-6.8.orig/gdb/NEWS gdb-6.8/gdb/NEWS
|
||
--- gdb-6.8.orig/gdb/NEWS 2008-03-27 19:14:10.000000000 +0100
|
||
+++ gdb-6.8/gdb/NEWS 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -1,6 +1,9 @@
|
||
What has changed in GDB?
|
||
(Organized release by release)
|
||
|
||
+* Watchpoints can now be set on unreadable memory locations, e.g. addresses
|
||
+which will be allocated using malloc later in program execution.
|
||
+
|
||
*** Changes in GDB 6.8
|
||
|
||
* New native configurations
|
||
diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c
|
||
--- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100
|
||
+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -39,6 +39,8 @@
|
||
|
||
int doread = 0;
|
||
|
||
+char *global_ptr;
|
||
+
|
||
void marker1 ()
|
||
{
|
||
}
|
||
@@ -110,6 +112,14 @@
|
||
return 73;
|
||
}
|
||
|
||
+void
|
||
+func4 ()
|
||
+{
|
||
+ buf[0] = 3;
|
||
+ global_ptr = buf;
|
||
+ buf[0] = 7;
|
||
+}
|
||
+
|
||
int main ()
|
||
{
|
||
#ifdef usestubs
|
||
@@ -185,5 +195,7 @@
|
||
|
||
func3 ();
|
||
|
||
+ func4 ();
|
||
+
|
||
return 0;
|
||
}
|
||
diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp
|
||
--- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100
|
||
+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -645,6 +645,30 @@
|
||
}
|
||
}
|
||
|
||
+proc test_inaccessible_watchpoint {} {
|
||
+ global gdb_prompt
|
||
+
|
||
+ # This is a test for watchpoints on currently inaccessible (but later
|
||
+ # valid) memory.
|
||
+
|
||
+ if [runto func4] then {
|
||
+ gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr"
|
||
+ gdb_test "next" ".*global_ptr = buf.*"
|
||
+ gdb_test_multiple "next" "next over ptr init" {
|
||
+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" {
|
||
+ # We can not test for <unknown> here because NULL may be readable.
|
||
+ # This test does rely on *NULL != 3.
|
||
+ pass "next over ptr init"
|
||
+ }
|
||
+ }
|
||
+ gdb_test_multiple "next" "next over buffer set" {
|
||
+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" {
|
||
+ pass "next over buffer set"
|
||
+ }
|
||
+ }
|
||
+ }
|
||
+}
|
||
+
|
||
# Start with a fresh gdb.
|
||
|
||
gdb_exit
|
||
@@ -797,6 +821,8 @@
|
||
}
|
||
}
|
||
|
||
+ test_inaccessible_watchpoint
|
||
+
|
||
# See above.
|
||
if [istarget "mips-idt-*"] then {
|
||
gdb_exit
|
||
diff -Naur gdb-6.8.orig/sim/common/aclocal.m4 gdb-6.8/sim/common/aclocal.m4
|
||
--- gdb-6.8.orig/sim/common/aclocal.m4 2006-06-13 10:06:48.000000000 +0200
|
||
+++ gdb-6.8/sim/common/aclocal.m4 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -18,7 +18,7 @@
|
||
#
|
||
# SIM_AC_OUTPUT
|
||
|
||
-AC_DEFUN(SIM_AC_COMMON,
|
||
+AC_DEFUN([SIM_AC_COMMON],
|
||
[
|
||
# autoconf.info says this should be called right after AC_INIT.
|
||
AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in)
|
||
@@ -245,7 +245,7 @@
|
||
dnl supported.
|
||
dnl ??? Until there is demonstrable value in doing something more complicated,
|
||
dnl let's not.
|
||
-AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT,
|
||
+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT],
|
||
[
|
||
AC_ARG_ENABLE(sim-environment,
|
||
[ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.],
|
||
@@ -269,7 +269,7 @@
|
||
dnl Without this option all possible alignment restrictions are accommodated.
|
||
dnl arg[1] is hardwired target alignment
|
||
dnl arg[2] is default target alignment
|
||
-AC_DEFUN(SIM_AC_OPTION_ALIGNMENT,
|
||
+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT],
|
||
wire_alignment="[$1]"
|
||
default_alignment="[$2]"
|
||
[
|
||
@@ -318,7 +318,7 @@
|
||
|
||
|
||
dnl Conditionally compile in assertion statements.
|
||
-AC_DEFUN(SIM_AC_OPTION_ASSERT,
|
||
+AC_DEFUN([SIM_AC_OPTION_ASSERT],
|
||
[
|
||
AC_ARG_ENABLE(sim-assert,
|
||
[ --enable-sim-assert Specify whether to perform random assertions.],
|
||
@@ -342,7 +342,7 @@
|
||
dnl arg[3] is the number of bits in an address
|
||
dnl arg[4] is the number of bits in an OpenFirmware cell.
|
||
dnl FIXME: this information should be obtained from bfd/archure
|
||
-AC_DEFUN(SIM_AC_OPTION_BITSIZE,
|
||
+AC_DEFUN([SIM_AC_OPTION_BITSIZE],
|
||
wire_word_bitsize="[$1]"
|
||
wire_word_msb="[$2]"
|
||
wire_address_bitsize="[$3]"
|
||
@@ -408,7 +408,7 @@
|
||
dnl that support both big and little endian targets.
|
||
dnl arg[1] is hardwired target endianness.
|
||
dnl arg[2] is default target endianness.
|
||
-AC_DEFUN(SIM_AC_OPTION_ENDIAN,
|
||
+AC_DEFUN([SIM_AC_OPTION_ENDIAN],
|
||
[
|
||
wire_endian="[$1]"
|
||
default_endian="[$2]"
|
||
@@ -458,7 +458,7 @@
|
||
dnl --enable-sim-hostendian is for users of the simulator when
|
||
dnl they find that AC_C_BIGENDIAN does not function correctly
|
||
dnl (for instance in a canadian cross)
|
||
-AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN,
|
||
+AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN],
|
||
[
|
||
AC_ARG_ENABLE(sim-hostendian,
|
||
[ --enable-sim-hostendian=end Specify host byte endian orientation.],
|
||
@@ -490,7 +490,7 @@
|
||
dnl And optionally the bitsize of the floating point register.
|
||
dnl arg[1] specifies the presence (or absence) of floating point hardware
|
||
dnl arg[2] specifies the number of bits in a floating point register
|
||
-AC_DEFUN(SIM_AC_OPTION_FLOAT,
|
||
+AC_DEFUN([SIM_AC_OPTION_FLOAT],
|
||
[
|
||
default_sim_float="[$1]"
|
||
default_sim_float_bitsize="[$2]"
|
||
@@ -519,7 +519,7 @@
|
||
|
||
|
||
dnl The argument is the default cache size if none is specified.
|
||
-AC_DEFUN(SIM_AC_OPTION_SCACHE,
|
||
+AC_DEFUN([SIM_AC_OPTION_SCACHE],
|
||
[
|
||
default_sim_scache="ifelse([$1],,0,[$1])"
|
||
AC_ARG_ENABLE(sim-scache,
|
||
@@ -539,7 +539,7 @@
|
||
|
||
|
||
dnl The argument is the default model if none is specified.
|
||
-AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL,
|
||
+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL],
|
||
[
|
||
default_sim_default_model="ifelse([$1],,0,[$1])"
|
||
AC_ARG_ENABLE(sim-default-model,
|
||
@@ -559,7 +559,7 @@
|
||
dnl arg[1] Enable sim-hw by default? ("yes" or "no")
|
||
dnl arg[2] is a space separated list of devices that override the defaults
|
||
dnl arg[3] is a space separated list of extra target specific devices.
|
||
-AC_DEFUN(SIM_AC_OPTION_HARDWARE,
|
||
+AC_DEFUN([SIM_AC_OPTION_HARDWARE],
|
||
[
|
||
if test x"[$1]" = x"yes"; then
|
||
sim_hw_p=yes
|
||
@@ -621,7 +621,7 @@
|
||
dnl performance by inlining functions.
|
||
dnl Guarantee that unconfigured simulators do not do any inlining
|
||
sim_inline="-DDEFAULT_INLINE=0"
|
||
-AC_DEFUN(SIM_AC_OPTION_INLINE,
|
||
+AC_DEFUN([SIM_AC_OPTION_INLINE],
|
||
[
|
||
default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])"
|
||
AC_ARG_ENABLE(sim-inline,
|
||
@@ -666,7 +666,7 @@
|
||
AC_SUBST(sim_inline)
|
||
|
||
|
||
-AC_DEFUN(SIM_AC_OPTION_PACKAGES,
|
||
+AC_DEFUN([SIM_AC_OPTION_PACKAGES],
|
||
[
|
||
AC_ARG_ENABLE(sim-packages,
|
||
[ --enable-sim-packages=list Specify the packages to be included in the build.],
|
||
@@ -692,7 +692,7 @@
|
||
AC_SUBST(sim_packages)
|
||
|
||
|
||
-AC_DEFUN(SIM_AC_OPTION_REGPARM,
|
||
+AC_DEFUN([SIM_AC_OPTION_REGPARM],
|
||
[
|
||
AC_ARG_ENABLE(sim-regparm,
|
||
[ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.],
|
||
@@ -709,7 +709,7 @@
|
||
AC_SUBST(sim_regparm)
|
||
|
||
|
||
-AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS,
|
||
+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS],
|
||
[
|
||
default_sim_reserved_bits="ifelse([$1],,1,[$1])"
|
||
AC_ARG_ENABLE(sim-reserved-bits,
|
||
@@ -726,7 +726,7 @@
|
||
AC_SUBST(sim_reserved_bits)
|
||
|
||
|
||
-AC_DEFUN(SIM_AC_OPTION_SMP,
|
||
+AC_DEFUN([SIM_AC_OPTION_SMP],
|
||
[
|
||
default_sim_smp="ifelse([$1],,5,[$1])"
|
||
AC_ARG_ENABLE(sim-smp,
|
||
@@ -746,7 +746,7 @@
|
||
AC_SUBST(sim_smp)
|
||
|
||
|
||
-AC_DEFUN(SIM_AC_OPTION_STDCALL,
|
||
+AC_DEFUN([SIM_AC_OPTION_STDCALL],
|
||
[
|
||
AC_ARG_ENABLE(sim-stdcall,
|
||
[ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.],
|
||
@@ -763,7 +763,7 @@
|
||
AC_SUBST(sim_stdcall)
|
||
|
||
|
||
-AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN,
|
||
+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN],
|
||
[
|
||
default_sim_xor_endian="ifelse([$1],,8,[$1])"
|
||
AC_ARG_ENABLE(sim-xor-endian,
|
||
@@ -782,7 +782,7 @@
|
||
|
||
dnl --enable-build-warnings is for developers of the simulator.
|
||
dnl it enables extra GCC specific warnings.
|
||
-AC_DEFUN(SIM_AC_OPTION_WARNINGS,
|
||
+AC_DEFUN([SIM_AC_OPTION_WARNINGS],
|
||
[
|
||
# NOTE: Don't add -Wall or -Wunused, they both include
|
||
# -Wunused-parameter which reports bogus warnings.
|
||
@@ -866,7 +866,7 @@
|
||
dnl one afterwards. The two pieces of the common fragment are inserted into
|
||
dnl the target's fragment at the appropriate points.
|
||
|
||
-AC_DEFUN(SIM_AC_OUTPUT,
|
||
+AC_DEFUN([SIM_AC_OUTPUT],
|
||
[
|
||
AC_LINK_FILES($sim_link_files, $sim_link_links)
|
||
dnl Make @cgen_breaks@ non-null only if the sim uses CGEN.
|
||
@@ -895,7 +895,7 @@
|
||
sinclude(../../config/gettext-sister.m4)
|
||
|
||
dnl --enable-cgen-maint support
|
||
-AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT,
|
||
+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT],
|
||
[
|
||
cgen_maint=no
|
||
dnl Default is to use one in build tree.
|
||
diff -Naur gdb-6.8.orig/sim/common/gentmap.c gdb-6.8/sim/common/gentmap.c
|
||
--- gdb-6.8.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100
|
||
+++ gdb-6.8/sim/common/gentmap.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -2,6 +2,7 @@
|
||
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
+#include <string.h>
|
||
|
||
struct tdefs {
|
||
char *symbol;
|
||
diff -Naur gdb-6.8.orig/sim/common/sim-signal.c gdb-6.8/sim/common/sim-signal.c
|
||
--- gdb-6.8.orig/sim/common/sim-signal.c 2008-01-01 23:53:23.000000000 +0100
|
||
+++ gdb-6.8/sim/common/sim-signal.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -26,7 +26,7 @@
|
||
to not think the process has died (so it can be debugged at the point of
|
||
failure). */
|
||
|
||
-#ifdef _MSC_VER
|
||
+#ifdef _WIN32
|
||
#ifndef SIGTRAP
|
||
#define SIGTRAP 5
|
||
#endif
|
||
diff -Naur gdb-6.8.orig/sim/erc32/configure gdb-6.8/sim/erc32/configure
|
||
--- gdb-6.8.orig/sim/erc32/configure 2006-12-20 23:35:51.000000000 +0100
|
||
+++ gdb-6.8/sim/erc32/configure 2009-09-23 18:04:46.000000000 +0200
|
||
@@ -1,81 +1,413 @@
|
||
#! /bin/sh
|
||
# Guess values for system-dependent variables and create Makefiles.
|
||
-# Generated by GNU Autoconf 2.59.
|
||
+# Generated by GNU Autoconf 2.64.
|
||
+#
|
||
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
|
||
+# Foundation, Inc.
|
||
#
|
||
-# Copyright (C) 2003 Free Software Foundation, Inc.
|
||
# This configure script is free software; the Free Software Foundation
|
||
# gives unlimited permission to copy, distribute and modify it.
|
||
-## --------------------- ##
|
||
-## M4sh Initialization. ##
|
||
-## --------------------- ##
|
||
+## -------------------- ##
|
||
+## M4sh Initialization. ##
|
||
+## -------------------- ##
|
||
|
||
-# Be Bourne compatible
|
||
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||
+# Be more Bourne compatible
|
||
+DUALCASE=1; export DUALCASE # for MKS sh
|
||
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
||
emulate sh
|
||
NULLCMD=:
|
||
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
||
# is contrary to our usage. Disable this feature.
|
||
alias -g '${1+"$@"}'='"$@"'
|
||
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
||
- set -o posix
|
||
+ setopt NO_GLOB_SUBST
|
||
+else
|
||
+ case `(set -o) 2>/dev/null` in #(
|
||
+ *posix*) :
|
||
+ set -o posix ;; #(
|
||
+ *) :
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-DUALCASE=1; export DUALCASE # for MKS sh
|
||
|
||
-# Support unset when possible.
|
||
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
||
- as_unset=unset
|
||
-else
|
||
- as_unset=false
|
||
+
|
||
+as_nl='
|
||
+'
|
||
+export as_nl
|
||
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
||
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
||
+# but without wasting forks for bash or zsh.
|
||
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
||
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
||
+ as_echo='print -r --'
|
||
+ as_echo_n='print -rn --'
|
||
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
||
+ as_echo='printf %s\n'
|
||
+ as_echo_n='printf %s'
|
||
+else
|
||
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
||
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
||
+ as_echo_n='/usr/ucb/echo -n'
|
||
+ else
|
||
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
||
+ as_echo_n_body='eval
|
||
+ arg=$1;
|
||
+ case $arg in #(
|
||
+ *"$as_nl"*)
|
||
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
||
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
||
+ esac;
|
||
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
||
+ '
|
||
+ export as_echo_n_body
|
||
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
||
+ fi
|
||
+ export as_echo_body
|
||
+ as_echo='sh -c $as_echo_body as_echo'
|
||
+fi
|
||
+
|
||
+# The user is always right.
|
||
+if test "${PATH_SEPARATOR+set}" != set; then
|
||
+ PATH_SEPARATOR=:
|
||
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
||
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
||
+ PATH_SEPARATOR=';'
|
||
+ }
|
||
fi
|
||
|
||
|
||
-# Work around bugs in pre-3.0 UWIN ksh.
|
||
-$as_unset ENV MAIL MAILPATH
|
||
+# IFS
|
||
+# We need space, tab and new line, in precisely that order. Quoting is
|
||
+# there to prevent editors from complaining about space-tab.
|
||
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
||
+# splitting by setting IFS to empty value.)
|
||
+IFS=" "" $as_nl"
|
||
+
|
||
+# Find who we are. Look in the path if we contain no directory separator.
|
||
+case $0 in #((
|
||
+ *[\\/]* ) as_myself=$0 ;;
|
||
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+ ;;
|
||
+esac
|
||
+# We did not find ourselves, most probably we were run as `sh COMMAND'
|
||
+# in which case we are not to be found in the path.
|
||
+if test "x$as_myself" = x; then
|
||
+ as_myself=$0
|
||
+fi
|
||
+if test ! -f "$as_myself"; then
|
||
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
||
+ exit 1
|
||
+fi
|
||
+
|
||
+# Unset variables that we do not need and which cause bugs (e.g. in
|
||
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
||
+# suppresses any "Segmentation fault" message there. '((' could
|
||
+# trigger a bug in pdksh 5.2.14.
|
||
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
||
+do eval test x\${$as_var+set} = xset \
|
||
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
||
+done
|
||
PS1='$ '
|
||
PS2='> '
|
||
PS4='+ '
|
||
|
||
# NLS nuisances.
|
||
-for as_var in \
|
||
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||
- LC_TELEPHONE LC_TIME
|
||
+LC_ALL=C
|
||
+export LC_ALL
|
||
+LANGUAGE=C
|
||
+export LANGUAGE
|
||
+
|
||
+# CDPATH.
|
||
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||
+
|
||
+if test "x$CONFIG_SHELL" = x; then
|
||
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
||
+ emulate sh
|
||
+ NULLCMD=:
|
||
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
|
||
+ # is contrary to our usage. Disable this feature.
|
||
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
||
+ setopt NO_GLOB_SUBST
|
||
+else
|
||
+ case \`(set -o) 2>/dev/null\` in #(
|
||
+ *posix*) :
|
||
+ set -o posix ;; #(
|
||
+ *) :
|
||
+ ;;
|
||
+esac
|
||
+fi
|
||
+"
|
||
+ as_required="as_fn_return () { (exit \$1); }
|
||
+as_fn_success () { as_fn_return 0; }
|
||
+as_fn_failure () { as_fn_return 1; }
|
||
+as_fn_ret_success () { return 0; }
|
||
+as_fn_ret_failure () { return 1; }
|
||
+
|
||
+exitcode=0
|
||
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
|
||
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
|
||
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
|
||
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
|
||
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
|
||
+
|
||
+else
|
||
+ exitcode=1; echo positional parameters were not saved.
|
||
+fi
|
||
+test x\$exitcode = x0 || exit 1"
|
||
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
||
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
||
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
||
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
|
||
+test \$(( 1 + 1 )) = 2 || exit 1"
|
||
+ if (eval "$as_required") 2>/dev/null; then :
|
||
+ as_have_required=yes
|
||
+else
|
||
+ as_have_required=no
|
||
+fi
|
||
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
|
||
+
|
||
+else
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+as_found=false
|
||
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
||
do
|
||
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
||
- eval $as_var=C; export $as_var
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ as_found=:
|
||
+ case $as_dir in #(
|
||
+ /*)
|
||
+ for as_base in sh bash ksh sh5; do
|
||
+ # Try only shells that exist, to save several forks.
|
||
+ as_shell=$as_dir/$as_base
|
||
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
||
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
||
+ CONFIG_SHELL=$as_shell as_have_required=yes
|
||
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
|
||
+ break 2
|
||
+fi
|
||
+fi
|
||
+ done;;
|
||
+ esac
|
||
+ as_found=false
|
||
+done
|
||
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
|
||
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
|
||
+ CONFIG_SHELL=$SHELL as_have_required=yes
|
||
+fi; }
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+
|
||
+ if test "x$CONFIG_SHELL" != x; then :
|
||
+ # We cannot yet assume a decent shell, so we have to provide a
|
||
+ # neutralization value for shells without unset; and this also
|
||
+ # works around shells that cannot unset nonexistent variables.
|
||
+ BASH_ENV=/dev/null
|
||
+ ENV=/dev/null
|
||
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
||
+ export CONFIG_SHELL
|
||
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
|
||
+fi
|
||
+
|
||
+ if test x$as_have_required = xno; then :
|
||
+ $as_echo "$0: This script requires a shell more modern than all"
|
||
+ $as_echo "$0: the shells that I found on your system."
|
||
+ if test x${ZSH_VERSION+set} = xset ; then
|
||
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
|
||
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
||
else
|
||
- $as_unset $as_var
|
||
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
|
||
+$0: including any error possibly output before this
|
||
+$0: message. Then install a modern shell, or manually run
|
||
+$0: the script under such a shell if you do have one."
|
||
fi
|
||
-done
|
||
+ exit 1
|
||
+fi
|
||
+fi
|
||
+fi
|
||
+SHELL=${CONFIG_SHELL-/bin/sh}
|
||
+export SHELL
|
||
+# Unset more variables known to interfere with behavior of common tools.
|
||
+CLICOLOR_FORCE= GREP_OPTIONS=
|
||
+unset CLICOLOR_FORCE GREP_OPTIONS
|
||
+
|
||
+## --------------------- ##
|
||
+## M4sh Shell Functions. ##
|
||
+## --------------------- ##
|
||
+# as_fn_unset VAR
|
||
+# ---------------
|
||
+# Portably unset VAR.
|
||
+as_fn_unset ()
|
||
+{
|
||
+ { eval $1=; unset $1;}
|
||
+}
|
||
+as_unset=as_fn_unset
|
||
+
|
||
+# as_fn_set_status STATUS
|
||
+# -----------------------
|
||
+# Set $? to STATUS, without forking.
|
||
+as_fn_set_status ()
|
||
+{
|
||
+ return $1
|
||
+} # as_fn_set_status
|
||
+
|
||
+# as_fn_exit STATUS
|
||
+# -----------------
|
||
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
||
+as_fn_exit ()
|
||
+{
|
||
+ set +e
|
||
+ as_fn_set_status $1
|
||
+ exit $1
|
||
+} # as_fn_exit
|
||
+
|
||
+# as_fn_mkdir_p
|
||
+# -------------
|
||
+# Create "$as_dir" as a directory, including parents if necessary.
|
||
+as_fn_mkdir_p ()
|
||
+{
|
||
+
|
||
+ case $as_dir in #(
|
||
+ -*) as_dir=./$as_dir;;
|
||
+ esac
|
||
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
||
+ as_dirs=
|
||
+ while :; do
|
||
+ case $as_dir in #(
|
||
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
||
+ *) as_qdir=$as_dir;;
|
||
+ esac
|
||
+ as_dirs="'$as_qdir' $as_dirs"
|
||
+ as_dir=`$as_dirname -- "$as_dir" ||
|
||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
+ X"$as_dir" : 'X\(//\)$' \| \
|
||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X"$as_dir" |
|
||
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)[^/].*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\).*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ s/.*/./; q'`
|
||
+ test -d "$as_dir" && break
|
||
+ done
|
||
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
||
+
|
||
+
|
||
+} # as_fn_mkdir_p
|
||
+# as_fn_append VAR VALUE
|
||
+# ----------------------
|
||
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
||
+# advantage of any shell optimizations that allow amortized linear growth over
|
||
+# repeated appends, instead of the typical quadratic growth present in naive
|
||
+# implementations.
|
||
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
||
+ eval 'as_fn_append ()
|
||
+ {
|
||
+ eval $1+=\$2
|
||
+ }'
|
||
+else
|
||
+ as_fn_append ()
|
||
+ {
|
||
+ eval $1=\$$1\$2
|
||
+ }
|
||
+fi # as_fn_append
|
||
+
|
||
+# as_fn_arith ARG...
|
||
+# ------------------
|
||
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
||
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
||
+# must be portable across $(()) and expr.
|
||
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
||
+ eval 'as_fn_arith ()
|
||
+ {
|
||
+ as_val=$(( $* ))
|
||
+ }'
|
||
+else
|
||
+ as_fn_arith ()
|
||
+ {
|
||
+ as_val=`expr "$@" || test $? -eq 1`
|
||
+ }
|
||
+fi # as_fn_arith
|
||
+
|
||
|
||
-# Required to use basename.
|
||
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
||
+# as_fn_error ERROR [LINENO LOG_FD]
|
||
+# ---------------------------------
|
||
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||
+# script with status $?, using 1 if that was 0.
|
||
+as_fn_error ()
|
||
+{
|
||
+ as_status=$?; test $as_status -eq 0 && as_status=1
|
||
+ if test "$3"; then
|
||
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
||
+ fi
|
||
+ $as_echo "$as_me: error: $1" >&2
|
||
+ as_fn_exit $as_status
|
||
+} # as_fn_error
|
||
+
|
||
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
||
as_expr=expr
|
||
else
|
||
as_expr=false
|
||
fi
|
||
|
||
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
||
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
||
as_basename=basename
|
||
else
|
||
as_basename=false
|
||
fi
|
||
|
||
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
||
+ as_dirname=dirname
|
||
+else
|
||
+ as_dirname=false
|
||
+fi
|
||
|
||
-# Name of the executable.
|
||
-as_me=`$as_basename "$0" ||
|
||
+as_me=`$as_basename -- "$0" ||
|
||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||
X"$0" : 'X\(//\)$' \| \
|
||
- X"$0" : 'X\(/\)$' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X/"$0" |
|
||
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
||
- /^X\/\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\/\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X/"$0" |
|
||
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\/\(\/\/\)$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\/\(\/\).*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ s/.*/./; q'`
|
||
|
||
-
|
||
-# PATH needs CR, and LINENO needs CR and PATH.
|
||
# Avoid depending upon Character Ranges.
|
||
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
||
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||
@@ -83,146 +415,107 @@
|
||
as_cr_digits='0123456789'
|
||
as_cr_alnum=$as_cr_Letters$as_cr_digits
|
||
|
||
-# The user is always right.
|
||
-if test "${PATH_SEPARATOR+set}" != set; then
|
||
- echo "#! /bin/sh" >conf$$.sh
|
||
- echo "exit 0" >>conf$$.sh
|
||
- chmod +x conf$$.sh
|
||
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||
- PATH_SEPARATOR=';'
|
||
- else
|
||
- PATH_SEPARATOR=:
|
||
- fi
|
||
- rm -f conf$$.sh
|
||
-fi
|
||
-
|
||
-
|
||
- as_lineno_1=$LINENO
|
||
- as_lineno_2=$LINENO
|
||
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
||
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
||
- test "x$as_lineno_3" = "x$as_lineno_2" || {
|
||
- # Find who we are. Look in the path if we contain no path at all
|
||
- # relative or not.
|
||
- case $0 in
|
||
- *[\\/]* ) as_myself=$0 ;;
|
||
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
||
-done
|
||
-
|
||
- ;;
|
||
- esac
|
||
- # We did not find ourselves, most probably we were run as `sh COMMAND'
|
||
- # in which case we are not to be found in the path.
|
||
- if test "x$as_myself" = x; then
|
||
- as_myself=$0
|
||
- fi
|
||
- if test ! -f "$as_myself"; then
|
||
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- fi
|
||
- case $CONFIG_SHELL in
|
||
- '')
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for as_base in sh bash ksh sh5; do
|
||
- case $as_dir in
|
||
- /*)
|
||
- if ("$as_dir/$as_base" -c '
|
||
- as_lineno_1=$LINENO
|
||
- as_lineno_2=$LINENO
|
||
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
||
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
||
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
||
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
||
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
||
- CONFIG_SHELL=$as_dir/$as_base
|
||
- export CONFIG_SHELL
|
||
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
||
- fi;;
|
||
- esac
|
||
- done
|
||
-done
|
||
-;;
|
||
- esac
|
||
|
||
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
||
- # uniformly replaced by the line number. The first 'sed' inserts a
|
||
- # line-number line before each line; the second 'sed' does the real
|
||
- # work. The second script uses 'N' to pair each line-number line
|
||
- # with the numbered line, and appends trailing '-' during
|
||
- # substitution so that $LINENO is not a special case at line end.
|
||
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
||
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
||
- sed '=' <$as_myself |
|
||
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
|
||
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
|
||
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
|
||
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
|
||
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
|
||
+ sed -n '
|
||
+ p
|
||
+ /[$]LINENO/=
|
||
+ ' <$as_myself |
|
||
sed '
|
||
+ s/[$]LINENO.*/&-/
|
||
+ t lineno
|
||
+ b
|
||
+ :lineno
|
||
N
|
||
- s,$,-,
|
||
- : loop
|
||
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
||
+ :loop
|
||
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
||
t loop
|
||
- s,-$,,
|
||
- s,^['$as_cr_digits']*\n,,
|
||
+ s/-\n.*//
|
||
' >$as_me.lineno &&
|
||
- chmod +x $as_me.lineno ||
|
||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
+ chmod +x "$as_me.lineno" ||
|
||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
||
|
||
# Don't try to exec as it changes $[0], causing all sort of problems
|
||
# (the dirname of $[0] is not the place where we might find the
|
||
- # original and so on. Autoconf is especially sensible to this).
|
||
- . ./$as_me.lineno
|
||
+ # original and so on. Autoconf is especially sensitive to this).
|
||
+ . "./$as_me.lineno"
|
||
# Exit status is that of the last command.
|
||
exit
|
||
}
|
||
|
||
-
|
||
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
|
||
- *c*,-n*) ECHO_N= ECHO_C='
|
||
-' ECHO_T=' ' ;;
|
||
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
|
||
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
|
||
+ECHO_C= ECHO_N= ECHO_T=
|
||
+case `echo -n x` in #(((((
|
||
+-n*)
|
||
+ case `echo 'xy\c'` in
|
||
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
||
+ xy) ECHO_C='\c';;
|
||
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
||
+ ECHO_T=' ';;
|
||
+ esac;;
|
||
+*)
|
||
+ ECHO_N='-n';;
|
||
esac
|
||
|
||
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
||
- as_expr=expr
|
||
+rm -f conf$$ conf$$.exe conf$$.file
|
||
+if test -d conf$$.dir; then
|
||
+ rm -f conf$$.dir/conf$$.file
|
||
else
|
||
- as_expr=false
|
||
+ rm -f conf$$.dir
|
||
+ mkdir conf$$.dir 2>/dev/null
|
||
fi
|
||
-
|
||
-rm -f conf$$ conf$$.exe conf$$.file
|
||
-echo >conf$$.file
|
||
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
- # We could just check for DJGPP; but this test a) works b) is more generic
|
||
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
|
||
- if test -f conf$$.exe; then
|
||
- # Don't use ln at all; we don't have any links
|
||
- as_ln_s='cp -p'
|
||
- else
|
||
+if (echo >conf$$.file) 2>/dev/null; then
|
||
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
as_ln_s='ln -s'
|
||
+ # ... but there are two gotchas:
|
||
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||
+ # In both cases, we have to default to `cp -p'.
|
||
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||
+ as_ln_s='cp -p'
|
||
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
+ as_ln_s=ln
|
||
+ else
|
||
+ as_ln_s='cp -p'
|
||
fi
|
||
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
- as_ln_s=ln
|
||
else
|
||
as_ln_s='cp -p'
|
||
fi
|
||
-rm -f conf$$ conf$$.exe conf$$.file
|
||
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
||
+rmdir conf$$.dir 2>/dev/null
|
||
|
||
if mkdir -p . 2>/dev/null; then
|
||
- as_mkdir_p=:
|
||
+ as_mkdir_p='mkdir -p "$as_dir"'
|
||
else
|
||
test -d ./-p && rmdir ./-p
|
||
as_mkdir_p=false
|
||
fi
|
||
|
||
-as_executable_p="test -f"
|
||
+if test -x / >/dev/null 2>&1; then
|
||
+ as_test_x='test -x'
|
||
+else
|
||
+ if ls -dL / >/dev/null 2>&1; then
|
||
+ as_ls_L_option=L
|
||
+ else
|
||
+ as_ls_L_option=
|
||
+ fi
|
||
+ as_test_x='
|
||
+ eval sh -c '\''
|
||
+ if test -d "$1"; then
|
||
+ test -d "$1/.";
|
||
+ else
|
||
+ case $1 in #(
|
||
+ -*)set "./$1";;
|
||
+ esac;
|
||
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
||
+ ???[sx]*):;;*)false;;esac;fi
|
||
+ '\'' sh
|
||
+ '
|
||
+fi
|
||
+as_executable_p=$as_test_x
|
||
|
||
# Sed expression to map a string onto a valid CPP name.
|
||
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
||
@@ -231,38 +524,24 @@
|
||
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
||
|
||
|
||
-# IFS
|
||
-# We need space, tab and new line, in precisely that order.
|
||
-as_nl='
|
||
-'
|
||
-IFS=" $as_nl"
|
||
-
|
||
-# CDPATH.
|
||
-$as_unset CDPATH
|
||
-
|
||
+exec 7<&0 </dev/null 6>&1
|
||
|
||
# Name of the host.
|
||
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
|
||
# so uname gets run too.
|
||
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
|
||
|
||
-exec 6>&1
|
||
-
|
||
#
|
||
# Initializations.
|
||
#
|
||
ac_default_prefix=/usr/local
|
||
+ac_clean_files=
|
||
ac_config_libobj_dir=.
|
||
+LIBOBJS=
|
||
cross_compiling=no
|
||
subdirs=
|
||
MFLAGS=
|
||
MAKEFLAGS=
|
||
-SHELL=${CONFIG_SHELL-/bin/sh}
|
||
-
|
||
-# Maximum number of lines to put in a shell here document.
|
||
-# This variable seems obsolete. It should probably be removed, and
|
||
-# only ac_max_sed_lines should be used.
|
||
-: ${ac_max_here_lines=38}
|
||
|
||
# Identity of this package.
|
||
PACKAGE_NAME=
|
||
@@ -270,51 +549,186 @@
|
||
PACKAGE_VERSION=
|
||
PACKAGE_STRING=
|
||
PACKAGE_BUGREPORT=
|
||
+PACKAGE_URL=
|
||
|
||
ac_unique_file="Makefile.in"
|
||
# Factoring default headers for most tests.
|
||
ac_includes_default="\
|
||
#include <stdio.h>
|
||
-#if HAVE_SYS_TYPES_H
|
||
+#ifdef HAVE_SYS_TYPES_H
|
||
# include <sys/types.h>
|
||
#endif
|
||
-#if HAVE_SYS_STAT_H
|
||
+#ifdef HAVE_SYS_STAT_H
|
||
# include <sys/stat.h>
|
||
#endif
|
||
-#if STDC_HEADERS
|
||
+#ifdef STDC_HEADERS
|
||
# include <stdlib.h>
|
||
# include <stddef.h>
|
||
#else
|
||
-# if HAVE_STDLIB_H
|
||
+# ifdef HAVE_STDLIB_H
|
||
# include <stdlib.h>
|
||
# endif
|
||
#endif
|
||
-#if HAVE_STRING_H
|
||
-# if !STDC_HEADERS && HAVE_MEMORY_H
|
||
+#ifdef HAVE_STRING_H
|
||
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
||
# include <memory.h>
|
||
# endif
|
||
# include <string.h>
|
||
#endif
|
||
-#if HAVE_STRINGS_H
|
||
+#ifdef HAVE_STRINGS_H
|
||
# include <strings.h>
|
||
#endif
|
||
-#if HAVE_INTTYPES_H
|
||
+#ifdef HAVE_INTTYPES_H
|
||
# include <inttypes.h>
|
||
-#else
|
||
-# if HAVE_STDINT_H
|
||
-# include <stdint.h>
|
||
-# endif
|
||
#endif
|
||
-#if HAVE_UNISTD_H
|
||
+#ifdef HAVE_STDINT_H
|
||
+# include <stdint.h>
|
||
+#endif
|
||
+#ifdef HAVE_UNISTD_H
|
||
# include <unistd.h>
|
||
#endif"
|
||
|
||
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS'
|
||
+ac_subst_vars='LTLIBOBJS
|
||
+LIBOBJS
|
||
+cgen_breaks
|
||
+READLINE_CFLAGS
|
||
+READLINE_DEPS
|
||
+READLINE
|
||
+sim_profile
|
||
+sim_trace
|
||
+sim_stdio
|
||
+sim_debug
|
||
+sim_cflags
|
||
+sim_bswap
|
||
+MAINT
|
||
+EGREP
|
||
+GREP
|
||
+CPP
|
||
+CATOBJEXT
|
||
+GENCAT
|
||
+INSTOBJEXT
|
||
+DATADIRNAME
|
||
+CATALOGS
|
||
+POSUB
|
||
+GMSGFMT
|
||
+XGETTEXT
|
||
+INCINTL
|
||
+LIBINTL_DEP
|
||
+LIBINTL
|
||
+USE_NLS
|
||
+RANLIB
|
||
+AR
|
||
+HDEFINES
|
||
+CC_FOR_BUILD
|
||
+INSTALL_DATA
|
||
+INSTALL_SCRIPT
|
||
+INSTALL_PROGRAM
|
||
+OBJEXT
|
||
+EXEEXT
|
||
+ac_ct_CC
|
||
+CPPFLAGS
|
||
+LDFLAGS
|
||
+CFLAGS
|
||
+CC
|
||
+target_os
|
||
+target_vendor
|
||
+target_cpu
|
||
+target
|
||
+host_os
|
||
+host_vendor
|
||
+host_cpu
|
||
+host
|
||
+build_os
|
||
+build_vendor
|
||
+build_cpu
|
||
+build
|
||
+WERROR_CFLAGS
|
||
+WARN_CFLAGS
|
||
+sim_xor_endian
|
||
+sim_stdcall
|
||
+sim_smp
|
||
+sim_reserved_bits
|
||
+sim_regparm
|
||
+sim_packages
|
||
+sim_inline
|
||
+sim_hw
|
||
+sim_hw_objs
|
||
+sim_hw_cflags
|
||
+sim_default_model
|
||
+sim_scache
|
||
+sim_float
|
||
+sim_hostendian
|
||
+sim_endian
|
||
+sim_bitsize
|
||
+sim_assert
|
||
+sim_alignment
|
||
+sim_environment
|
||
+target_alias
|
||
+host_alias
|
||
+build_alias
|
||
+LIBS
|
||
+ECHO_T
|
||
+ECHO_N
|
||
+ECHO_C
|
||
+DEFS
|
||
+mandir
|
||
+localedir
|
||
+libdir
|
||
+psdir
|
||
+pdfdir
|
||
+dvidir
|
||
+htmldir
|
||
+infodir
|
||
+docdir
|
||
+oldincludedir
|
||
+includedir
|
||
+localstatedir
|
||
+sharedstatedir
|
||
+sysconfdir
|
||
+datadir
|
||
+datarootdir
|
||
+libexecdir
|
||
+sbindir
|
||
+bindir
|
||
+program_transform_name
|
||
+prefix
|
||
+exec_prefix
|
||
+PACKAGE_URL
|
||
+PACKAGE_BUGREPORT
|
||
+PACKAGE_STRING
|
||
+PACKAGE_VERSION
|
||
+PACKAGE_TARNAME
|
||
+PACKAGE_NAME
|
||
+PATH_SEPARATOR
|
||
+SHELL'
|
||
ac_subst_files=''
|
||
+ac_user_opts='
|
||
+enable_option_checking
|
||
+enable_maintainer_mode
|
||
+enable_sim_bswap
|
||
+enable_sim_cflags
|
||
+enable_sim_debug
|
||
+enable_sim_stdio
|
||
+enable_sim_trace
|
||
+enable_sim_profile
|
||
+with_system_readline
|
||
+'
|
||
+ ac_precious_vars='build_alias
|
||
+host_alias
|
||
+target_alias
|
||
+CC
|
||
+CFLAGS
|
||
+LDFLAGS
|
||
+LIBS
|
||
+CPPFLAGS
|
||
+CPP'
|
||
+
|
||
|
||
# Initialize some variables set by options.
|
||
ac_init_help=
|
||
ac_init_version=false
|
||
+ac_unrecognized_opts=
|
||
+ac_unrecognized_sep=
|
||
# The variables have the same names as the options, with
|
||
# dashes changed to underlines.
|
||
cache_file=/dev/null
|
||
@@ -337,34 +751,48 @@
|
||
# and all the variables that are supposed to be based on exec_prefix
|
||
# by default will actually change.
|
||
# Use braces instead of parens because sh, perl, etc. also accept them.
|
||
+# (The list follows the same order as the GNU Coding Standards.)
|
||
bindir='${exec_prefix}/bin'
|
||
sbindir='${exec_prefix}/sbin'
|
||
libexecdir='${exec_prefix}/libexec'
|
||
-datadir='${prefix}/share'
|
||
+datarootdir='${prefix}/share'
|
||
+datadir='${datarootdir}'
|
||
sysconfdir='${prefix}/etc'
|
||
sharedstatedir='${prefix}/com'
|
||
localstatedir='${prefix}/var'
|
||
-libdir='${exec_prefix}/lib'
|
||
includedir='${prefix}/include'
|
||
oldincludedir='/usr/include'
|
||
-infodir='${prefix}/info'
|
||
-mandir='${prefix}/man'
|
||
+docdir='${datarootdir}/doc/${PACKAGE}'
|
||
+infodir='${datarootdir}/info'
|
||
+htmldir='${docdir}'
|
||
+dvidir='${docdir}'
|
||
+pdfdir='${docdir}'
|
||
+psdir='${docdir}'
|
||
+libdir='${exec_prefix}/lib'
|
||
+localedir='${datarootdir}/locale'
|
||
+mandir='${datarootdir}/man'
|
||
|
||
ac_prev=
|
||
+ac_dashdash=
|
||
for ac_option
|
||
do
|
||
# If the previous option needs an argument, assign it.
|
||
if test -n "$ac_prev"; then
|
||
- eval "$ac_prev=\$ac_option"
|
||
+ eval $ac_prev=\$ac_option
|
||
ac_prev=
|
||
continue
|
||
fi
|
||
|
||
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
|
||
+ case $ac_option in
|
||
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
|
||
+ *) ac_optarg=yes ;;
|
||
+ esac
|
||
|
||
# Accept the important Cygnus configure options, so we can diagnose typos.
|
||
|
||
- case $ac_option in
|
||
+ case $ac_dashdash$ac_option in
|
||
+ --)
|
||
+ ac_dashdash=yes ;;
|
||
|
||
-bindir | --bindir | --bindi | --bind | --bin | --bi)
|
||
ac_prev=bindir ;;
|
||
@@ -386,33 +814,59 @@
|
||
--config-cache | -C)
|
||
cache_file=config.cache ;;
|
||
|
||
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
|
||
+ -datadir | --datadir | --datadi | --datad)
|
||
ac_prev=datadir ;;
|
||
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
|
||
- | --da=*)
|
||
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
|
||
datadir=$ac_optarg ;;
|
||
|
||
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
|
||
+ | --dataroo | --dataro | --datar)
|
||
+ ac_prev=datarootdir ;;
|
||
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
|
||
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
|
||
+ datarootdir=$ac_optarg ;;
|
||
+
|
||
-disable-* | --disable-*)
|
||
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
||
- eval "enable_$ac_feature=no" ;;
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ as_fn_error "invalid feature name: $ac_useropt"
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"enable_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
+ esac
|
||
+ eval enable_$ac_useropt=no ;;
|
||
+
|
||
+ -docdir | --docdir | --docdi | --doc | --do)
|
||
+ ac_prev=docdir ;;
|
||
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
|
||
+ docdir=$ac_optarg ;;
|
||
+
|
||
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
|
||
+ ac_prev=dvidir ;;
|
||
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
|
||
+ dvidir=$ac_optarg ;;
|
||
|
||
-enable-* | --enable-*)
|
||
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
|
||
- case $ac_option in
|
||
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
||
- *) ac_optarg=yes ;;
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ as_fn_error "invalid feature name: $ac_useropt"
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"enable_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
esac
|
||
- eval "enable_$ac_feature='$ac_optarg'" ;;
|
||
+ eval enable_$ac_useropt=\$ac_optarg ;;
|
||
|
||
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
|
||
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
|
||
@@ -439,6 +893,12 @@
|
||
-host=* | --host=* | --hos=* | --ho=*)
|
||
host_alias=$ac_optarg ;;
|
||
|
||
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
|
||
+ ac_prev=htmldir ;;
|
||
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
|
||
+ | --ht=*)
|
||
+ htmldir=$ac_optarg ;;
|
||
+
|
||
-includedir | --includedir | --includedi | --included | --include \
|
||
| --includ | --inclu | --incl | --inc)
|
||
ac_prev=includedir ;;
|
||
@@ -463,13 +923,16 @@
|
||
| --libexe=* | --libex=* | --libe=*)
|
||
libexecdir=$ac_optarg ;;
|
||
|
||
+ -localedir | --localedir | --localedi | --localed | --locale)
|
||
+ ac_prev=localedir ;;
|
||
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
|
||
+ localedir=$ac_optarg ;;
|
||
+
|
||
-localstatedir | --localstatedir | --localstatedi | --localstated \
|
||
- | --localstate | --localstat | --localsta | --localst \
|
||
- | --locals | --local | --loca | --loc | --lo)
|
||
+ | --localstate | --localstat | --localsta | --localst | --locals)
|
||
ac_prev=localstatedir ;;
|
||
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
|
||
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
|
||
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
|
||
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
|
||
localstatedir=$ac_optarg ;;
|
||
|
||
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
|
||
@@ -534,6 +997,16 @@
|
||
| --progr-tra=* | --program-tr=* | --program-t=*)
|
||
program_transform_name=$ac_optarg ;;
|
||
|
||
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
|
||
+ ac_prev=pdfdir ;;
|
||
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
|
||
+ pdfdir=$ac_optarg ;;
|
||
+
|
||
+ -psdir | --psdir | --psdi | --psd | --ps)
|
||
+ ac_prev=psdir ;;
|
||
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
|
||
+ psdir=$ac_optarg ;;
|
||
+
|
||
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
||
| -silent | --silent | --silen | --sile | --sil)
|
||
silent=yes ;;
|
||
@@ -584,26 +1057,36 @@
|
||
ac_init_version=: ;;
|
||
|
||
-with-* | --with-*)
|
||
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- ac_package=`echo $ac_package| sed 's/-/_/g'`
|
||
- case $ac_option in
|
||
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
|
||
- *) ac_optarg=yes ;;
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ as_fn_error "invalid package name: $ac_useropt"
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"with_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
esac
|
||
- eval "with_$ac_package='$ac_optarg'" ;;
|
||
+ eval with_$ac_useropt=\$ac_optarg ;;
|
||
|
||
-without-* | --without-*)
|
||
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid package name: $ac_package" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- ac_package=`echo $ac_package | sed 's/-/_/g'`
|
||
- eval "with_$ac_package=no" ;;
|
||
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
||
+ as_fn_error "invalid package name: $ac_useropt"
|
||
+ ac_useropt_orig=$ac_useropt
|
||
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
|
||
+ case $ac_user_opts in
|
||
+ *"
|
||
+"with_$ac_useropt"
|
||
+"*) ;;
|
||
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
|
||
+ ac_unrecognized_sep=', ';;
|
||
+ esac
|
||
+ eval with_$ac_useropt=no ;;
|
||
|
||
--x)
|
||
# Obsolete; use --with-x.
|
||
@@ -623,26 +1106,25 @@
|
||
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
||
x_libraries=$ac_optarg ;;
|
||
|
||
- -*) { echo "$as_me: error: unrecognized option: $ac_option
|
||
-Try \`$0 --help' for more information." >&2
|
||
- { (exit 1); exit 1; }; }
|
||
+ -*) as_fn_error "unrecognized option: \`$ac_option'
|
||
+Try \`$0 --help' for more information."
|
||
;;
|
||
|
||
*=*)
|
||
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
|
||
# Reject names that are not valid shell variable names.
|
||
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
|
||
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
|
||
- eval "$ac_envvar='$ac_optarg'"
|
||
+ case $ac_envvar in #(
|
||
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
|
||
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
|
||
+ esac
|
||
+ eval $ac_envvar=\$ac_optarg
|
||
export $ac_envvar ;;
|
||
|
||
*)
|
||
# FIXME: should be removed in autoconf 3.0.
|
||
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
||
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
|
||
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
|
||
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
||
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
|
||
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
|
||
;;
|
||
|
||
@@ -651,31 +1133,36 @@
|
||
|
||
if test -n "$ac_prev"; then
|
||
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
||
- { echo "$as_me: error: missing argument to $ac_option" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
+ as_fn_error "missing argument to $ac_option"
|
||
fi
|
||
|
||
-# Be sure to have absolute paths.
|
||
-for ac_var in exec_prefix prefix
|
||
-do
|
||
- eval ac_val=$`echo $ac_var`
|
||
- case $ac_val in
|
||
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
|
||
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
||
- { (exit 1); exit 1; }; };;
|
||
+if test -n "$ac_unrecognized_opts"; then
|
||
+ case $enable_option_checking in
|
||
+ no) ;;
|
||
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
||
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
||
esac
|
||
-done
|
||
+fi
|
||
|
||
-# Be sure to have absolute paths.
|
||
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
|
||
- localstatedir libdir includedir oldincludedir infodir mandir
|
||
+# Check all directory arguments for consistency.
|
||
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||
+ datadir sysconfdir sharedstatedir localstatedir includedir \
|
||
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||
+ libdir localedir mandir
|
||
do
|
||
- eval ac_val=$`echo $ac_var`
|
||
+ eval ac_val=\$$ac_var
|
||
+ # Remove trailing slashes.
|
||
case $ac_val in
|
||
- [\\/$]* | ?:[\\/]* ) ;;
|
||
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
||
- { (exit 1); exit 1; }; };;
|
||
+ */ )
|
||
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
|
||
+ eval $ac_var=\$ac_val;;
|
||
esac
|
||
+ # Be sure to have absolute directory names.
|
||
+ case $ac_val in
|
||
+ [\\/$]* | ?:[\\/]* ) continue;;
|
||
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
||
+ esac
|
||
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
|
||
done
|
||
|
||
# There might be people who depend on the old broken behavior: `$host'
|
||
@@ -689,7 +1176,7 @@
|
||
if test "x$host_alias" != x; then
|
||
if test "x$build_alias" = x; then
|
||
cross_compiling=maybe
|
||
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
||
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
|
||
If a cross compiler is detected then cross compile mode will be used." >&2
|
||
elif test "x$build_alias" != "x$host_alias"; then
|
||
cross_compiling=yes
|
||
@@ -702,74 +1189,72 @@
|
||
test "$silent" = yes && exec 6>/dev/null
|
||
|
||
|
||
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
||
+ac_ls_di=`ls -di .` &&
|
||
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
||
+ as_fn_error "working directory cannot be determined"
|
||
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
||
+ as_fn_error "pwd does not report name of working directory"
|
||
+
|
||
+
|
||
# Find the source files, if location was not specified.
|
||
if test -z "$srcdir"; then
|
||
ac_srcdir_defaulted=yes
|
||
- # Try the directory containing this script, then its parent.
|
||
- ac_confdir=`(dirname "$0") 2>/dev/null ||
|
||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$0" : 'X\(//\)[^/]' \| \
|
||
- X"$0" : 'X\(//\)$' \| \
|
||
- X"$0" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$0" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
+ # Try the directory containing this script, then the parent directory.
|
||
+ ac_confdir=`$as_dirname -- "$as_myself" ||
|
||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
+ X"$as_myself" : 'X\(//\)[^/]' \| \
|
||
+ X"$as_myself" : 'X\(//\)$' \| \
|
||
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X"$as_myself" |
|
||
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)[^/].*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\).*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ s/.*/./; q'`
|
||
srcdir=$ac_confdir
|
||
- if test ! -r $srcdir/$ac_unique_file; then
|
||
+ if test ! -r "$srcdir/$ac_unique_file"; then
|
||
srcdir=..
|
||
fi
|
||
else
|
||
ac_srcdir_defaulted=no
|
||
fi
|
||
-if test ! -r $srcdir/$ac_unique_file; then
|
||
- if test "$ac_srcdir_defaulted" = yes; then
|
||
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- else
|
||
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
- fi
|
||
-fi
|
||
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
|
||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
|
||
- { (exit 1); exit 1; }; }
|
||
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
|
||
-ac_env_build_alias_set=${build_alias+set}
|
||
-ac_env_build_alias_value=$build_alias
|
||
-ac_cv_env_build_alias_set=${build_alias+set}
|
||
-ac_cv_env_build_alias_value=$build_alias
|
||
-ac_env_host_alias_set=${host_alias+set}
|
||
-ac_env_host_alias_value=$host_alias
|
||
-ac_cv_env_host_alias_set=${host_alias+set}
|
||
-ac_cv_env_host_alias_value=$host_alias
|
||
-ac_env_target_alias_set=${target_alias+set}
|
||
-ac_env_target_alias_value=$target_alias
|
||
-ac_cv_env_target_alias_set=${target_alias+set}
|
||
-ac_cv_env_target_alias_value=$target_alias
|
||
-ac_env_CC_set=${CC+set}
|
||
-ac_env_CC_value=$CC
|
||
-ac_cv_env_CC_set=${CC+set}
|
||
-ac_cv_env_CC_value=$CC
|
||
-ac_env_CFLAGS_set=${CFLAGS+set}
|
||
-ac_env_CFLAGS_value=$CFLAGS
|
||
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
||
-ac_cv_env_CFLAGS_value=$CFLAGS
|
||
-ac_env_LDFLAGS_set=${LDFLAGS+set}
|
||
-ac_env_LDFLAGS_value=$LDFLAGS
|
||
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
|
||
-ac_cv_env_LDFLAGS_value=$LDFLAGS
|
||
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||
-ac_env_CPPFLAGS_value=$CPPFLAGS
|
||
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
||
-ac_env_CPP_set=${CPP+set}
|
||
-ac_env_CPP_value=$CPP
|
||
-ac_cv_env_CPP_set=${CPP+set}
|
||
-ac_cv_env_CPP_value=$CPP
|
||
+if test ! -r "$srcdir/$ac_unique_file"; then
|
||
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
||
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
|
||
+fi
|
||
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
|
||
+ac_abs_confdir=`(
|
||
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
|
||
+ pwd)`
|
||
+# When building in place, set srcdir=.
|
||
+if test "$ac_abs_confdir" = "$ac_pwd"; then
|
||
+ srcdir=.
|
||
+fi
|
||
+# Remove unnecessary trailing slashes from srcdir.
|
||
+# Double slashes in file names in object file debugging info
|
||
+# mess up M-x gdb in Emacs.
|
||
+case $srcdir in
|
||
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
|
||
+esac
|
||
+for ac_var in $ac_precious_vars; do
|
||
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
|
||
+ eval ac_env_${ac_var}_value=\$${ac_var}
|
||
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
|
||
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
|
||
+done
|
||
|
||
#
|
||
# Report the --help message.
|
||
@@ -798,14 +1283,11 @@
|
||
-n, --no-create do not create output files
|
||
--srcdir=DIR find the sources in DIR [configure dir or \`..']
|
||
|
||
-_ACEOF
|
||
-
|
||
- cat <<_ACEOF
|
||
Installation directories:
|
||
--prefix=PREFIX install architecture-independent files in PREFIX
|
||
- [$ac_default_prefix]
|
||
+ [$ac_default_prefix]
|
||
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
|
||
- [PREFIX]
|
||
+ [PREFIX]
|
||
|
||
By default, \`make install' will install all the files in
|
||
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
|
||
@@ -815,18 +1297,25 @@
|
||
For better control, use the options below.
|
||
|
||
Fine tuning of the installation directories:
|
||
- --bindir=DIR user executables [EPREFIX/bin]
|
||
- --sbindir=DIR system admin executables [EPREFIX/sbin]
|
||
- --libexecdir=DIR program executables [EPREFIX/libexec]
|
||
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
|
||
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||
- --libdir=DIR object code libraries [EPREFIX/lib]
|
||
- --includedir=DIR C header files [PREFIX/include]
|
||
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||
- --infodir=DIR info documentation [PREFIX/info]
|
||
- --mandir=DIR man documentation [PREFIX/man]
|
||
+ --bindir=DIR user executables [EPREFIX/bin]
|
||
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
|
||
+ --libexecdir=DIR program executables [EPREFIX/libexec]
|
||
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||
+ --libdir=DIR object code libraries [EPREFIX/lib]
|
||
+ --includedir=DIR C header files [PREFIX/include]
|
||
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
|
||
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
|
||
+ --infodir=DIR info documentation [DATAROOTDIR/info]
|
||
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
|
||
+ --mandir=DIR man documentation [DATAROOTDIR/man]
|
||
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
|
||
+ --htmldir=DIR html documentation [DOCDIR]
|
||
+ --dvidir=DIR dvi documentation [DOCDIR]
|
||
+ --pdfdir=DIR pdf documentation [DOCDIR]
|
||
+ --psdir=DIR ps documentation [DOCDIR]
|
||
_ACEOF
|
||
|
||
cat <<\_ACEOF
|
||
@@ -848,6 +1337,7 @@
|
||
cat <<\_ACEOF
|
||
|
||
Optional Features:
|
||
+ --disable-option-checking ignore unrecognized --enable/--with options
|
||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||
--enable-maintainer-mode Enable developer functionality.
|
||
@@ -858,185 +1348,513 @@
|
||
--enable-sim-trace=opts Enable tracing flags
|
||
--enable-sim-profile=opts Enable profiling flags
|
||
|
||
+Optional Packages:
|
||
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||
+ --with-system-readline use installed readline library
|
||
+
|
||
Some influential environment variables:
|
||
CC C compiler command
|
||
CFLAGS C compiler flags
|
||
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
|
||
nonstandard directory <lib dir>
|
||
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
|
||
- headers in a nonstandard directory <include dir>
|
||
+ LIBS libraries to pass to the linker, e.g. -l<library>
|
||
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
|
||
+ you have headers in a nonstandard directory <include dir>
|
||
CPP C preprocessor
|
||
|
||
Use these variables to override the choices made by `configure' or to help
|
||
it to find libraries and programs with nonstandard names/locations.
|
||
|
||
+Report bugs to the package provider.
|
||
_ACEOF
|
||
+ac_status=$?
|
||
fi
|
||
|
||
if test "$ac_init_help" = "recursive"; then
|
||
# If there are subdirs, report their specific --help.
|
||
- ac_popdir=`pwd`
|
||
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
|
||
- test -d $ac_dir || continue
|
||
+ test -d "$ac_dir" ||
|
||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
|
||
+ continue
|
||
ac_builddir=.
|
||
|
||
-if test "$ac_dir" != .; then
|
||
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
||
- # A "../" for each directory in $ac_dir_suffix.
|
||
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
||
-else
|
||
- ac_dir_suffix= ac_top_builddir=
|
||
-fi
|
||
+case "$ac_dir" in
|
||
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
+*)
|
||
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
||
+ # A ".." for each directory in $ac_dir_suffix.
|
||
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
||
+ case $ac_top_builddir_sub in
|
||
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
||
+ esac ;;
|
||
+esac
|
||
+ac_abs_top_builddir=$ac_pwd
|
||
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
|
||
+# for backward compatibility:
|
||
+ac_top_builddir=$ac_top_build_prefix
|
||
|
||
case $srcdir in
|
||
- .) # No --srcdir option. We are building in place.
|
||
+ .) # We are building in place.
|
||
ac_srcdir=.
|
||
- if test -z "$ac_top_builddir"; then
|
||
- ac_top_srcdir=.
|
||
- else
|
||
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
||
- fi ;;
|
||
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
||
+ ac_top_srcdir=$ac_top_builddir_sub
|
||
+ ac_abs_top_srcdir=$ac_pwd ;;
|
||
+ [\\/]* | ?:[\\/]* ) # Absolute name.
|
||
ac_srcdir=$srcdir$ac_dir_suffix;
|
||
- ac_top_srcdir=$srcdir ;;
|
||
- *) # Relative path.
|
||
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
||
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
||
-esac
|
||
-
|
||
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
||
-# the directories may not exist.
|
||
-case `pwd` in
|
||
-.) ac_abs_builddir="$ac_dir";;
|
||
-*)
|
||
- case "$ac_dir" in
|
||
- .) ac_abs_builddir=`pwd`;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
||
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
-*)
|
||
- case ${ac_top_builddir}. in
|
||
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_srcdir=$ac_srcdir;;
|
||
-*)
|
||
- case $ac_srcdir in
|
||
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
||
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
-*)
|
||
- case $ac_top_srcdir in
|
||
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
||
- esac;;
|
||
+ ac_top_srcdir=$srcdir
|
||
+ ac_abs_top_srcdir=$srcdir ;;
|
||
+ *) # Relative name.
|
||
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
|
||
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
|
||
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
|
||
esac
|
||
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
||
|
||
- cd $ac_dir
|
||
- # Check for guested configure; otherwise get Cygnus style configure.
|
||
- if test -f $ac_srcdir/configure.gnu; then
|
||
- echo
|
||
- $SHELL $ac_srcdir/configure.gnu --help=recursive
|
||
- elif test -f $ac_srcdir/configure; then
|
||
- echo
|
||
- $SHELL $ac_srcdir/configure --help=recursive
|
||
- elif test -f $ac_srcdir/configure.ac ||
|
||
- test -f $ac_srcdir/configure.in; then
|
||
- echo
|
||
- $ac_configure --help
|
||
+ cd "$ac_dir" || { ac_status=$?; continue; }
|
||
+ # Check for guested configure.
|
||
+ if test -f "$ac_srcdir/configure.gnu"; then
|
||
+ echo &&
|
||
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
|
||
+ elif test -f "$ac_srcdir/configure"; then
|
||
+ echo &&
|
||
+ $SHELL "$ac_srcdir/configure" --help=recursive
|
||
else
|
||
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||
- fi
|
||
- cd $ac_popdir
|
||
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||
+ fi || ac_status=$?
|
||
+ cd "$ac_pwd" || { ac_status=$?; break; }
|
||
done
|
||
fi
|
||
|
||
-test -n "$ac_init_help" && exit 0
|
||
+test -n "$ac_init_help" && exit $ac_status
|
||
if $ac_init_version; then
|
||
cat <<\_ACEOF
|
||
+configure
|
||
+generated by GNU Autoconf 2.64
|
||
|
||
-Copyright (C) 2003 Free Software Foundation, Inc.
|
||
+Copyright (C) 2009 Free Software Foundation, Inc.
|
||
This configure script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it.
|
||
_ACEOF
|
||
- exit 0
|
||
+ exit
|
||
fi
|
||
-exec 5>config.log
|
||
-cat >&5 <<_ACEOF
|
||
-This file contains any messages produced by compilers while
|
||
-running configure, to aid debugging if configure makes a mistake.
|
||
-
|
||
-It was created by $as_me, which was
|
||
-generated by GNU Autoconf 2.59. Invocation command line was
|
||
-
|
||
- $ $0 $@
|
||
|
||
-_ACEOF
|
||
+## ------------------------ ##
|
||
+## Autoconf initialization. ##
|
||
+## ------------------------ ##
|
||
+
|
||
+# ac_fn_c_try_compile LINENO
|
||
+# --------------------------
|
||
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
||
+ac_fn_c_try_compile ()
|
||
{
|
||
-cat <<_ASUNAME
|
||
-## --------- ##
|
||
-## Platform. ##
|
||
-## --------- ##
|
||
-
|
||
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
|
||
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
|
||
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
|
||
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
|
||
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
|
||
-
|
||
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
|
||
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
|
||
-
|
||
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
|
||
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
|
||
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
|
||
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
|
||
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
|
||
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
|
||
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
|
||
-
|
||
-_ASUNAME
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ rm -f conftest.$ac_objext
|
||
+ if { { ac_try="$ac_compile"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_compile") 2>conftest.err
|
||
+ ac_status=$?
|
||
+ if test -s conftest.err; then
|
||
+ grep -v '^ *+' conftest.err >conftest.er1
|
||
+ cat conftest.er1 >&5
|
||
+ mv -f conftest.er1 conftest.err
|
||
+ fi
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; } && {
|
||
+ test -z "$ac_c_werror_flag" ||
|
||
+ test ! -s conftest.err
|
||
+ } && test -s conftest.$ac_objext; then :
|
||
+ ac_retval=0
|
||
+else
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- echo "PATH: $as_dir"
|
||
-done
|
||
+ ac_retval=1
|
||
+fi
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ return $ac_retval
|
||
|
||
-} >&5
|
||
+} # ac_fn_c_try_compile
|
||
|
||
-cat >&5 <<_ACEOF
|
||
+# ac_fn_c_try_cpp LINENO
|
||
+# ----------------------
|
||
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
|
||
+ac_fn_c_try_cpp ()
|
||
+{
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
|
||
+ ac_status=$?
|
||
+ if test -s conftest.err; then
|
||
+ grep -v '^ *+' conftest.err >conftest.er1
|
||
+ cat conftest.er1 >&5
|
||
+ mv -f conftest.er1 conftest.err
|
||
+ fi
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; } >/dev/null && {
|
||
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||
+ test ! -s conftest.err
|
||
+ }; then :
|
||
+ ac_retval=0
|
||
+else
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
+ ac_retval=1
|
||
+fi
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ return $ac_retval
|
||
|
||
-## ----------- ##
|
||
-## Core tests. ##
|
||
-## ----------- ##
|
||
+} # ac_fn_c_try_cpp
|
||
|
||
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
||
+# -------------------------------------------------------
|
||
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
||
+# the include files in INCLUDES and setting the cache variable VAR
|
||
+# accordingly.
|
||
+ac_fn_c_check_header_mongrel ()
|
||
+{
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
+$as_echo_n "checking for $2... " >&6; }
|
||
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+fi
|
||
+eval ac_res=\$$3
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+else
|
||
+ # Is the header compilable?
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
|
||
+$as_echo_n "checking $2 usability... " >&6; }
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+$4
|
||
+#include <$2>
|
||
_ACEOF
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
+ ac_header_compiler=yes
|
||
+else
|
||
+ ac_header_compiler=no
|
||
+fi
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
|
||
+$as_echo "$ac_header_compiler" >&6; }
|
||
|
||
-
|
||
-# Keep a trace of the command line.
|
||
-# Strip out --no-create and --no-recursion so they do not pile up.
|
||
-# Strip out --silent because we don't want to record it for future runs.
|
||
+# Is the header present?
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
|
||
+$as_echo_n "checking $2 presence... " >&6; }
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+#include <$2>
|
||
+_ACEOF
|
||
+if ac_fn_c_try_cpp "$LINENO"; then :
|
||
+ ac_header_preproc=yes
|
||
+else
|
||
+ ac_header_preproc=no
|
||
+fi
|
||
+rm -f conftest.err conftest.$ac_ext
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
||
+$as_echo "$ac_header_preproc" >&6; }
|
||
+
|
||
+# So? What about this header?
|
||
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
|
||
+ yes:no: )
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
||
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
||
+ ;;
|
||
+ no:yes:* )
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
|
||
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
|
||
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
|
||
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
|
||
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
||
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
||
+ ;;
|
||
+esac
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
+$as_echo_n "checking for $2... " >&6; }
|
||
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ eval "$3=\$ac_header_compiler"
|
||
+fi
|
||
+eval ac_res=\$$3
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+fi
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+
|
||
+} # ac_fn_c_check_header_mongrel
|
||
+
|
||
+# ac_fn_c_try_run LINENO
|
||
+# ----------------------
|
||
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
|
||
+# that executables *can* be run.
|
||
+ac_fn_c_try_run ()
|
||
+{
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ if { { ac_try="$ac_link"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_link") 2>&5
|
||
+ ac_status=$?
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
|
||
+ { { case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_try") 2>&5
|
||
+ ac_status=$?
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }; }; then :
|
||
+ ac_retval=0
|
||
+else
|
||
+ $as_echo "$as_me: program exited with status $ac_status" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+ ac_retval=$ac_status
|
||
+fi
|
||
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ return $ac_retval
|
||
+
|
||
+} # ac_fn_c_try_run
|
||
+
|
||
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
||
+# -------------------------------------------------------
|
||
+# Tests whether HEADER exists and can be compiled using the include files in
|
||
+# INCLUDES, setting the cache variable VAR accordingly.
|
||
+ac_fn_c_check_header_compile ()
|
||
+{
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
+$as_echo_n "checking for $2... " >&6; }
|
||
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+$4
|
||
+#include <$2>
|
||
+_ACEOF
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
+ eval "$3=yes"
|
||
+else
|
||
+ eval "$3=no"
|
||
+fi
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+eval ac_res=\$$3
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+
|
||
+} # ac_fn_c_check_header_compile
|
||
+
|
||
+# ac_fn_c_try_link LINENO
|
||
+# -----------------------
|
||
+# Try to link conftest.$ac_ext, and return whether this succeeded.
|
||
+ac_fn_c_try_link ()
|
||
+{
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ rm -f conftest.$ac_objext conftest$ac_exeext
|
||
+ if { { ac_try="$ac_link"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_link") 2>conftest.err
|
||
+ ac_status=$?
|
||
+ if test -s conftest.err; then
|
||
+ grep -v '^ *+' conftest.err >conftest.er1
|
||
+ cat conftest.er1 >&5
|
||
+ mv -f conftest.er1 conftest.err
|
||
+ fi
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; } && {
|
||
+ test -z "$ac_c_werror_flag" ||
|
||
+ test ! -s conftest.err
|
||
+ } && test -s conftest$ac_exeext && {
|
||
+ test "$cross_compiling" = yes ||
|
||
+ $as_test_x conftest$ac_exeext
|
||
+ }; then :
|
||
+ ac_retval=0
|
||
+else
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+ ac_retval=1
|
||
+fi
|
||
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
|
||
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
|
||
+ # interfere with the next link command; also delete a directory that is
|
||
+ # left behind by Apple's compiler. We do this before executing the actions.
|
||
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+ return $ac_retval
|
||
+
|
||
+} # ac_fn_c_try_link
|
||
+
|
||
+# ac_fn_c_check_func LINENO FUNC VAR
|
||
+# ----------------------------------
|
||
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
|
||
+ac_fn_c_check_func ()
|
||
+{
|
||
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
||
+$as_echo_n "checking for $2... " >&6; }
|
||
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
|
||
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||
+#define $2 innocuous_$2
|
||
+
|
||
+/* System header to define __stub macros and hopefully few prototypes,
|
||
+ which can conflict with char $2 (); below.
|
||
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||
+ <limits.h> exists even on freestanding compilers. */
|
||
+
|
||
+#ifdef __STDC__
|
||
+# include <limits.h>
|
||
+#else
|
||
+# include <assert.h>
|
||
+#endif
|
||
+
|
||
+#undef $2
|
||
+
|
||
+/* Override any GCC internal prototype to avoid an error.
|
||
+ Use char because int might match the return type of a GCC
|
||
+ builtin and then its argument prototype would still apply. */
|
||
+#ifdef __cplusplus
|
||
+extern "C"
|
||
+#endif
|
||
+char $2 ();
|
||
+/* The GNU C library defines this for functions which it implements
|
||
+ to always fail with ENOSYS. Some functions are actually named
|
||
+ something starting with __ and the normal name is an alias. */
|
||
+#if defined __stub_$2 || defined __stub___$2
|
||
+choke me
|
||
+#endif
|
||
+
|
||
+int
|
||
+main ()
|
||
+{
|
||
+return $2 ();
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+if ac_fn_c_try_link "$LINENO"; then :
|
||
+ eval "$3=yes"
|
||
+else
|
||
+ eval "$3=no"
|
||
+fi
|
||
+rm -f core conftest.err conftest.$ac_objext \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
+fi
|
||
+eval ac_res=\$$3
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||
+$as_echo "$ac_res" >&6; }
|
||
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
||
+
|
||
+} # ac_fn_c_check_func
|
||
+cat >config.log <<_ACEOF
|
||
+This file contains any messages produced by compilers while
|
||
+running configure, to aid debugging if configure makes a mistake.
|
||
+
|
||
+It was created by $as_me, which was
|
||
+generated by GNU Autoconf 2.64. Invocation command line was
|
||
+
|
||
+ $ $0 $@
|
||
+
|
||
+_ACEOF
|
||
+exec 5>>config.log
|
||
+{
|
||
+cat <<_ASUNAME
|
||
+## --------- ##
|
||
+## Platform. ##
|
||
+## --------- ##
|
||
+
|
||
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
|
||
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
|
||
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
|
||
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
|
||
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
|
||
+
|
||
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
|
||
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
|
||
+
|
||
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
|
||
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
|
||
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
|
||
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
|
||
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
|
||
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
|
||
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
|
||
+
|
||
+_ASUNAME
|
||
+
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ $as_echo "PATH: $as_dir"
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+} >&5
|
||
+
|
||
+cat >&5 <<_ACEOF
|
||
+
|
||
+
|
||
+## ----------- ##
|
||
+## Core tests. ##
|
||
+## ----------- ##
|
||
+
|
||
+_ACEOF
|
||
+
|
||
+
|
||
+# Keep a trace of the command line.
|
||
+# Strip out --no-create and --no-recursion so they do not pile up.
|
||
+# Strip out --silent because we don't want to record it for future runs.
|
||
# Also quote any args containing shell meta-characters.
|
||
# Make two passes to allow for proper duplicate-argument suppression.
|
||
ac_configure_args=
|
||
ac_configure_args0=
|
||
ac_configure_args1=
|
||
-ac_sep=
|
||
ac_must_keep_next=false
|
||
for ac_pass in 1 2
|
||
do
|
||
@@ -1047,13 +1865,13 @@
|
||
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
||
| -silent | --silent | --silen | --sile | --sil)
|
||
continue ;;
|
||
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
||
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ *\'*)
|
||
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
esac
|
||
case $ac_pass in
|
||
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
|
||
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
|
||
2)
|
||
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
|
||
+ as_fn_append ac_configure_args1 " '$ac_arg'"
|
||
if test $ac_must_keep_next = true; then
|
||
ac_must_keep_next=false # Got value, back to normal.
|
||
else
|
||
@@ -1069,21 +1887,19 @@
|
||
-* ) ac_must_keep_next=true ;;
|
||
esac
|
||
fi
|
||
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
|
||
- # Get rid of the leading space.
|
||
- ac_sep=" "
|
||
+ as_fn_append ac_configure_args " '$ac_arg'"
|
||
;;
|
||
esac
|
||
done
|
||
done
|
||
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
|
||
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
|
||
+{ ac_configure_args0=; unset ac_configure_args0;}
|
||
+{ ac_configure_args1=; unset ac_configure_args1;}
|
||
|
||
# When interrupted or exit'd, cleanup temporary files, and complete
|
||
# config.log. We remove comments because anyway the quotes in there
|
||
# would cause problems or look ugly.
|
||
-# WARNING: Be sure not to use single quotes in there, as some shells,
|
||
-# such as our DU 5.0 friend, will then `close' the trap.
|
||
+# WARNING: Use '\'' to represent an apostrophe within the trap.
|
||
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
|
||
trap 'exit_status=$?
|
||
# Save into config.log some information that might help in debugging.
|
||
{
|
||
@@ -1096,20 +1912,35 @@
|
||
_ASBOX
|
||
echo
|
||
# The following way of writing the cache mishandles newlines in values,
|
||
-{
|
||
+(
|
||
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
|
||
+ eval ac_val=\$$ac_var
|
||
+ case $ac_val in #(
|
||
+ *${as_nl}*)
|
||
+ case $ac_var in #(
|
||
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
||
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
||
+ esac
|
||
+ case $ac_var in #(
|
||
+ _ | IFS | as_nl) ;; #(
|
||
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
||
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
||
+ esac ;;
|
||
+ esac
|
||
+ done
|
||
(set) 2>&1 |
|
||
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
|
||
- *ac_space=\ *)
|
||
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
|
||
+ *${as_nl}ac_space=\ *)
|
||
sed -n \
|
||
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
|
||
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
|
||
- ;;
|
||
+ "s/'\''/'\''\\\\'\'''\''/g;
|
||
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
|
||
+ ;; #(
|
||
*)
|
||
- sed -n \
|
||
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
|
||
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
|
||
;;
|
||
- esac;
|
||
-}
|
||
+ esac |
|
||
+ sort
|
||
+)
|
||
echo
|
||
|
||
cat <<\_ASBOX
|
||
@@ -1120,22 +1951,28 @@
|
||
echo
|
||
for ac_var in $ac_subst_vars
|
||
do
|
||
- eval ac_val=$`echo $ac_var`
|
||
- echo "$ac_var='"'"'$ac_val'"'"'"
|
||
+ eval ac_val=\$$ac_var
|
||
+ case $ac_val in
|
||
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
||
+ esac
|
||
+ $as_echo "$ac_var='\''$ac_val'\''"
|
||
done | sort
|
||
echo
|
||
|
||
if test -n "$ac_subst_files"; then
|
||
cat <<\_ASBOX
|
||
-## ------------- ##
|
||
-## Output files. ##
|
||
-## ------------- ##
|
||
+## ------------------- ##
|
||
+## File substitutions. ##
|
||
+## ------------------- ##
|
||
_ASBOX
|
||
echo
|
||
for ac_var in $ac_subst_files
|
||
do
|
||
- eval ac_val=$`echo $ac_var`
|
||
- echo "$ac_var='"'"'$ac_val'"'"'"
|
||
+ eval ac_val=\$$ac_var
|
||
+ case $ac_val in
|
||
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
|
||
+ esac
|
||
+ $as_echo "$ac_var='\''$ac_val'\''"
|
||
done | sort
|
||
echo
|
||
fi
|
||
@@ -1147,26 +1984,26 @@
|
||
## ----------- ##
|
||
_ASBOX
|
||
echo
|
||
- sed "/^$/d" confdefs.h | sort
|
||
+ cat confdefs.h
|
||
echo
|
||
fi
|
||
test "$ac_signal" != 0 &&
|
||
- echo "$as_me: caught signal $ac_signal"
|
||
- echo "$as_me: exit $exit_status"
|
||
+ $as_echo "$as_me: caught signal $ac_signal"
|
||
+ $as_echo "$as_me: exit $exit_status"
|
||
} >&5
|
||
- rm -f core *.core &&
|
||
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
|
||
+ rm -f core *.core core.conftest.* &&
|
||
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
|
||
exit $exit_status
|
||
- ' 0
|
||
+' 0
|
||
for ac_signal in 1 2 13 15; do
|
||
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
|
||
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
|
||
done
|
||
ac_signal=0
|
||
|
||
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
||
-rm -rf conftest* confdefs.h
|
||
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
|
||
-echo >confdefs.h
|
||
+rm -f -r conftest* confdefs.h
|
||
+
|
||
+$as_echo "/* confdefs.h */" > confdefs.h
|
||
|
||
# Predefined preprocessor variables.
|
||
|
||
@@ -1174,40 +2011,46 @@
|
||
#define PACKAGE_NAME "$PACKAGE_NAME"
|
||
_ACEOF
|
||
|
||
-
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
|
||
_ACEOF
|
||
|
||
-
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define PACKAGE_VERSION "$PACKAGE_VERSION"
|
||
_ACEOF
|
||
|
||
-
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define PACKAGE_STRING "$PACKAGE_STRING"
|
||
_ACEOF
|
||
|
||
-
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
|
||
_ACEOF
|
||
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PACKAGE_URL "$PACKAGE_URL"
|
||
+_ACEOF
|
||
+
|
||
|
||
# Let the site file select an alternate cache file if it wants to.
|
||
-# Prefer explicitly selected file to automatically selected ones.
|
||
-if test -z "$CONFIG_SITE"; then
|
||
- if test "x$prefix" != xNONE; then
|
||
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
|
||
- else
|
||
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
|
||
- fi
|
||
+# Prefer an explicitly selected file to automatically selected ones.
|
||
+ac_site_file1=NONE
|
||
+ac_site_file2=NONE
|
||
+if test -n "$CONFIG_SITE"; then
|
||
+ ac_site_file1=$CONFIG_SITE
|
||
+elif test "x$prefix" != xNONE; then
|
||
+ ac_site_file1=$prefix/share/config.site
|
||
+ ac_site_file2=$prefix/etc/config.site
|
||
+else
|
||
+ ac_site_file1=$ac_default_prefix/share/config.site
|
||
+ ac_site_file2=$ac_default_prefix/etc/config.site
|
||
fi
|
||
-for ac_site_file in $CONFIG_SITE; do
|
||
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
|
||
+do
|
||
+ test "x$ac_site_file" = xNONE && continue
|
||
if test -r "$ac_site_file"; then
|
||
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
||
-echo "$as_me: loading site script $ac_site_file" >&6;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
|
||
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
|
||
sed 's/^/| /' "$ac_site_file" >&5
|
||
. "$ac_site_file"
|
||
fi
|
||
@@ -1217,69 +2060,79 @@
|
||
# Some versions of bash will fail to source /dev/null (special
|
||
# files actually), so we avoid doing that.
|
||
if test -f "$cache_file"; then
|
||
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
||
-echo "$as_me: loading cache $cache_file" >&6;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
|
||
+$as_echo "$as_me: loading cache $cache_file" >&6;}
|
||
case $cache_file in
|
||
- [\\/]* | ?:[\\/]* ) . $cache_file;;
|
||
- *) . ./$cache_file;;
|
||
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
|
||
+ *) . "./$cache_file";;
|
||
esac
|
||
fi
|
||
else
|
||
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
||
-echo "$as_me: creating cache $cache_file" >&6;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
|
||
+$as_echo "$as_me: creating cache $cache_file" >&6;}
|
||
>$cache_file
|
||
fi
|
||
|
||
# Check that the precious variables saved in the cache have kept the same
|
||
# value.
|
||
ac_cache_corrupted=false
|
||
-for ac_var in `(set) 2>&1 |
|
||
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
|
||
+for ac_var in $ac_precious_vars; do
|
||
eval ac_old_set=\$ac_cv_env_${ac_var}_set
|
||
eval ac_new_set=\$ac_env_${ac_var}_set
|
||
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
|
||
- eval ac_new_val="\$ac_env_${ac_var}_value"
|
||
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
|
||
+ eval ac_new_val=\$ac_env_${ac_var}_value
|
||
case $ac_old_set,$ac_new_set in
|
||
set,)
|
||
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
||
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
||
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
|
||
ac_cache_corrupted=: ;;
|
||
,set)
|
||
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
||
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
|
||
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
|
||
ac_cache_corrupted=: ;;
|
||
,);;
|
||
*)
|
||
if test "x$ac_old_val" != "x$ac_new_val"; then
|
||
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
||
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
||
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
|
||
-echo "$as_me: former value: $ac_old_val" >&2;}
|
||
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
|
||
-echo "$as_me: current value: $ac_new_val" >&2;}
|
||
- ac_cache_corrupted=:
|
||
+ # differences in whitespace do not lead to failure.
|
||
+ ac_old_val_w=`echo x $ac_old_val`
|
||
+ ac_new_val_w=`echo x $ac_new_val`
|
||
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
|
||
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
|
||
+ ac_cache_corrupted=:
|
||
+ else
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
||
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
|
||
+ eval $ac_var=\$ac_old_val
|
||
+ fi
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
|
||
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
|
||
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
|
||
fi;;
|
||
esac
|
||
# Pass precious variables to config.status.
|
||
if test "$ac_new_set" = set; then
|
||
case $ac_new_val in
|
||
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
|
||
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
*) ac_arg=$ac_var=$ac_new_val ;;
|
||
esac
|
||
case " $ac_configure_args " in
|
||
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
|
||
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
|
||
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
|
||
esac
|
||
fi
|
||
done
|
||
if $ac_cache_corrupted; then
|
||
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
|
||
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
||
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-fi
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
|
||
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
|
||
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
|
||
+fi
|
||
+## -------------------- ##
|
||
+## Main body of script. ##
|
||
+## -------------------- ##
|
||
|
||
ac_ext=c
|
||
ac_cpp='$CPP $CPPFLAGS'
|
||
@@ -1288,24 +2141,7 @@
|
||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
|
||
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
- ac_config_headers="$ac_config_headers config.h:config.in"
|
||
+ac_config_headers="$ac_config_headers config.h:config.in"
|
||
|
||
|
||
# This file contains common code used by all simulators.
|
||
@@ -1451,104 +2287,130 @@
|
||
# ... target specific stuff ...
|
||
|
||
ac_aux_dir=
|
||
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||
- if test -f $ac_dir/install-sh; then
|
||
- ac_aux_dir=$ac_dir
|
||
- ac_install_sh="$ac_aux_dir/install-sh -c"
|
||
- break
|
||
- elif test -f $ac_dir/install.sh; then
|
||
- ac_aux_dir=$ac_dir
|
||
- ac_install_sh="$ac_aux_dir/install.sh -c"
|
||
- break
|
||
- elif test -f $ac_dir/shtool; then
|
||
- ac_aux_dir=$ac_dir
|
||
- ac_install_sh="$ac_aux_dir/shtool install -c"
|
||
- break
|
||
- fi
|
||
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
||
+ for ac_t in install-sh install.sh shtool; do
|
||
+ if test -f "$ac_dir/$ac_t"; then
|
||
+ ac_aux_dir=$ac_dir
|
||
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
|
||
+ break 2
|
||
+ fi
|
||
+ done
|
||
done
|
||
if test -z "$ac_aux_dir"; then
|
||
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
||
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-fi
|
||
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
||
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
||
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
|
||
+fi
|
||
+
|
||
+# These three variables are undocumented and unsupported,
|
||
+# and are intended to be withdrawn in a future Autoconf release.
|
||
+# They can cause serious problems if a builder's source tree is in a directory
|
||
+# whose full name contains unusual characters.
|
||
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
|
||
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
|
||
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
||
+
|
||
|
||
# Make sure we can run config.sub.
|
||
-$ac_config_sub sun4 >/dev/null 2>&1 ||
|
||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
||
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-
|
||
-echo "$as_me:$LINENO: checking build system type" >&5
|
||
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
||
-if test "${ac_cv_build+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- ac_cv_build_alias=$build_alias
|
||
-test -z "$ac_cv_build_alias" &&
|
||
- ac_cv_build_alias=`$ac_config_guess`
|
||
-test -z "$ac_cv_build_alias" &&
|
||
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
||
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
||
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||
-echo "${ECHO_T}$ac_cv_build" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
|
||
+$as_echo_n "checking build system type... " >&6; }
|
||
+if test "${ac_cv_build+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ ac_build_alias=$build_alias
|
||
+test "x$ac_build_alias" = x &&
|
||
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||
+test "x$ac_build_alias" = x &&
|
||
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
|
||
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
||
+
|
||
+fi
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
||
+$as_echo "$ac_cv_build" >&6; }
|
||
+case $ac_cv_build in
|
||
+*-*-*) ;;
|
||
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
||
+esac
|
||
build=$ac_cv_build
|
||
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||
-
|
||
-
|
||
-echo "$as_me:$LINENO: checking host system type" >&5
|
||
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
||
-if test "${ac_cv_host+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- ac_cv_host_alias=$host_alias
|
||
-test -z "$ac_cv_host_alias" &&
|
||
- ac_cv_host_alias=$ac_cv_build_alias
|
||
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
|
||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
|
||
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ac_save_IFS=$IFS; IFS='-'
|
||
+set x $ac_cv_build
|
||
+shift
|
||
+build_cpu=$1
|
||
+build_vendor=$2
|
||
+shift; shift
|
||
+# Remember, the first character of IFS is used to create $*,
|
||
+# except with old shells:
|
||
+build_os=$*
|
||
+IFS=$ac_save_IFS
|
||
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
||
+
|
||
+
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
|
||
+$as_echo_n "checking host system type... " >&6; }
|
||
+if test "${ac_cv_host+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ if test "x$host_alias" = x; then
|
||
+ ac_cv_host=$ac_cv_build
|
||
+else
|
||
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
||
+fi
|
||
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
||
-echo "${ECHO_T}$ac_cv_host" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
|
||
+$as_echo "$ac_cv_host" >&6; }
|
||
+case $ac_cv_host in
|
||
+*-*-*) ;;
|
||
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
||
+esac
|
||
host=$ac_cv_host
|
||
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||
-
|
||
-
|
||
-echo "$as_me:$LINENO: checking target system type" >&5
|
||
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
|
||
-if test "${ac_cv_target+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- ac_cv_target_alias=$target_alias
|
||
-test "x$ac_cv_target_alias" = "x" &&
|
||
- ac_cv_target_alias=$ac_cv_host_alias
|
||
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
|
||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
|
||
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ac_save_IFS=$IFS; IFS='-'
|
||
+set x $ac_cv_host
|
||
+shift
|
||
+host_cpu=$1
|
||
+host_vendor=$2
|
||
+shift; shift
|
||
+# Remember, the first character of IFS is used to create $*,
|
||
+# except with old shells:
|
||
+host_os=$*
|
||
+IFS=$ac_save_IFS
|
||
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||
+
|
||
+
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
|
||
+$as_echo_n "checking target system type... " >&6; }
|
||
+if test "${ac_cv_target+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ if test "x$target_alias" = x; then
|
||
+ ac_cv_target=$ac_cv_host
|
||
+else
|
||
+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
|
||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
|
||
+fi
|
||
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
||
-echo "${ECHO_T}$ac_cv_target" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
|
||
+$as_echo "$ac_cv_target" >&6; }
|
||
+case $ac_cv_target in
|
||
+*-*-*) ;;
|
||
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
|
||
+esac
|
||
target=$ac_cv_target
|
||
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||
+ac_save_IFS=$IFS; IFS='-'
|
||
+set x $ac_cv_target
|
||
+shift
|
||
+target_cpu=$1
|
||
+target_vendor=$2
|
||
+shift; shift
|
||
+# Remember, the first character of IFS is used to create $*,
|
||
+# except with old shells:
|
||
+target_os=$*
|
||
+IFS=$ac_save_IFS
|
||
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
|
||
|
||
|
||
# The aliases save the names the user supplied, while $host etc.
|
||
@@ -1557,18 +2419,16 @@
|
||
test "$program_prefix$program_suffix$program_transform_name" = \
|
||
NONENONEs,x,x, &&
|
||
program_prefix=${target_alias}-
|
||
+
|
||
test "$program_prefix" != NONE &&
|
||
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
|
||
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
||
# Use a double $ so make ignores it.
|
||
test "$program_suffix" != NONE &&
|
||
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
|
||
-# Double any \ or $. echo might interpret backslashes.
|
||
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
|
||
+# Double any \ or $.
|
||
# By default was `s,x,x', remove it if useless.
|
||
-cat <<\_ACEOF >conftest.sed
|
||
-s/[\\$]/&&/g;s/;s,x,x,$//
|
||
-_ACEOF
|
||
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
|
||
-rm conftest.sed
|
||
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
|
||
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
|
||
|
||
ac_ext=c
|
||
ac_cpp='$CPP $CPPFLAGS'
|
||
@@ -1578,10 +2438,10 @@
|
||
if test -n "$ac_tool_prefix"; then
|
||
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -1591,35 +2451,37 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
fi
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
+
|
||
fi
|
||
if test -z "$ac_cv_prog_CC"; then
|
||
ac_ct_CC=$CC
|
||
# Extract the first word of "gcc", so it can be a program name with args.
|
||
set dummy gcc; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
@@ -1629,39 +2491,50 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_ac_ct_CC="gcc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
fi
|
||
fi
|
||
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
if test -n "$ac_ct_CC"; then
|
||
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
||
+$as_echo "$ac_ct_CC" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
- CC=$ac_ct_CC
|
||
+ if test "x$ac_ct_CC" = x; then
|
||
+ CC=""
|
||
+ else
|
||
+ case $cross_compiling:$ac_tool_warned in
|
||
+yes:)
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||
+ac_tool_warned=yes ;;
|
||
+esac
|
||
+ CC=$ac_ct_CC
|
||
+ fi
|
||
else
|
||
CC="$ac_cv_prog_CC"
|
||
fi
|
||
|
||
if test -z "$CC"; then
|
||
- if test -n "$ac_tool_prefix"; then
|
||
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
||
+ if test -n "$ac_tool_prefix"; then
|
||
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
||
set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -1671,77 +2544,37 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
fi
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6
|
||
-else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
-fi
|
||
-
|
||
-fi
|
||
-if test -z "$ac_cv_prog_CC"; then
|
||
- ac_ct_CC=$CC
|
||
- # Extract the first word of "cc", so it can be a program name with args.
|
||
-set dummy cc; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- if test -n "$ac_ct_CC"; then
|
||
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
-else
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
- ac_cv_prog_ac_ct_CC="cc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
-done
|
||
-
|
||
-fi
|
||
-fi
|
||
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
-if test -n "$ac_ct_CC"; then
|
||
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
- CC=$ac_ct_CC
|
||
-else
|
||
- CC="$ac_cv_prog_CC"
|
||
-fi
|
||
|
||
+ fi
|
||
fi
|
||
if test -z "$CC"; then
|
||
# Extract the first word of "cc", so it can be a program name with args.
|
||
set dummy cc; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -1752,18 +2585,19 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
||
ac_prog_rejected=yes
|
||
continue
|
||
fi
|
||
ac_cv_prog_CC="cc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
if test $ac_prog_rejected = yes; then
|
||
# We found a bogon in the path, so make sure we never use it.
|
||
@@ -1781,24 +2615,25 @@
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
+
|
||
fi
|
||
if test -z "$CC"; then
|
||
if test -n "$ac_tool_prefix"; then
|
||
- for ac_prog in cl
|
||
+ for ac_prog in cl.exe
|
||
do
|
||
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_CC+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$CC"; then
|
||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
@@ -1808,39 +2643,41 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
fi
|
||
fi
|
||
CC=$ac_cv_prog_CC
|
||
if test -n "$CC"; then
|
||
- echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
||
+$as_echo "$CC" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
+
|
||
test -n "$CC" && break
|
||
done
|
||
fi
|
||
if test -z "$CC"; then
|
||
ac_ct_CC=$CC
|
||
- for ac_prog in cl
|
||
+ for ac_prog in cl.exe
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_CC"; then
|
||
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
@@ -1850,183 +2687,192 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_ac_ct_CC="$ac_prog"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
fi
|
||
fi
|
||
ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
if test -n "$ac_ct_CC"; then
|
||
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
||
+$as_echo "$ac_ct_CC" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
+
|
||
test -n "$ac_ct_CC" && break
|
||
done
|
||
|
||
- CC=$ac_ct_CC
|
||
+ if test "x$ac_ct_CC" = x; then
|
||
+ CC=""
|
||
+ else
|
||
+ case $cross_compiling:$ac_tool_warned in
|
||
+yes:)
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||
+ac_tool_warned=yes ;;
|
||
+esac
|
||
+ CC=$ac_ct_CC
|
||
+ fi
|
||
fi
|
||
|
||
fi
|
||
|
||
|
||
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error "no acceptable C compiler found in \$PATH
|
||
+See \`config.log' for more details." "$LINENO" 5; }
|
||
|
||
# Provide some information about the compiler.
|
||
-echo "$as_me:$LINENO:" \
|
||
- "checking for C compiler version" >&5
|
||
-ac_compiler=`set X $ac_compile; echo $2`
|
||
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||
- (eval $ac_compiler --version </dev/null >&5) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }
|
||
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
|
||
- (eval $ac_compiler -v </dev/null >&5) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }
|
||
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
|
||
- (eval $ac_compiler -V </dev/null >&5) 2>&5
|
||
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
||
+set X $ac_compile
|
||
+ac_compiler=$2
|
||
+for ac_option in --version -v -V -qversion; do
|
||
+ { { ac_try="$ac_compiler $ac_option >&5"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }
|
||
+ if test -s conftest.err; then
|
||
+ sed '10a\
|
||
+... rest of stderr output deleted ...
|
||
+ 10q' conftest.err >conftest.er1
|
||
+ cat conftest.er1 >&5
|
||
+ rm -f conftest.er1 conftest.err
|
||
+ fi
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }
|
||
+done
|
||
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
int
|
||
main ()
|
||
{
|
||
-
|
||
+return 0;
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
ac_clean_files_save=$ac_clean_files
|
||
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
||
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
|
||
# Try to create an executable without -o first, disregard a.out.
|
||
# It will help us diagnose broken compilers, and finding out an intuition
|
||
# of exeext.
|
||
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
||
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
|
||
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
|
||
- (eval $ac_link_default) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; then
|
||
- # Find the output, starting from the most likely. This scheme is
|
||
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
|
||
-# resort.
|
||
-
|
||
-# Be careful to initialize this variable, since it used to be cached.
|
||
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
|
||
-ac_cv_exeext=
|
||
-# b.out is created by i960 compilers.
|
||
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
||
+$as_echo_n "checking whether the C compiler works... " >&6; }
|
||
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||
+
|
||
+# The possible output files:
|
||
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
|
||
+
|
||
+ac_rmfiles=
|
||
+for ac_file in $ac_files
|
||
do
|
||
- test -f "$ac_file" || continue
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
|
||
- ;;
|
||
- conftest.$ac_ext )
|
||
- # This is the source file.
|
||
- ;;
|
||
- [ab].out )
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
||
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
||
+ esac
|
||
+done
|
||
+rm -f $ac_rmfiles
|
||
+
|
||
+if { { ac_try="$ac_link_default"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_link_default") 2>&5
|
||
+ ac_status=$?
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }; then :
|
||
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
||
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
||
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
||
+# so that the user can short-circuit this test for compilers unknown to
|
||
+# Autoconf.
|
||
+for ac_file in $ac_files ''
|
||
+do
|
||
+ test -f "$ac_file" || continue
|
||
+ case $ac_file in
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
|
||
+ ;;
|
||
+ [ab].out )
|
||
# We found the default executable, but exeext='' is most
|
||
# certainly right.
|
||
break;;
|
||
*.* )
|
||
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
- # FIXME: I believe we export ac_cv_exeext for Libtool,
|
||
- # but it would be cool to find out if it's true. Does anybody
|
||
- # maintain Libtool? --akim.
|
||
- export ac_cv_exeext
|
||
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
||
+ then :; else
|
||
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
+ fi
|
||
+ # We set ac_cv_exeext here because the later test for it is not
|
||
+ # safe: cross compilers may not add the suffix if given an `-o'
|
||
+ # argument, so we may need to know it at that point already.
|
||
+ # Even if this section looks crufty: it has the advantage of
|
||
+ # actually working.
|
||
break;;
|
||
* )
|
||
break;;
|
||
esac
|
||
done
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+test "$ac_cv_exeext" = no && ac_cv_exeext=
|
||
|
||
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: C compiler cannot create executables
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 77); exit 77; }; }
|
||
+else
|
||
+ ac_file=''
|
||
fi
|
||
+if test -z "$ac_file"; then :
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
+$as_echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+{ as_fn_set_status 77
|
||
+as_fn_error "C compiler cannot create executables
|
||
+See \`config.log' for more details." "$LINENO" 5; }; }
|
||
+else
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
+$as_echo "yes" >&6; }
|
||
+fi
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
|
||
+$as_echo_n "checking for C compiler default output file name... " >&6; }
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
||
+$as_echo "$ac_file" >&6; }
|
||
ac_exeext=$ac_cv_exeext
|
||
-echo "$as_me:$LINENO: result: $ac_file" >&5
|
||
-echo "${ECHO_T}$ac_file" >&6
|
||
-
|
||
-# Check the compiler produces executables we can run. If not, either
|
||
-# the compiler is broken, or we cross compile.
|
||
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
||
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
|
||
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
||
-# If not cross compiling, check that we can run a simple program.
|
||
-if test "$cross_compiling" != yes; then
|
||
- if { ac_try='./$ac_file'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- cross_compiling=no
|
||
- else
|
||
- if test "$cross_compiling" = maybe; then
|
||
- cross_compiling=yes
|
||
- else
|
||
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||
-If you meant to cross compile, use \`--host'.
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot run C compiled programs.
|
||
-If you meant to cross compile, use \`--host'.
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- fi
|
||
- fi
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6
|
||
|
||
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
||
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
||
ac_clean_files=$ac_clean_files_save
|
||
-# Check the compiler produces executables we can run. If not, either
|
||
-# the compiler is broken, or we cross compile.
|
||
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
||
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
|
||
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
||
-echo "${ECHO_T}$cross_compiling" >&6
|
||
-
|
||
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
||
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>&5
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
|
||
+$as_echo_n "checking for suffix of executables... " >&6; }
|
||
+if { { ac_try="$ac_link"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_link") 2>&5
|
||
ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; then
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }; then :
|
||
# If both `conftest.exe' and `conftest' are `present' (well, observable)
|
||
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
||
# work properly (i.e., refer to `conftest.exe'), while it won't with
|
||
@@ -2034,38 +2880,90 @@
|
||
for ac_file in conftest.exe conftest conftest.*; do
|
||
test -f "$ac_file" || continue
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
|
||
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
- export ac_cv_exeext
|
||
break;;
|
||
* ) break;;
|
||
esac
|
||
done
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error "cannot compute suffix of executables: cannot compile and link
|
||
+See \`config.log' for more details." "$LINENO" 5; }
|
||
fi
|
||
-
|
||
rm -f conftest$ac_cv_exeext
|
||
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
||
-echo "${ECHO_T}$ac_cv_exeext" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
|
||
+$as_echo "$ac_cv_exeext" >&6; }
|
||
|
||
rm -f conftest.$ac_ext
|
||
EXEEXT=$ac_cv_exeext
|
||
ac_exeext=$EXEEXT
|
||
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
||
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
|
||
-if test "${ac_cv_objext+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+#include <stdio.h>
|
||
+int
|
||
+main ()
|
||
+{
|
||
+FILE *f = fopen ("conftest.out", "w");
|
||
+ return ferror (f) || fclose (f) != 0;
|
||
+
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ac_clean_files="$ac_clean_files conftest.out"
|
||
+# Check that the compiler produces executables we can run. If not, either
|
||
+# the compiler is broken, or we cross compile.
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
||
+$as_echo_n "checking whether we are cross compiling... " >&6; }
|
||
+if test "$cross_compiling" != yes; then
|
||
+ { { ac_try="$ac_link"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_link") 2>&5
|
||
+ ac_status=$?
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }
|
||
+ if { ac_try='./conftest$ac_cv_exeext'
|
||
+ { { case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_try") 2>&5
|
||
+ ac_status=$?
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }; }; then
|
||
+ cross_compiling=no
|
||
+ else
|
||
+ if test "$cross_compiling" = maybe; then
|
||
+ cross_compiling=yes
|
||
+ else
|
||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error "cannot run C compiled programs.
|
||
+If you meant to cross compile, use \`--host'.
|
||
+See \`config.log' for more details." "$LINENO" 5; }
|
||
+ fi
|
||
+ fi
|
||
+fi
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
||
+$as_echo "$cross_compiling" >&6; }
|
||
+
|
||
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
|
||
+ac_clean_files=$ac_clean_files_save
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
|
||
+$as_echo_n "checking for suffix of object files... " >&6; }
|
||
+if test "${ac_cv_objext+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
int
|
||
@@ -2077,45 +2975,46 @@
|
||
}
|
||
_ACEOF
|
||
rm -f conftest.o conftest.obj
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; then
|
||
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
|
||
+if { { ac_try="$ac_compile"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
+esac
|
||
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||
+$as_echo "$ac_try_echo"; } >&5
|
||
+ (eval "$ac_compile") 2>&5
|
||
+ ac_status=$?
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||
+ test $ac_status = 0; }; then :
|
||
+ for ac_file in conftest.o conftest.obj conftest.*; do
|
||
+ test -f "$ac_file" || continue;
|
||
case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
|
||
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
||
break;;
|
||
esac
|
||
done
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
+ $as_echo "$as_me: failed program was:" >&5
|
||
sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error "cannot compute suffix of object files: cannot compile
|
||
+See \`config.log' for more details." "$LINENO" 5; }
|
||
fi
|
||
-
|
||
rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
||
-echo "${ECHO_T}$ac_cv_objext" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
|
||
+$as_echo "$ac_cv_objext" >&6; }
|
||
OBJEXT=$ac_cv_objext
|
||
ac_objext=$OBJEXT
|
||
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
||
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
|
||
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
|
||
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
|
||
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
int
|
||
@@ -2129,55 +3028,34 @@
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
ac_compiler_gnu=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_compiler_gnu=no
|
||
+ ac_compiler_gnu=no
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
||
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
||
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
|
||
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
|
||
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
|
||
+if test $ac_compiler_gnu = yes; then
|
||
+ GCC=yes
|
||
+else
|
||
+ GCC=
|
||
+fi
|
||
ac_test_CFLAGS=${CFLAGS+set}
|
||
ac_save_CFLAGS=$CFLAGS
|
||
-CFLAGS="-g"
|
||
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_cc_g+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
|
||
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
|
||
+if test "${ac_cv_prog_cc_g+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ ac_save_c_werror_flag=$ac_c_werror_flag
|
||
+ ac_c_werror_flag=yes
|
||
+ ac_cv_prog_cc_g=no
|
||
+ CFLAGS="-g"
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
int
|
||
@@ -2188,39 +3066,49 @@
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
ac_cv_prog_cc_g=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+ CFLAGS=""
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+
|
||
+int
|
||
+main ()
|
||
+{
|
||
|
||
-ac_cv_prog_cc_g=no
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
+
|
||
+else
|
||
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
||
+ CFLAGS="-g"
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
+/* end confdefs.h. */
|
||
+
|
||
+int
|
||
+main ()
|
||
+{
|
||
+
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
+ ac_cv_prog_cc_g=yes
|
||
+fi
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
||
+fi
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
|
||
+$as_echo "$ac_cv_prog_cc_g" >&6; }
|
||
if test "$ac_test_CFLAGS" = set; then
|
||
CFLAGS=$ac_save_CFLAGS
|
||
elif test $ac_cv_prog_cc_g = yes; then
|
||
@@ -2236,18 +3124,14 @@
|
||
CFLAGS=
|
||
fi
|
||
fi
|
||
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
|
||
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
||
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
||
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- ac_cv_prog_cc_stdc=no
|
||
+ ac_cv_prog_cc_c89=no
|
||
ac_save_CC=$CC
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <stdarg.h>
|
||
#include <stdio.h>
|
||
@@ -2275,12 +3159,17 @@
|
||
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
||
function prototypes and stuff, but not '\xHH' hex character constants.
|
||
These don't provoke an error unfortunately, instead are silently treated
|
||
- as 'x'. The following induces an error, until -std1 is added to get
|
||
+ as 'x'. The following induces an error, until -std is added to get
|
||
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
||
array size at least. It's necessary to write '\x00'==0 to get something
|
||
- that's true only with -std1. */
|
||
+ that's true only with -std. */
|
||
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
||
|
||
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
|
||
+ inside strings and character constants. */
|
||
+#define FOO(x) 'x'
|
||
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
|
||
+
|
||
int test (int i, double x);
|
||
struct s1 {int (*f) (int a);};
|
||
struct s2 {int (*f) (double a);};
|
||
@@ -2295,205 +3184,37 @@
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-# Don't try gcc -ansi; that turns off useful extensions and
|
||
-# breaks some systems' header files.
|
||
-# AIX -qlanglvl=ansi
|
||
-# Ultrix and OSF/1 -std1
|
||
-# HP-UX 10.20 and later -Ae
|
||
-# HP-UX older versions -Aa -D_HPUX_SOURCE
|
||
-# SVR4 -Xc -D__EXTENSIONS__
|
||
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
||
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
|
||
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
||
do
|
||
CC="$ac_save_CC $ac_arg"
|
||
- rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_cv_prog_cc_stdc=$ac_arg
|
||
-break
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
+ if ac_fn_c_try_compile "$LINENO"; then :
|
||
+ ac_cv_prog_cc_c89=$ac_arg
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext
|
||
+rm -f core conftest.err conftest.$ac_objext
|
||
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
|
||
done
|
||
-rm -f conftest.$ac_ext conftest.$ac_objext
|
||
+rm -f conftest.$ac_ext
|
||
CC=$ac_save_CC
|
||
|
||
fi
|
||
-
|
||
-case "x$ac_cv_prog_cc_stdc" in
|
||
- x|xno)
|
||
- echo "$as_me:$LINENO: result: none needed" >&5
|
||
-echo "${ECHO_T}none needed" >&6 ;;
|
||
+# AC_CACHE_VAL
|
||
+case "x$ac_cv_prog_cc_c89" in
|
||
+ x)
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
||
+$as_echo "none needed" >&6; } ;;
|
||
+ xno)
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
||
+$as_echo "unsupported" >&6; } ;;
|
||
*)
|
||
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
|
||
- CC="$CC $ac_cv_prog_cc_stdc" ;;
|
||
+ CC="$CC $ac_cv_prog_cc_c89"
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
|
||
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
|
||
esac
|
||
-
|
||
-# Some people use a C++ compiler to compile C. Since we use `exit',
|
||
-# in C++ we need to declare it. In case someone uses the same compiler
|
||
-# for both compiling C and C++ we need to have the C++ compiler decide
|
||
-# the declaration of exit, since it's the most demanding environment.
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-#ifndef __cplusplus
|
||
- choke me
|
||
-#endif
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- for ac_declaration in \
|
||
- '' \
|
||
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||
- 'extern "C" void std::exit (int); using std::exit;' \
|
||
- 'extern "C" void exit (int) throw ();' \
|
||
- 'extern "C" void exit (int);' \
|
||
- 'void exit (int);'
|
||
-do
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_declaration
|
||
-#include <stdlib.h>
|
||
-int
|
||
-main ()
|
||
-{
|
||
-exit (42);
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- :
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-continue
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_declaration
|
||
-int
|
||
-main ()
|
||
-{
|
||
-exit (42);
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- break
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+if test "x$ac_cv_prog_cc_c89" != xno; then :
|
||
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-done
|
||
-rm -f conftest*
|
||
-if test -n "$ac_declaration"; then
|
||
- echo '#ifdef __cplusplus' >>confdefs.h
|
||
- echo $ac_declaration >>confdefs.h
|
||
- echo '#endif' >>confdefs.h
|
||
-fi
|
||
-
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
ac_ext=c
|
||
ac_cpp='$CPP $CPPFLAGS'
|
||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||
@@ -2513,22 +3234,23 @@
|
||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||
# OS/2's system install, which has a completely different semantic
|
||
# ./install, which can be erroneously created by make from ./install.sh.
|
||
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
||
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
|
||
+# Reject install programs that cannot install multiple files.
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
|
||
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
|
||
if test -z "$INSTALL"; then
|
||
-if test "${ac_cv_path_install+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+if test "${ac_cv_path_install+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- # Account for people who put trailing slashes in PATH elements.
|
||
-case $as_dir/ in
|
||
- ./ | .// | /cC/* | \
|
||
+ # Account for people who put trailing slashes in PATH elements.
|
||
+case $as_dir/ in #((
|
||
+ ./ | .// | /[cC]/* | \
|
||
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
||
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
||
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
|
||
/usr/ucb/* ) ;;
|
||
*)
|
||
# OSF1 and SCO ODT 3.0 have their own names for install.
|
||
@@ -2536,7 +3258,7 @@
|
||
# by default.
|
||
for ac_prog in ginstall scoinst install; do
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
||
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
||
if test $ac_prog = install &&
|
||
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||
# AIX install. It has an incompatible calling convention.
|
||
@@ -2546,30 +3268,43 @@
|
||
# program-specific install script used by HP pwplus--don't use.
|
||
:
|
||
else
|
||
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||
- break 3
|
||
+ rm -rf conftest.one conftest.two conftest.dir
|
||
+ echo one > conftest.one
|
||
+ echo two > conftest.two
|
||
+ mkdir conftest.dir
|
||
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
|
||
+ test -s conftest.one && test -s conftest.two &&
|
||
+ test -s conftest.dir/conftest.one &&
|
||
+ test -s conftest.dir/conftest.two
|
||
+ then
|
||
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||
+ break 3
|
||
+ fi
|
||
fi
|
||
fi
|
||
done
|
||
done
|
||
;;
|
||
esac
|
||
-done
|
||
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+rm -rf conftest.one conftest.two conftest.dir
|
||
|
||
fi
|
||
if test "${ac_cv_path_install+set}" = set; then
|
||
INSTALL=$ac_cv_path_install
|
||
else
|
||
- # As a last resort, use the slow shell script. We don't cache a
|
||
- # path for INSTALL within a source directory, because that will
|
||
+ # As a last resort, use the slow shell script. Don't cache a
|
||
+ # value for INSTALL within a source directory, because that will
|
||
# break other packages using the cache if that directory is
|
||
- # removed, or if the path is relative.
|
||
+ # removed, or if the value is a relative name.
|
||
INSTALL=$ac_install_sh
|
||
fi
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $INSTALL" >&5
|
||
-echo "${ECHO_T}$INSTALL" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
|
||
+$as_echo "$INSTALL" >&6; }
|
||
|
||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||
# It thinks the first close brace ends the variable substitution.
|
||
@@ -2595,10 +3330,10 @@
|
||
if test -n "$ac_tool_prefix"; then
|
||
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_RANLIB+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$RANLIB"; then
|
||
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
||
@@ -2608,35 +3343,37 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
fi
|
||
fi
|
||
RANLIB=$ac_cv_prog_RANLIB
|
||
if test -n "$RANLIB"; then
|
||
- echo "$as_me:$LINENO: result: $RANLIB" >&5
|
||
-echo "${ECHO_T}$RANLIB" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
|
||
+$as_echo "$RANLIB" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
+
|
||
fi
|
||
if test -z "$ac_cv_prog_RANLIB"; then
|
||
ac_ct_RANLIB=$RANLIB
|
||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||
set dummy ranlib; ac_word=$2
|
||
-echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
+$as_echo_n "checking for $ac_word... " >&6; }
|
||
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
if test -n "$ac_ct_RANLIB"; then
|
||
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
||
@@ -2646,28 +3383,38 @@
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
ac_cv_prog_ac_ct_RANLIB="ranlib"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
done
|
||
-done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
|
||
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
|
||
fi
|
||
fi
|
||
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
||
if test -n "$ac_ct_RANLIB"; then
|
||
- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
||
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
|
||
+$as_echo "$ac_ct_RANLIB" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
fi
|
||
|
||
- RANLIB=$ac_ct_RANLIB
|
||
+ if test "x$ac_ct_RANLIB" = x; then
|
||
+ RANLIB=":"
|
||
+ else
|
||
+ case $cross_compiling:$ac_tool_warned in
|
||
+yes:)
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
||
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
||
+ac_tool_warned=yes ;;
|
||
+esac
|
||
+ RANLIB=$ac_ct_RANLIB
|
||
+ fi
|
||
else
|
||
RANLIB="$ac_cv_prog_RANLIB"
|
||
fi
|
||
@@ -2687,22 +3434,20 @@
|
||
if test -f ../../intl/config.intl; then
|
||
. ../../intl/config.intl
|
||
fi
|
||
-echo "$as_me:$LINENO: checking whether NLS is requested" >&5
|
||
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
|
||
+$as_echo_n "checking whether NLS is requested... " >&6; }
|
||
if test x"$USE_NLS" != xyes; then
|
||
- echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
+$as_echo "no" >&6; }
|
||
else
|
||
- echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||
+$as_echo "yes" >&6; }
|
||
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define ENABLE_NLS 1
|
||
-_ACEOF
|
||
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
|
||
|
||
|
||
- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
|
||
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
|
||
+$as_echo_n "checking for catalogs to be installed... " >&6; }
|
||
# Look for .po and .gmo files in the source directory.
|
||
CATALOGS=
|
||
XLINGUAS=
|
||
@@ -2733,8 +3478,8 @@
|
||
fi
|
||
done
|
||
LINGUAS="$XLINGUAS"
|
||
- echo "$as_me:$LINENO: result: $LINGUAS" >&5
|
||
-echo "${ECHO_T}$LINGUAS" >&6
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
|
||
+$as_echo "$LINGUAS" >&6; }
|
||
|
||
|
||
DATADIRNAME=share
|
||
@@ -2756,15 +3501,15 @@
|
||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
||
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
|
||
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
|
||
# On Suns, sometimes $CPP names a directory.
|
||
if test -n "$CPP" && test -d "$CPP"; then
|
||
CPP=
|
||
fi
|
||
if test -z "$CPP"; then
|
||
- if test "${ac_cv_prog_CPP+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+ if test "${ac_cv_prog_CPP+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
# Double quotes because CPP needs to be expanded
|
||
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
|
||
@@ -2778,11 +3523,7 @@
|
||
# <limits.h> exists even on freestanding compilers.
|
||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||
# not just through cpp. "Syntax error" is here to catch this case.
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#ifdef __STDC__
|
||
# include <limits.h>
|
||
@@ -2791,68 +3532,24 @@
|
||
#endif
|
||
Syntax error
|
||
_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- :
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+if ac_fn_c_try_cpp "$LINENO"; then :
|
||
|
||
+else
|
||
# Broken: fails on valid input.
|
||
continue
|
||
fi
|
||
rm -f conftest.err conftest.$ac_ext
|
||
|
||
- # OK, works on sane cases. Now check whether non-existent headers
|
||
+ # OK, works on sane cases. Now check whether nonexistent headers
|
||
# can be detected and how.
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <ac_nonexistent.h>
|
||
_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
+if ac_fn_c_try_cpp "$LINENO"; then :
|
||
# Broken: success on invalid input.
|
||
continue
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
# Passes both tests.
|
||
ac_preproc_ok=:
|
||
break
|
||
@@ -2862,7 +3559,7 @@
|
||
done
|
||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||
rm -f conftest.err conftest.$ac_ext
|
||
-if $ac_preproc_ok; then
|
||
+if $ac_preproc_ok; then :
|
||
break
|
||
fi
|
||
|
||
@@ -2874,8 +3571,8 @@
|
||
else
|
||
ac_cv_prog_CPP=$CPP
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $CPP" >&5
|
||
-echo "${ECHO_T}$CPP" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
|
||
+$as_echo "$CPP" >&6; }
|
||
ac_preproc_ok=false
|
||
for ac_c_preproc_warn_flag in '' yes
|
||
do
|
||
@@ -2885,11 +3582,7 @@
|
||
# <limits.h> exists even on freestanding compilers.
|
||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||
# not just through cpp. "Syntax error" is here to catch this case.
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#ifdef __STDC__
|
||
# include <limits.h>
|
||
@@ -2898,68 +3591,24 @@
|
||
#endif
|
||
Syntax error
|
||
_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- :
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+if ac_fn_c_try_cpp "$LINENO"; then :
|
||
|
||
+else
|
||
# Broken: fails on valid input.
|
||
continue
|
||
fi
|
||
rm -f conftest.err conftest.$ac_ext
|
||
|
||
- # OK, works on sane cases. Now check whether non-existent headers
|
||
+ # OK, works on sane cases. Now check whether nonexistent headers
|
||
# can be detected and how.
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <ac_nonexistent.h>
|
||
_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
+if ac_fn_c_try_cpp "$LINENO"; then :
|
||
# Broken: success on invalid input.
|
||
continue
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
# Passes both tests.
|
||
ac_preproc_ok=:
|
||
break
|
||
@@ -2969,14 +3618,13 @@
|
||
done
|
||
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
|
||
rm -f conftest.err conftest.$ac_ext
|
||
-if $ac_preproc_ok; then
|
||
- :
|
||
+if $ac_preproc_ok; then :
|
||
+
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
||
+See \`config.log' for more details." "$LINENO" 5; }
|
||
fi
|
||
|
||
ac_ext=c
|
||
@@ -2986,31 +3634,142 @@
|
||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
|
||
|
||
-echo "$as_me:$LINENO: checking for egrep" >&5
|
||
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
|
||
-if test "${ac_cv_prog_egrep+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
|
||
- then ac_cv_prog_egrep='grep -E'
|
||
- else ac_cv_prog_egrep='egrep'
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
||
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||
+if test "${ac_cv_path_GREP+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ if test -z "$GREP"; then
|
||
+ ac_path_GREP_found=false
|
||
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_prog in grep ggrep; do
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
||
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
||
+# Check for GNU ac_path_GREP and select it if it is found.
|
||
+ # Check for GNU $ac_path_GREP
|
||
+case `"$ac_path_GREP" --version 2>&1` in
|
||
+*GNU*)
|
||
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
||
+*)
|
||
+ ac_count=0
|
||
+ $as_echo_n 0123456789 >"conftest.in"
|
||
+ while :
|
||
+ do
|
||
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||
+ mv "conftest.tmp" "conftest.in"
|
||
+ cp "conftest.in" "conftest.nl"
|
||
+ $as_echo 'GREP' >> "conftest.nl"
|
||
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
||
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
||
+ # Best one so far, save it but keep looking for a better one
|
||
+ ac_cv_path_GREP="$ac_path_GREP"
|
||
+ ac_path_GREP_max=$ac_count
|
||
+ fi
|
||
+ # 10*(2^10) chars as input seems more than enough
|
||
+ test $ac_count -gt 10 && break
|
||
+ done
|
||
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||
+esac
|
||
+
|
||
+ $ac_path_GREP_found && break 3
|
||
+ done
|
||
+ done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
+ if test -z "$ac_cv_path_GREP"; then
|
||
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
+ fi
|
||
+else
|
||
+ ac_cv_path_GREP=$GREP
|
||
+fi
|
||
+
|
||
+fi
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
||
+$as_echo "$ac_cv_path_GREP" >&6; }
|
||
+ GREP="$ac_cv_path_GREP"
|
||
+
|
||
+
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
||
+$as_echo_n "checking for egrep... " >&6; }
|
||
+if test "${ac_cv_path_EGREP+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
+else
|
||
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
||
+ then ac_cv_path_EGREP="$GREP -E"
|
||
+ else
|
||
+ if test -z "$EGREP"; then
|
||
+ ac_path_EGREP_found=false
|
||
+ # Loop through the user's path and test for each of PROGNAME-LIST
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_prog in egrep; do
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
||
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
||
+# Check for GNU ac_path_EGREP and select it if it is found.
|
||
+ # Check for GNU $ac_path_EGREP
|
||
+case `"$ac_path_EGREP" --version 2>&1` in
|
||
+*GNU*)
|
||
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
||
+*)
|
||
+ ac_count=0
|
||
+ $as_echo_n 0123456789 >"conftest.in"
|
||
+ while :
|
||
+ do
|
||
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||
+ mv "conftest.tmp" "conftest.in"
|
||
+ cp "conftest.in" "conftest.nl"
|
||
+ $as_echo 'EGREP' >> "conftest.nl"
|
||
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
||
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
||
+ # Best one so far, save it but keep looking for a better one
|
||
+ ac_cv_path_EGREP="$ac_path_EGREP"
|
||
+ ac_path_EGREP_max=$ac_count
|
||
fi
|
||
+ # 10*(2^10) chars as input seems more than enough
|
||
+ test $ac_count -gt 10 && break
|
||
+ done
|
||
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||
+esac
|
||
+
|
||
+ $ac_path_EGREP_found && break 3
|
||
+ done
|
||
+ done
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
+ if test -z "$ac_cv_path_EGREP"; then
|
||
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
||
+ fi
|
||
+else
|
||
+ ac_cv_path_EGREP=$EGREP
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
|
||
- EGREP=$ac_cv_prog_egrep
|
||
+
|
||
+ fi
|
||
+fi
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
||
+$as_echo "$ac_cv_path_EGREP" >&6; }
|
||
+ EGREP="$ac_cv_path_EGREP"
|
||
|
||
|
||
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
||
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
|
||
-if test "${ac_cv_header_stdc+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
||
+$as_echo_n "checking for ANSI C header files... " >&6; }
|
||
+if test "${ac_cv_header_stdc+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <stdlib.h>
|
||
#include <stdarg.h>
|
||
@@ -3025,51 +3784,23 @@
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
ac_cv_header_stdc=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_cv_header_stdc=no
|
||
+ ac_cv_header_stdc=no
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
|
||
if test $ac_cv_header_stdc = yes; then
|
||
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <string.h>
|
||
|
||
_ACEOF
|
||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||
- $EGREP "memchr" >/dev/null 2>&1; then
|
||
- :
|
||
+ $EGREP "memchr" >/dev/null 2>&1; then :
|
||
+
|
||
else
|
||
ac_cv_header_stdc=no
|
||
fi
|
||
@@ -3079,18 +3810,14 @@
|
||
|
||
if test $ac_cv_header_stdc = yes; then
|
||
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <stdlib.h>
|
||
|
||
_ACEOF
|
||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||
- $EGREP "free" >/dev/null 2>&1; then
|
||
- :
|
||
+ $EGREP "free" >/dev/null 2>&1; then :
|
||
+
|
||
else
|
||
ac_cv_header_stdc=no
|
||
fi
|
||
@@ -3100,16 +3827,13 @@
|
||
|
||
if test $ac_cv_header_stdc = yes; then
|
||
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
|
||
- if test "$cross_compiling" = yes; then
|
||
+ if test "$cross_compiling" = yes; then :
|
||
:
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <ctype.h>
|
||
+#include <stdlib.h>
|
||
#if ((' ' & 0x0FF) == 0x020)
|
||
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
||
@@ -3129,109 +3853,40 @@
|
||
for (i = 0; i < 256; i++)
|
||
if (XOR (islower (i), ISLOWER (i))
|
||
|| toupper (i) != TOUPPER (i))
|
||
- exit(2);
|
||
- exit (0);
|
||
+ return 2;
|
||
+ return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest$ac_exeext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- :
|
||
-else
|
||
- echo "$as_me: program exited with status $ac_status" >&5
|
||
-echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+if ac_fn_c_try_run "$LINENO"; then :
|
||
|
||
-( exit $ac_status )
|
||
-ac_cv_header_stdc=no
|
||
+else
|
||
+ ac_cv_header_stdc=no
|
||
fi
|
||
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||
fi
|
||
+
|
||
fi
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
||
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
|
||
+$as_echo "$ac_cv_header_stdc" >&6; }
|
||
if test $ac_cv_header_stdc = yes; then
|
||
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define STDC_HEADERS 1
|
||
-_ACEOF
|
||
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
||
|
||
fi
|
||
|
||
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
||
inttypes.h stdint.h unistd.h
|
||
-do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_includes_default
|
||
-
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- eval "$as_ac_Header=yes"
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-eval "$as_ac_Header=no"
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+do :
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
||
+"
|
||
+eval as_val=\$$as_ac_Header
|
||
+ if test "x$as_val" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -3239,714 +3894,70 @@
|
||
done
|
||
|
||
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-
|
||
for ac_header in stdlib.h string.h strings.h unistd.h time.h
|
||
-do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-else
|
||
- # Is the header compilable?
|
||
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_includes_default
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_header_compiler=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_header_compiler=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6
|
||
-
|
||
-# Is the header present?
|
||
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- ac_header_preproc=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
- ac_header_preproc=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6
|
||
-
|
||
-# So? What about this header?
|
||
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
- yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
- ac_header_preproc=yes
|
||
- ;;
|
||
- no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
- (
|
||
- cat <<\_ASBOX
|
||
-## ------------------------------------------ ##
|
||
-## Report this to the AC_PACKAGE_NAME lists. ##
|
||
-## ------------------------------------------ ##
|
||
-_ASBOX
|
||
- ) |
|
||
- sed "s/^/$as_me: WARNING: /" >&2
|
||
- ;;
|
||
-esac
|
||
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- eval "$as_ac_Header=\$ac_header_preproc"
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-
|
||
-fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+do :
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||
+eval as_val=\$$as_ac_Header
|
||
+ if test "x$as_val" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
|
||
done
|
||
|
||
-
|
||
-
|
||
for ac_header in sys/time.h sys/resource.h
|
||
-do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-else
|
||
- # Is the header compilable?
|
||
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_includes_default
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_header_compiler=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_header_compiler=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6
|
||
-
|
||
-# Is the header present?
|
||
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- ac_header_preproc=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
- ac_header_preproc=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6
|
||
-
|
||
-# So? What about this header?
|
||
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
- yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
- ac_header_preproc=yes
|
||
- ;;
|
||
- no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
- (
|
||
- cat <<\_ASBOX
|
||
-## ------------------------------------------ ##
|
||
-## Report this to the AC_PACKAGE_NAME lists. ##
|
||
-## ------------------------------------------ ##
|
||
-_ASBOX
|
||
- ) |
|
||
- sed "s/^/$as_me: WARNING: /" >&2
|
||
- ;;
|
||
-esac
|
||
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- eval "$as_ac_Header=\$ac_header_preproc"
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-
|
||
-fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+do :
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||
+eval as_val=\$$as_ac_Header
|
||
+ if test "x$as_val" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
|
||
done
|
||
|
||
-
|
||
-
|
||
for ac_header in fcntl.h fpu_control.h
|
||
-do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-else
|
||
- # Is the header compilable?
|
||
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_includes_default
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_header_compiler=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_header_compiler=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6
|
||
-
|
||
-# Is the header present?
|
||
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- ac_header_preproc=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
- ac_header_preproc=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6
|
||
-
|
||
-# So? What about this header?
|
||
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
- yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
- ac_header_preproc=yes
|
||
- ;;
|
||
- no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
- (
|
||
- cat <<\_ASBOX
|
||
-## ------------------------------------------ ##
|
||
-## Report this to the AC_PACKAGE_NAME lists. ##
|
||
-## ------------------------------------------ ##
|
||
-_ASBOX
|
||
- ) |
|
||
- sed "s/^/$as_me: WARNING: /" >&2
|
||
- ;;
|
||
-esac
|
||
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- eval "$as_ac_Header=\$ac_header_preproc"
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-
|
||
-fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+do :
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||
+eval as_val=\$$as_ac_Header
|
||
+ if test "x$as_val" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
|
||
done
|
||
|
||
-
|
||
-
|
||
-
|
||
for ac_header in dlfcn.h errno.h sys/stat.h
|
||
-do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-else
|
||
- # Is the header compilable?
|
||
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_includes_default
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_header_compiler=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_header_compiler=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6
|
||
-
|
||
-# Is the header present?
|
||
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- ac_header_preproc=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
- ac_header_preproc=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6
|
||
-
|
||
-# So? What about this header?
|
||
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
- yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
- ac_header_preproc=yes
|
||
- ;;
|
||
- no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
- (
|
||
- cat <<\_ASBOX
|
||
-## ------------------------------------------ ##
|
||
-## Report this to the AC_PACKAGE_NAME lists. ##
|
||
-## ------------------------------------------ ##
|
||
-_ASBOX
|
||
- ) |
|
||
- sed "s/^/$as_me: WARNING: /" >&2
|
||
- ;;
|
||
-esac
|
||
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- eval "$as_ac_Header=\$ac_header_preproc"
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-
|
||
-fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+do :
|
||
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||
+eval as_val=\$$as_ac_Header
|
||
+ if test "x$as_val" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
|
||
done
|
||
|
||
-
|
||
-
|
||
-
|
||
-
|
||
for ac_func in getrusage time sigaction __setfpucw
|
||
-do
|
||
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||
-echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
||
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||
-#define $ac_func innocuous_$ac_func
|
||
-
|
||
-/* System header to define __stub macros and hopefully few prototypes,
|
||
- which can conflict with char $ac_func (); below.
|
||
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||
- <limits.h> exists even on freestanding compilers. */
|
||
-
|
||
-#ifdef __STDC__
|
||
-# include <limits.h>
|
||
-#else
|
||
-# include <assert.h>
|
||
-#endif
|
||
-
|
||
-#undef $ac_func
|
||
-
|
||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||
-#ifdef __cplusplus
|
||
-extern "C"
|
||
-{
|
||
-#endif
|
||
-/* We use char because int might match the return type of a gcc2
|
||
- builtin and then its argument prototype would still apply. */
|
||
-char $ac_func ();
|
||
-/* The GNU C library defines this for functions which it implements
|
||
- to always fail with ENOSYS. Some functions are actually named
|
||
- something starting with __ and the normal name is an alias. */
|
||
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
||
-choke me
|
||
-#else
|
||
-char (*f) () = $ac_func;
|
||
-#endif
|
||
-#ifdef __cplusplus
|
||
-}
|
||
-#endif
|
||
-
|
||
-int
|
||
-main ()
|
||
-{
|
||
-return f != $ac_func;
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest$ac_exeext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- eval "$as_ac_var=yes"
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-eval "$as_ac_var=no"
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext \
|
||
- conftest$ac_exeext conftest.$ac_ext
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||
-if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||
+do :
|
||
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
||
+eval as_val=\$$as_ac_var
|
||
+ if test "x$as_val" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -3954,72 +3965,43 @@
|
||
|
||
|
||
# Check for socket libraries
|
||
-
|
||
-echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
|
||
-echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6
|
||
-if test "${ac_cv_lib_socket_bind+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
|
||
+$as_echo_n "checking for bind in -lsocket... " >&6; }
|
||
+if test "${ac_cv_lib_socket_bind+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_check_lib_save_LIBS=$LIBS
|
||
LIBS="-lsocket $LIBS"
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||
+/* Override any GCC internal prototype to avoid an error.
|
||
+ Use char because int might match the return type of a GCC
|
||
+ builtin and then its argument prototype would still apply. */
|
||
#ifdef __cplusplus
|
||
extern "C"
|
||
#endif
|
||
-/* We use char because int might match the return type of a gcc2
|
||
- builtin and then its argument prototype would still apply. */
|
||
char bind ();
|
||
int
|
||
main ()
|
||
{
|
||
-bind ();
|
||
+return bind ();
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest$ac_exeext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
+if ac_fn_c_try_link "$LINENO"; then :
|
||
ac_cv_lib_socket_bind=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_cv_lib_socket_bind=no
|
||
+ ac_cv_lib_socket_bind=no
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext \
|
||
- conftest$ac_exeext conftest.$ac_ext
|
||
+rm -f core conftest.err conftest.$ac_objext \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
LIBS=$ac_check_lib_save_LIBS
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5
|
||
-echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6
|
||
-if test $ac_cv_lib_socket_bind = yes; then
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5
|
||
+$as_echo "$ac_cv_lib_socket_bind" >&6; }
|
||
+if test "x$ac_cv_lib_socket_bind" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_LIBSOCKET 1
|
||
_ACEOF
|
||
@@ -4028,72 +4010,43 @@
|
||
|
||
fi
|
||
|
||
-
|
||
-echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
|
||
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
|
||
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
|
||
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
|
||
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
ac_check_lib_save_LIBS=$LIBS
|
||
LIBS="-lnsl $LIBS"
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||
+/* Override any GCC internal prototype to avoid an error.
|
||
+ Use char because int might match the return type of a GCC
|
||
+ builtin and then its argument prototype would still apply. */
|
||
#ifdef __cplusplus
|
||
extern "C"
|
||
#endif
|
||
-/* We use char because int might match the return type of a gcc2
|
||
- builtin and then its argument prototype would still apply. */
|
||
char gethostbyname ();
|
||
int
|
||
main ()
|
||
{
|
||
-gethostbyname ();
|
||
+return gethostbyname ();
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest$ac_exeext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
+if ac_fn_c_try_link "$LINENO"; then :
|
||
ac_cv_lib_nsl_gethostbyname=yes
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_cv_lib_nsl_gethostbyname=no
|
||
+ ac_cv_lib_nsl_gethostbyname=no
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext \
|
||
- conftest$ac_exeext conftest.$ac_ext
|
||
+rm -f core conftest.err conftest.$ac_objext \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
LIBS=$ac_check_lib_save_LIBS
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
||
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
|
||
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
|
||
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
|
||
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define HAVE_LIBNSL 1
|
||
_ACEOF
|
||
@@ -4108,50 +4061,43 @@
|
||
|
||
|
||
USE_MAINTAINER_MODE=no
|
||
-# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||
-if test "${enable_maintainer_mode+set}" = set; then
|
||
- enableval="$enable_maintainer_mode"
|
||
- case "${enableval}" in
|
||
+# Check whether --enable-maintainer-mode was given.
|
||
+if test "${enable_maintainer_mode+set}" = set; then :
|
||
+ enableval=$enable_maintainer_mode; case "${enableval}" in
|
||
yes) MAINT="" USE_MAINTAINER_MODE=yes ;;
|
||
no) MAINT="#" ;;
|
||
- *) { { echo "$as_me:$LINENO: error: \"--enable-maintainer-mode does not take a value\"" >&5
|
||
-echo "$as_me: error: \"--enable-maintainer-mode does not take a value\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; MAINT="#" ;;
|
||
+ *) as_fn_error "\"--enable-maintainer-mode does not take a value\"" "$LINENO" 5; MAINT="#" ;;
|
||
esac
|
||
if test x"$silent" != x"yes" && test x"$MAINT" = x""; then
|
||
echo "Setting maintainer mode" 6>&1
|
||
fi
|
||
else
|
||
MAINT="#"
|
||
-fi;
|
||
+fi
|
||
+
|
||
|
||
|
||
-# Check whether --enable-sim-bswap or --disable-sim-bswap was given.
|
||
-if test "${enable_sim_bswap+set}" = set; then
|
||
- enableval="$enable_sim_bswap"
|
||
- case "${enableval}" in
|
||
+# Check whether --enable-sim-bswap was given.
|
||
+if test "${enable_sim_bswap+set}" = set; then :
|
||
+ enableval=$enable_sim_bswap; case "${enableval}" in
|
||
yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
|
||
no) sim_bswap="-DWITH_BSWAP=0";;
|
||
- *) { { echo "$as_me:$LINENO: error: \"--enable-sim-bswap does not take a value\"" >&5
|
||
-echo "$as_me: error: \"--enable-sim-bswap does not take a value\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; sim_bswap="";;
|
||
+ *) as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
|
||
esac
|
||
if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
|
||
echo "Setting bswap flags = $sim_bswap" 6>&1
|
||
fi
|
||
else
|
||
sim_bswap=""
|
||
-fi;
|
||
+fi
|
||
|
||
|
||
-# Check whether --enable-sim-cflags or --disable-sim-cflags was given.
|
||
-if test "${enable_sim_cflags+set}" = set; then
|
||
- enableval="$enable_sim_cflags"
|
||
- case "${enableval}" in
|
||
+
|
||
+# Check whether --enable-sim-cflags was given.
|
||
+if test "${enable_sim_cflags+set}" = set; then :
|
||
+ enableval=$enable_sim_cflags; case "${enableval}" in
|
||
yes) sim_cflags="-O2 -fomit-frame-pointer";;
|
||
- trace) { { echo "$as_me:$LINENO: error: \"Please use --enable-sim-debug instead.\"" >&5
|
||
-echo "$as_me: error: \"Please use --enable-sim-debug instead.\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; sim_cflags="";;
|
||
+ trace) as_fn_error "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";;
|
||
no) sim_cflags="";;
|
||
*) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
|
||
esac
|
||
@@ -4160,13 +4106,13 @@
|
||
fi
|
||
else
|
||
sim_cflags=""
|
||
-fi;
|
||
+fi
|
||
|
||
|
||
-# Check whether --enable-sim-debug or --disable-sim-debug was given.
|
||
-if test "${enable_sim_debug+set}" = set; then
|
||
- enableval="$enable_sim_debug"
|
||
- case "${enableval}" in
|
||
+
|
||
+# Check whether --enable-sim-debug was given.
|
||
+if test "${enable_sim_debug+set}" = set; then :
|
||
+ enableval=$enable_sim_debug; case "${enableval}" in
|
||
yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
|
||
no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
|
||
*) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
|
||
@@ -4176,31 +4122,29 @@
|
||
fi
|
||
else
|
||
sim_debug=""
|
||
-fi;
|
||
+fi
|
||
+
|
||
|
||
|
||
-# Check whether --enable-sim-stdio or --disable-sim-stdio was given.
|
||
-if test "${enable_sim_stdio+set}" = set; then
|
||
- enableval="$enable_sim_stdio"
|
||
- case "${enableval}" in
|
||
+# Check whether --enable-sim-stdio was given.
|
||
+if test "${enable_sim_stdio+set}" = set; then :
|
||
+ enableval=$enable_sim_stdio; case "${enableval}" in
|
||
yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
|
||
no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
|
||
- *) { { echo "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&5
|
||
-echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; sim_stdio="";;
|
||
+ *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
|
||
esac
|
||
if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
|
||
echo "Setting stdio flags = $sim_stdio" 6>&1
|
||
fi
|
||
else
|
||
sim_stdio=""
|
||
-fi;
|
||
+fi
|
||
+
|
||
|
||
|
||
-# Check whether --enable-sim-trace or --disable-sim-trace was given.
|
||
-if test "${enable_sim_trace+set}" = set; then
|
||
- enableval="$enable_sim_trace"
|
||
- case "${enableval}" in
|
||
+# Check whether --enable-sim-trace was given.
|
||
+if test "${enable_sim_trace+set}" = set; then :
|
||
+ enableval=$enable_sim_trace; case "${enableval}" in
|
||
yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";;
|
||
no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";;
|
||
[-0-9]*)
|
||
@@ -4221,13 +4165,13 @@
|
||
fi
|
||
else
|
||
sim_trace=""
|
||
-fi;
|
||
+fi
|
||
+
|
||
|
||
|
||
-# Check whether --enable-sim-profile or --disable-sim-profile was given.
|
||
-if test "${enable_sim_profile+set}" = set; then
|
||
- enableval="$enable_sim_profile"
|
||
- case "${enableval}" in
|
||
+# Check whether --enable-sim-profile was given.
|
||
+if test "${enable_sim_profile+set}" = set; then :
|
||
+ enableval=$enable_sim_profile; case "${enableval}" in
|
||
yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
|
||
no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
|
||
[-0-9]*)
|
||
@@ -4248,72 +4192,37 @@
|
||
fi
|
||
else
|
||
sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
|
||
-fi;
|
||
+fi
|
||
|
||
|
||
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
|
||
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
|
||
-if test "${ac_cv_type_signal+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
|
||
+$as_echo_n "checking return type of signal handlers... " >&6; }
|
||
+if test "${ac_cv_type_signal+set}" = set; then :
|
||
+ $as_echo_n "(cached) " >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
#include <sys/types.h>
|
||
#include <signal.h>
|
||
-#ifdef signal
|
||
-# undef signal
|
||
-#endif
|
||
-#ifdef __cplusplus
|
||
-extern "C" void (*signal (int, void (*)(int)))(int);
|
||
-#else
|
||
-void (*signal ()) ();
|
||
-#endif
|
||
|
||
int
|
||
main ()
|
||
{
|
||
-int i;
|
||
+return *(signal (0, 0)) (0) == 1;
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_cv_type_signal=void
|
||
+if ac_fn_c_try_compile "$LINENO"; then :
|
||
+ ac_cv_type_signal=int
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_cv_type_signal=int
|
||
+ ac_cv_type_signal=void
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
|
||
-echo "${ECHO_T}$ac_cv_type_signal" >&6
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
|
||
+$as_echo "$ac_cv_type_signal" >&6; }
|
||
|
||
cat >>confdefs.h <<_ACEOF
|
||
#define RETSIGTYPE $ac_cv_type_signal
|
||
@@ -4342,150 +4251,12 @@
|
||
sim_link_links="${sim_link_links} targ-vals.def"
|
||
|
||
|
||
-
|
||
for ac_header in stdlib.h
|
||
-do
|
||
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-else
|
||
- # Is the header compilable?
|
||
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
||
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-$ac_includes_default
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-rm -f conftest.$ac_objext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
- (eval $ac_compile) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest.$ac_objext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_header_compiler=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_header_compiler=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||
-echo "${ECHO_T}$ac_header_compiler" >&6
|
||
-
|
||
-# Is the header present?
|
||
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
||
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-#include <$ac_header>
|
||
-_ACEOF
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } >/dev/null; then
|
||
- if test -s conftest.err; then
|
||
- ac_cpp_err=$ac_c_preproc_warn_flag
|
||
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
|
||
- else
|
||
- ac_cpp_err=
|
||
- fi
|
||
-else
|
||
- ac_cpp_err=yes
|
||
-fi
|
||
-if test -z "$ac_cpp_err"; then
|
||
- ac_header_preproc=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
- ac_header_preproc=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_ext
|
||
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||
-echo "${ECHO_T}$ac_header_preproc" >&6
|
||
-
|
||
-# So? What about this header?
|
||
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||
- yes:no: )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
||
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
||
- ac_header_preproc=yes
|
||
- ;;
|
||
- no:yes:* )
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
||
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
||
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
||
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
||
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
||
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
||
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
||
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||
- (
|
||
- cat <<\_ASBOX
|
||
-## ------------------------------------------ ##
|
||
-## Report this to the AC_PACKAGE_NAME lists. ##
|
||
-## ------------------------------------------ ##
|
||
-_ASBOX
|
||
- ) |
|
||
- sed "s/^/$as_me: WARNING: /" >&2
|
||
- ;;
|
||
-esac
|
||
-echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- eval "$as_ac_Header=\$ac_header_preproc"
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||
-
|
||
-fi
|
||
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||
+do :
|
||
+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
|
||
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
|
||
cat >>confdefs.h <<_ACEOF
|
||
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||
+#define HAVE_STDLIB_H 1
|
||
_ACEOF
|
||
|
||
fi
|
||
@@ -4493,183 +4264,82 @@
|
||
done
|
||
|
||
|
||
-# In the Cygwin environment, we need some additional flags.
|
||
-echo "$as_me:$LINENO: checking for cygwin" >&5
|
||
-echo $ECHO_N "checking for cygwin... $ECHO_C" >&6
|
||
-if test "${sim_cv_os_cygwin+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
|
||
-#ifdef __CYGWIN__
|
||
-lose
|
||
-#endif
|
||
-_ACEOF
|
||
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||
- $EGREP "lose" >/dev/null 2>&1; then
|
||
- sim_cv_os_cygwin=yes
|
||
-else
|
||
- sim_cv_os_cygwin=no
|
||
+# Check whether --with-system-readline was given.
|
||
+if test "${with_system_readline+set}" = set; then :
|
||
+ withval=$with_system_readline;
|
||
fi
|
||
-rm -f conftest*
|
||
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5
|
||
-echo "${ECHO_T}$sim_cv_os_cygwin" >&6
|
||
|
||
-if test x$sim_cv_os_cygwin = xyes; then
|
||
- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
|
||
-else
|
||
- echo "$as_me:$LINENO: checking for main in -ltermcap" >&5
|
||
-echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6
|
||
-if test "${ac_cv_lib_termcap_main+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- ac_check_lib_save_LIBS=$LIBS
|
||
-LIBS="-ltermcap $LIBS"
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+if test "$with_system_readline" = yes; then
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
|
||
+$as_echo_n "checking for readline... " >&6; }
|
||
+ save_LIBS="$LIBS"
|
||
+ LIBS="-lreadline $save_LIBS"
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
-
|
||
+/* Override any GCC internal prototype to avoid an error.
|
||
+ Use char because int might match the return type of a GCC
|
||
+ builtin and then its argument prototype would still apply. */
|
||
+#ifdef __cplusplus
|
||
+extern "C"
|
||
+#endif
|
||
+char add_history ();
|
||
int
|
||
main ()
|
||
{
|
||
-main ();
|
||
+return add_history ();
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest$ac_exeext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_cv_lib_termcap_main=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_cv_lib_termcap_main=no
|
||
-fi
|
||
-rm -f conftest.err conftest.$ac_objext \
|
||
- conftest$ac_exeext conftest.$ac_ext
|
||
-LIBS=$ac_check_lib_save_LIBS
|
||
-fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5
|
||
-echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6
|
||
-if test $ac_cv_lib_termcap_main = yes; then
|
||
- TERMCAP=-ltermcap
|
||
-else
|
||
- TERMCAP=""
|
||
-fi
|
||
-
|
||
-fi
|
||
-
|
||
-
|
||
-# We prefer the in-tree readline. Top-level dependencies make sure
|
||
-# src/readline (if it's there) is configured before src/sim.
|
||
-if test -r ../../readline/Makefile; then
|
||
- READLINE=../../readline/libreadline.a
|
||
-else
|
||
- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
|
||
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
|
||
-if test "${ac_cv_lib_readline_readline+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+if ac_fn_c_try_link "$LINENO"; then :
|
||
+ READLINE=-lreadline
|
||
else
|
||
- ac_check_lib_save_LIBS=$LIBS
|
||
-LIBS="-lreadline $TERMCAP $LIBS"
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
+ LIBS="-lreadline -lncurses $save_LIBS"
|
||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
/* end confdefs.h. */
|
||
|
||
-/* Override any gcc2 internal prototype to avoid an error. */
|
||
+/* Override any GCC internal prototype to avoid an error.
|
||
+ Use char because int might match the return type of a GCC
|
||
+ builtin and then its argument prototype would still apply. */
|
||
#ifdef __cplusplus
|
||
extern "C"
|
||
#endif
|
||
-/* We use char because int might match the return type of a gcc2
|
||
- builtin and then its argument prototype would still apply. */
|
||
-char readline ();
|
||
+char add_history ();
|
||
int
|
||
main ()
|
||
{
|
||
-readline ();
|
||
+return add_history ();
|
||
;
|
||
return 0;
|
||
}
|
||
_ACEOF
|
||
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
- (eval $ac_link) 2>conftest.er1
|
||
- ac_status=$?
|
||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||
- rm -f conftest.er1
|
||
- cat conftest.err >&5
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); } &&
|
||
- { ac_try='test -z "$ac_c_werror_flag"
|
||
- || test ! -s conftest.err'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; } &&
|
||
- { ac_try='test -s conftest$ac_exeext'
|
||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
- (eval $ac_try) 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- ac_cv_lib_readline_readline=yes
|
||
+if ac_fn_c_try_link "$LINENO"; then :
|
||
+ READLINE="-lreadline -lncurses"
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
-ac_cv_lib_readline_readline=no
|
||
+ as_fn_error "unable to detect readline" "$LINENO" 5
|
||
fi
|
||
-rm -f conftest.err conftest.$ac_objext \
|
||
- conftest$ac_exeext conftest.$ac_ext
|
||
-LIBS=$ac_check_lib_save_LIBS
|
||
+rm -f core conftest.err conftest.$ac_objext \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
+
|
||
fi
|
||
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
|
||
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
|
||
-if test $ac_cv_lib_readline_readline = yes; then
|
||
- READLINE=-lreadline
|
||
-else
|
||
- { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5
|
||
-echo "$as_me: error: the required \"readline\" library is missing" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+rm -f core conftest.err conftest.$ac_objext \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
+ LIBS="$save_LIBS"
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
|
||
+$as_echo "$READLINE" >&6; }
|
||
+ READLINE_DEPS=
|
||
+ READLINE_CFLAGS=
|
||
+else
|
||
+ READLINE='../../readline/libreadline.a -lncurses'
|
||
+ READLINE_DEPS='$(READLINE)'
|
||
+ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
|
||
fi
|
||
|
||
-fi
|
||
+
|
||
+
|
||
|
||
|
||
ac_sources="$sim_link_files"
|
||
@@ -4679,22 +4349,22 @@
|
||
set $ac_sources; ac_source=$1; shift; ac_sources=$*
|
||
ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
|
||
done
|
||
- ac_config_links="$ac_config_links $ac_config_links_1"
|
||
+ac_config_links="$ac_config_links $ac_config_links_1"
|
||
|
||
cgen_breaks=""
|
||
if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
|
||
cgen_breaks="break cgen_rtx_error";
|
||
fi
|
||
|
||
- ac_config_files="$ac_config_files Makefile.sim:Makefile.in"
|
||
+ac_config_files="$ac_config_files Makefile.sim:Makefile.in"
|
||
|
||
- ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in"
|
||
+ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in"
|
||
|
||
- ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in"
|
||
+ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in"
|
||
|
||
- ac_config_commands="$ac_config_commands Makefile"
|
||
+ac_config_commands="$ac_config_commands Makefile"
|
||
|
||
- ac_config_commands="$ac_config_commands stamp-h"
|
||
+ac_config_commands="$ac_config_commands stamp-h"
|
||
|
||
cat >confcache <<\_ACEOF
|
||
# This file is a shell script that caches the results of configure
|
||
@@ -4714,39 +4384,59 @@
|
||
|
||
# The following way of writing the cache mishandles newlines in values,
|
||
# but we know of no workaround that is simple, portable, and efficient.
|
||
-# So, don't put newlines in cache variables' values.
|
||
+# So, we kill variables containing newlines.
|
||
# Ultrix sh set writes to stderr and can't be redirected directly,
|
||
# and sets the high bit in the cache file unless we assign to the vars.
|
||
-{
|
||
+(
|
||
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
|
||
+ eval ac_val=\$$ac_var
|
||
+ case $ac_val in #(
|
||
+ *${as_nl}*)
|
||
+ case $ac_var in #(
|
||
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
|
||
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
|
||
+ esac
|
||
+ case $ac_var in #(
|
||
+ _ | IFS | as_nl) ;; #(
|
||
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
|
||
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
||
+ esac ;;
|
||
+ esac
|
||
+ done
|
||
+
|
||
(set) 2>&1 |
|
||
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
|
||
- *ac_space=\ *)
|
||
- # `set' does not quote correctly, so add quotes (double-quote
|
||
- # substitution turns \\\\ into \\, and sed turns \\ into \).
|
||
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
|
||
+ *${as_nl}ac_space=\ *)
|
||
+ # `set' does not quote correctly, so add quotes: double-quote
|
||
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
|
||
sed -n \
|
||
"s/'/'\\\\''/g;
|
||
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
|
||
- ;;
|
||
+ ;; #(
|
||
*)
|
||
# `set' quotes correctly as required by POSIX, so do not add quotes.
|
||
- sed -n \
|
||
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
|
||
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
|
||
;;
|
||
- esac;
|
||
-} |
|
||
+ esac |
|
||
+ sort
|
||
+) |
|
||
sed '
|
||
+ /^ac_cv_env_/b end
|
||
t clear
|
||
- : clear
|
||
+ :clear
|
||
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
|
||
t end
|
||
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
|
||
- : end' >>confcache
|
||
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
|
||
- if test -w $cache_file; then
|
||
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
|
||
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
|
||
+ :end' >>confcache
|
||
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
|
||
+ if test -w "$cache_file"; then
|
||
+ test "x$cache_file" != "x/dev/null" &&
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
|
||
+$as_echo "$as_me: updating cache $cache_file" >&6;}
|
||
cat confcache >$cache_file
|
||
else
|
||
- echo "not updating unwritable cache $cache_file"
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
|
||
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
|
||
fi
|
||
fi
|
||
rm -f confcache
|
||
@@ -4755,32 +4445,18 @@
|
||
# Let make expand exec_prefix.
|
||
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||
|
||
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
||
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
||
-# trailing colons and then remove the whole line if VPATH becomes empty
|
||
-# (actually we leave an empty line to preserve line numbers).
|
||
-if test "x$srcdir" = x.; then
|
||
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
||
-s/:*\$(srcdir):*/:/;
|
||
-s/:*\${srcdir}:*/:/;
|
||
-s/:*@srcdir@:*/:/;
|
||
-s/^\([^=]*=[ ]*\):*/\1/;
|
||
-s/:*$//;
|
||
-s/^[^=]*=[ ]*$//;
|
||
-}'
|
||
-fi
|
||
-
|
||
DEFS=-DHAVE_CONFIG_H
|
||
|
||
ac_libobjs=
|
||
ac_ltlibobjs=
|
||
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
||
# 1. Remove the extension, and $U if already installed.
|
||
- ac_i=`echo "$ac_i" |
|
||
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
|
||
- # 2. Add them.
|
||
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
|
||
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
|
||
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
|
||
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
|
||
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
||
+ # will be set to the directory where LIBOBJS objects are built.
|
||
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
||
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
|
||
done
|
||
LIBOBJS=$ac_libobjs
|
||
|
||
@@ -4789,11 +4465,13 @@
|
||
|
||
|
||
: ${CONFIG_STATUS=./config.status}
|
||
+ac_write_fail=0
|
||
ac_clean_files_save=$ac_clean_files
|
||
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
||
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
||
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||
-cat >$CONFIG_STATUS <<_ACEOF
|
||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
|
||
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||
+as_write_fail=0
|
||
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
|
||
#! $SHELL
|
||
# Generated by $as_me.
|
||
# Run this file to recreate the current configuration.
|
||
@@ -4803,81 +4481,252 @@
|
||
debug=false
|
||
ac_cs_recheck=false
|
||
ac_cs_silent=false
|
||
-SHELL=\${CONFIG_SHELL-$SHELL}
|
||
-_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-## --------------------- ##
|
||
-## M4sh Initialization. ##
|
||
-## --------------------- ##
|
||
+SHELL=\${CONFIG_SHELL-$SHELL}
|
||
+export SHELL
|
||
+_ASEOF
|
||
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
|
||
+## -------------------- ##
|
||
+## M4sh Initialization. ##
|
||
+## -------------------- ##
|
||
|
||
-# Be Bourne compatible
|
||
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||
+# Be more Bourne compatible
|
||
+DUALCASE=1; export DUALCASE # for MKS sh
|
||
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
|
||
emulate sh
|
||
NULLCMD=:
|
||
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
|
||
# is contrary to our usage. Disable this feature.
|
||
alias -g '${1+"$@"}'='"$@"'
|
||
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
|
||
- set -o posix
|
||
+ setopt NO_GLOB_SUBST
|
||
+else
|
||
+ case `(set -o) 2>/dev/null` in #(
|
||
+ *posix*) :
|
||
+ set -o posix ;; #(
|
||
+ *) :
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-DUALCASE=1; export DUALCASE # for MKS sh
|
||
|
||
-# Support unset when possible.
|
||
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
||
- as_unset=unset
|
||
-else
|
||
- as_unset=false
|
||
+
|
||
+as_nl='
|
||
+'
|
||
+export as_nl
|
||
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
||
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
|
||
+# Prefer a ksh shell builtin over an external printf program on Solaris,
|
||
+# but without wasting forks for bash or zsh.
|
||
+if test -z "$BASH_VERSION$ZSH_VERSION" \
|
||
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
|
||
+ as_echo='print -r --'
|
||
+ as_echo_n='print -rn --'
|
||
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
||
+ as_echo='printf %s\n'
|
||
+ as_echo_n='printf %s'
|
||
+else
|
||
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
|
||
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
|
||
+ as_echo_n='/usr/ucb/echo -n'
|
||
+ else
|
||
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
||
+ as_echo_n_body='eval
|
||
+ arg=$1;
|
||
+ case $arg in #(
|
||
+ *"$as_nl"*)
|
||
+ expr "X$arg" : "X\\(.*\\)$as_nl";
|
||
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
||
+ esac;
|
||
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
|
||
+ '
|
||
+ export as_echo_n_body
|
||
+ as_echo_n='sh -c $as_echo_n_body as_echo'
|
||
+ fi
|
||
+ export as_echo_body
|
||
+ as_echo='sh -c $as_echo_body as_echo'
|
||
+fi
|
||
+
|
||
+# The user is always right.
|
||
+if test "${PATH_SEPARATOR+set}" != set; then
|
||
+ PATH_SEPARATOR=:
|
||
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
||
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
||
+ PATH_SEPARATOR=';'
|
||
+ }
|
||
fi
|
||
|
||
|
||
-# Work around bugs in pre-3.0 UWIN ksh.
|
||
-$as_unset ENV MAIL MAILPATH
|
||
+# IFS
|
||
+# We need space, tab and new line, in precisely that order. Quoting is
|
||
+# there to prevent editors from complaining about space-tab.
|
||
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
|
||
+# splitting by setting IFS to empty value.)
|
||
+IFS=" "" $as_nl"
|
||
+
|
||
+# Find who we are. Look in the path if we contain no directory separator.
|
||
+case $0 in #((
|
||
+ *[\\/]* ) as_myself=$0 ;;
|
||
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
||
+ done
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+ ;;
|
||
+esac
|
||
+# We did not find ourselves, most probably we were run as `sh COMMAND'
|
||
+# in which case we are not to be found in the path.
|
||
+if test "x$as_myself" = x; then
|
||
+ as_myself=$0
|
||
+fi
|
||
+if test ! -f "$as_myself"; then
|
||
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
||
+ exit 1
|
||
+fi
|
||
+
|
||
+# Unset variables that we do not need and which cause bugs (e.g. in
|
||
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
|
||
+# suppresses any "Segmentation fault" message there. '((' could
|
||
+# trigger a bug in pdksh 5.2.14.
|
||
+for as_var in BASH_ENV ENV MAIL MAILPATH
|
||
+do eval test x\${$as_var+set} = xset \
|
||
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
|
||
+done
|
||
PS1='$ '
|
||
PS2='> '
|
||
PS4='+ '
|
||
|
||
# NLS nuisances.
|
||
-for as_var in \
|
||
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||
- LC_TELEPHONE LC_TIME
|
||
-do
|
||
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
||
- eval $as_var=C; export $as_var
|
||
- else
|
||
- $as_unset $as_var
|
||
- fi
|
||
-done
|
||
+LC_ALL=C
|
||
+export LC_ALL
|
||
+LANGUAGE=C
|
||
+export LANGUAGE
|
||
+
|
||
+# CDPATH.
|
||
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||
+
|
||
|
||
-# Required to use basename.
|
||
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
||
+# as_fn_error ERROR [LINENO LOG_FD]
|
||
+# ---------------------------------
|
||
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
|
||
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
|
||
+# script with status $?, using 1 if that was 0.
|
||
+as_fn_error ()
|
||
+{
|
||
+ as_status=$?; test $as_status -eq 0 && as_status=1
|
||
+ if test "$3"; then
|
||
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
|
||
+ fi
|
||
+ $as_echo "$as_me: error: $1" >&2
|
||
+ as_fn_exit $as_status
|
||
+} # as_fn_error
|
||
+
|
||
+
|
||
+# as_fn_set_status STATUS
|
||
+# -----------------------
|
||
+# Set $? to STATUS, without forking.
|
||
+as_fn_set_status ()
|
||
+{
|
||
+ return $1
|
||
+} # as_fn_set_status
|
||
+
|
||
+# as_fn_exit STATUS
|
||
+# -----------------
|
||
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
|
||
+as_fn_exit ()
|
||
+{
|
||
+ set +e
|
||
+ as_fn_set_status $1
|
||
+ exit $1
|
||
+} # as_fn_exit
|
||
+
|
||
+# as_fn_unset VAR
|
||
+# ---------------
|
||
+# Portably unset VAR.
|
||
+as_fn_unset ()
|
||
+{
|
||
+ { eval $1=; unset $1;}
|
||
+}
|
||
+as_unset=as_fn_unset
|
||
+# as_fn_append VAR VALUE
|
||
+# ----------------------
|
||
+# Append the text in VALUE to the end of the definition contained in VAR. Take
|
||
+# advantage of any shell optimizations that allow amortized linear growth over
|
||
+# repeated appends, instead of the typical quadratic growth present in naive
|
||
+# implementations.
|
||
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
|
||
+ eval 'as_fn_append ()
|
||
+ {
|
||
+ eval $1+=\$2
|
||
+ }'
|
||
+else
|
||
+ as_fn_append ()
|
||
+ {
|
||
+ eval $1=\$$1\$2
|
||
+ }
|
||
+fi # as_fn_append
|
||
+
|
||
+# as_fn_arith ARG...
|
||
+# ------------------
|
||
+# Perform arithmetic evaluation on the ARGs, and store the result in the
|
||
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
||
+# must be portable across $(()) and expr.
|
||
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
||
+ eval 'as_fn_arith ()
|
||
+ {
|
||
+ as_val=$(( $* ))
|
||
+ }'
|
||
+else
|
||
+ as_fn_arith ()
|
||
+ {
|
||
+ as_val=`expr "$@" || test $? -eq 1`
|
||
+ }
|
||
+fi # as_fn_arith
|
||
+
|
||
+
|
||
+if expr a : '\(a\)' >/dev/null 2>&1 &&
|
||
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
||
as_expr=expr
|
||
else
|
||
as_expr=false
|
||
fi
|
||
|
||
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
||
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
||
as_basename=basename
|
||
else
|
||
as_basename=false
|
||
fi
|
||
|
||
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
||
+ as_dirname=dirname
|
||
+else
|
||
+ as_dirname=false
|
||
+fi
|
||
|
||
-# Name of the executable.
|
||
-as_me=`$as_basename "$0" ||
|
||
+as_me=`$as_basename -- "$0" ||
|
||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||
X"$0" : 'X\(//\)$' \| \
|
||
- X"$0" : 'X\(/\)$' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X/"$0" |
|
||
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
||
- /^X\/\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\/\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X/"$0" |
|
||
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\/\(\/\/\)$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\/\(\/\).*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ s/.*/./; q'`
|
||
|
||
-
|
||
-# PATH needs CR, and LINENO needs CR and PATH.
|
||
# Avoid depending upon Character Ranges.
|
||
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
||
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||
@@ -4885,148 +4734,123 @@
|
||
as_cr_digits='0123456789'
|
||
as_cr_alnum=$as_cr_Letters$as_cr_digits
|
||
|
||
-# The user is always right.
|
||
-if test "${PATH_SEPARATOR+set}" != set; then
|
||
- echo "#! /bin/sh" >conf$$.sh
|
||
- echo "exit 0" >>conf$$.sh
|
||
- chmod +x conf$$.sh
|
||
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||
- PATH_SEPARATOR=';'
|
||
- else
|
||
- PATH_SEPARATOR=:
|
||
- fi
|
||
- rm -f conf$$.sh
|
||
-fi
|
||
-
|
||
-
|
||
- as_lineno_1=$LINENO
|
||
- as_lineno_2=$LINENO
|
||
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
||
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
||
- test "x$as_lineno_3" = "x$as_lineno_2" || {
|
||
- # Find who we are. Look in the path if we contain no path at all
|
||
- # relative or not.
|
||
- case $0 in
|
||
- *[\\/]* ) as_myself=$0 ;;
|
||
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
||
-done
|
||
-
|
||
- ;;
|
||
- esac
|
||
- # We did not find ourselves, most probably we were run as `sh COMMAND'
|
||
- # in which case we are not to be found in the path.
|
||
- if test "x$as_myself" = x; then
|
||
- as_myself=$0
|
||
- fi
|
||
- if test ! -f "$as_myself"; then
|
||
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
|
||
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- fi
|
||
- case $CONFIG_SHELL in
|
||
- '')
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for as_base in sh bash ksh sh5; do
|
||
- case $as_dir in
|
||
- /*)
|
||
- if ("$as_dir/$as_base" -c '
|
||
- as_lineno_1=$LINENO
|
||
- as_lineno_2=$LINENO
|
||
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
|
||
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
||
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
|
||
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
|
||
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
|
||
- CONFIG_SHELL=$as_dir/$as_base
|
||
- export CONFIG_SHELL
|
||
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
|
||
- fi;;
|
||
- esac
|
||
- done
|
||
-done
|
||
-;;
|
||
- esac
|
||
-
|
||
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
||
- # uniformly replaced by the line number. The first 'sed' inserts a
|
||
- # line-number line before each line; the second 'sed' does the real
|
||
- # work. The second script uses 'N' to pair each line-number line
|
||
- # with the numbered line, and appends trailing '-' during
|
||
- # substitution so that $LINENO is not a special case at line end.
|
||
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
||
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
|
||
- sed '=' <$as_myself |
|
||
- sed '
|
||
- N
|
||
- s,$,-,
|
||
- : loop
|
||
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
|
||
- t loop
|
||
- s,-$,,
|
||
- s,^['$as_cr_digits']*\n,,
|
||
- ' >$as_me.lineno &&
|
||
- chmod +x $as_me.lineno ||
|
||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
|
||
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-
|
||
- # Don't try to exec as it changes $[0], causing all sort of problems
|
||
- # (the dirname of $[0] is not the place where we might find the
|
||
- # original and so on. Autoconf is especially sensible to this).
|
||
- . ./$as_me.lineno
|
||
- # Exit status is that of the last command.
|
||
- exit
|
||
-}
|
||
-
|
||
-
|
||
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
|
||
- *c*,-n*) ECHO_N= ECHO_C='
|
||
-' ECHO_T=' ' ;;
|
||
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
|
||
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
|
||
+ECHO_C= ECHO_N= ECHO_T=
|
||
+case `echo -n x` in #(((((
|
||
+-n*)
|
||
+ case `echo 'xy\c'` in
|
||
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
||
+ xy) ECHO_C='\c';;
|
||
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
|
||
+ ECHO_T=' ';;
|
||
+ esac;;
|
||
+*)
|
||
+ ECHO_N='-n';;
|
||
esac
|
||
|
||
-if expr a : '\(a\)' >/dev/null 2>&1; then
|
||
- as_expr=expr
|
||
+rm -f conf$$ conf$$.exe conf$$.file
|
||
+if test -d conf$$.dir; then
|
||
+ rm -f conf$$.dir/conf$$.file
|
||
else
|
||
- as_expr=false
|
||
+ rm -f conf$$.dir
|
||
+ mkdir conf$$.dir 2>/dev/null
|
||
fi
|
||
-
|
||
-rm -f conf$$ conf$$.exe conf$$.file
|
||
-echo >conf$$.file
|
||
-if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
- # We could just check for DJGPP; but this test a) works b) is more generic
|
||
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
|
||
- if test -f conf$$.exe; then
|
||
- # Don't use ln at all; we don't have any links
|
||
- as_ln_s='cp -p'
|
||
- else
|
||
+if (echo >conf$$.file) 2>/dev/null; then
|
||
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
|
||
as_ln_s='ln -s'
|
||
+ # ... but there are two gotchas:
|
||
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
||
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
||
+ # In both cases, we have to default to `cp -p'.
|
||
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
||
+ as_ln_s='cp -p'
|
||
+ elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
+ as_ln_s=ln
|
||
+ else
|
||
+ as_ln_s='cp -p'
|
||
fi
|
||
-elif ln conf$$.file conf$$ 2>/dev/null; then
|
||
- as_ln_s=ln
|
||
else
|
||
as_ln_s='cp -p'
|
||
fi
|
||
-rm -f conf$$ conf$$.exe conf$$.file
|
||
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
||
+rmdir conf$$.dir 2>/dev/null
|
||
+
|
||
+
|
||
+# as_fn_mkdir_p
|
||
+# -------------
|
||
+# Create "$as_dir" as a directory, including parents if necessary.
|
||
+as_fn_mkdir_p ()
|
||
+{
|
||
+
|
||
+ case $as_dir in #(
|
||
+ -*) as_dir=./$as_dir;;
|
||
+ esac
|
||
+ test -d "$as_dir" || eval $as_mkdir_p || {
|
||
+ as_dirs=
|
||
+ while :; do
|
||
+ case $as_dir in #(
|
||
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
|
||
+ *) as_qdir=$as_dir;;
|
||
+ esac
|
||
+ as_dirs="'$as_qdir' $as_dirs"
|
||
+ as_dir=`$as_dirname -- "$as_dir" ||
|
||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
+ X"$as_dir" : 'X\(//\)$' \| \
|
||
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X"$as_dir" |
|
||
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)[^/].*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\).*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ s/.*/./; q'`
|
||
+ test -d "$as_dir" && break
|
||
+ done
|
||
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
|
||
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
|
||
|
||
+
|
||
+} # as_fn_mkdir_p
|
||
if mkdir -p . 2>/dev/null; then
|
||
- as_mkdir_p=:
|
||
+ as_mkdir_p='mkdir -p "$as_dir"'
|
||
else
|
||
test -d ./-p && rmdir ./-p
|
||
as_mkdir_p=false
|
||
fi
|
||
|
||
-as_executable_p="test -f"
|
||
+if test -x / >/dev/null 2>&1; then
|
||
+ as_test_x='test -x'
|
||
+else
|
||
+ if ls -dL / >/dev/null 2>&1; then
|
||
+ as_ls_L_option=L
|
||
+ else
|
||
+ as_ls_L_option=
|
||
+ fi
|
||
+ as_test_x='
|
||
+ eval sh -c '\''
|
||
+ if test -d "$1"; then
|
||
+ test -d "$1/.";
|
||
+ else
|
||
+ case $1 in #(
|
||
+ -*)set "./$1";;
|
||
+ esac;
|
||
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
||
+ ???[sx]*):;;*)false;;esac;fi
|
||
+ '\'' sh
|
||
+ '
|
||
+fi
|
||
+as_executable_p=$as_test_x
|
||
|
||
# Sed expression to map a string onto a valid CPP name.
|
||
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
||
@@ -5035,31 +4859,20 @@
|
||
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
|
||
|
||
|
||
-# IFS
|
||
-# We need space, tab and new line, in precisely that order.
|
||
-as_nl='
|
||
-'
|
||
-IFS=" $as_nl"
|
||
-
|
||
-# CDPATH.
|
||
-$as_unset CDPATH
|
||
-
|
||
exec 6>&1
|
||
+## ----------------------------------- ##
|
||
+## Main body of $CONFIG_STATUS script. ##
|
||
+## ----------------------------------- ##
|
||
+_ASEOF
|
||
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
|
||
|
||
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+# Save the log message, to keep $0 and so on meaningful, and to
|
||
# report actual input values of CONFIG_FILES etc. instead of their
|
||
-# values after options handling. Logging --version etc. is OK.
|
||
-exec 5>>config.log
|
||
-{
|
||
- echo
|
||
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
||
-## Running $as_me. ##
|
||
-_ASBOX
|
||
-} >&5
|
||
-cat >&5 <<_CSEOF
|
||
-
|
||
+# values after options handling.
|
||
+ac_log="
|
||
This file was extended by $as_me, which was
|
||
-generated by GNU Autoconf 2.59. Invocation command line was
|
||
+generated by GNU Autoconf 2.64. Invocation command line was
|
||
|
||
CONFIG_FILES = $CONFIG_FILES
|
||
CONFIG_HEADERS = $CONFIG_HEADERS
|
||
@@ -5067,45 +4880,47 @@
|
||
CONFIG_COMMANDS = $CONFIG_COMMANDS
|
||
$ $0 $@
|
||
|
||
-_CSEOF
|
||
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
|
||
-echo >&5
|
||
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
|
||
+"
|
||
+
|
||
_ACEOF
|
||
|
||
-# Files that config.status was made for.
|
||
-if test -n "$ac_config_files"; then
|
||
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
|
||
-fi
|
||
+case $ac_config_files in *"
|
||
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
|
||
+esac
|
||
|
||
-if test -n "$ac_config_headers"; then
|
||
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
|
||
-fi
|
||
+case $ac_config_headers in *"
|
||
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
|
||
+esac
|
||
|
||
-if test -n "$ac_config_links"; then
|
||
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
|
||
-fi
|
||
|
||
-if test -n "$ac_config_commands"; then
|
||
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
|
||
-fi
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+# Files that config.status was made for.
|
||
+config_files="$ac_config_files"
|
||
+config_headers="$ac_config_headers"
|
||
+config_links="$ac_config_links"
|
||
+config_commands="$ac_config_commands"
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+_ACEOF
|
||
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
ac_cs_usage="\
|
||
-\`$as_me' instantiates files from templates according to the
|
||
-current configuration.
|
||
+\`$as_me' instantiates files and other configuration actions
|
||
+from templates according to the current configuration. Unless the files
|
||
+and actions are specified as TAGs, all are instantiated by default.
|
||
|
||
-Usage: $0 [OPTIONS] [FILE]...
|
||
+Usage: $0 [OPTION]... [TAG]...
|
||
|
||
-h, --help print this help, then exit
|
||
- -V, --version print version number, then exit
|
||
- -q, --quiet do not print progress messages
|
||
+ -V, --version print version number and configuration settings, then exit
|
||
+ -q, --quiet, --silent
|
||
+ do not print progress messages
|
||
-d, --debug don't remove temporary files
|
||
--recheck update $as_me by reconfiguring in the same conditions
|
||
- --file=FILE[:TEMPLATE]
|
||
- instantiate the configuration file FILE
|
||
- --header=FILE[:TEMPLATE]
|
||
- instantiate the configuration header FILE
|
||
+ --file=FILE[:TEMPLATE]
|
||
+ instantiate the configuration file FILE
|
||
+ --header=FILE[:TEMPLATE]
|
||
+ instantiate the configuration header FILE
|
||
|
||
Configuration files:
|
||
$config_files
|
||
@@ -5119,84 +4934,81 @@
|
||
Configuration commands:
|
||
$config_commands
|
||
|
||
-Report bugs to <bug-autoconf@gnu.org>."
|
||
-_ACEOF
|
||
+Report bugs to the package provider."
|
||
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
ac_cs_version="\\
|
||
config.status
|
||
-configured by $0, generated by GNU Autoconf 2.59,
|
||
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||
+configured by $0, generated by GNU Autoconf 2.64,
|
||
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||
|
||
-Copyright (C) 2003 Free Software Foundation, Inc.
|
||
+Copyright (C) 2009 Free Software Foundation, Inc.
|
||
This config.status script is free software; the Free Software Foundation
|
||
gives unlimited permission to copy, distribute and modify it."
|
||
-srcdir=$srcdir
|
||
-INSTALL="$INSTALL"
|
||
+
|
||
+ac_pwd='$ac_pwd'
|
||
+srcdir='$srcdir'
|
||
+INSTALL='$INSTALL'
|
||
+test -n "\$AWK" || AWK=awk
|
||
_ACEOF
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-# If no file are specified by the user, then we need to provide default
|
||
-# value. By we need to know if files were specified by the user.
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+# The default lists apply if the user does not specify any file.
|
||
ac_need_defaults=:
|
||
while test $# != 0
|
||
do
|
||
case $1 in
|
||
--*=*)
|
||
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
|
||
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
|
||
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
|
||
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
|
||
ac_shift=:
|
||
;;
|
||
- -*)
|
||
+ *)
|
||
ac_option=$1
|
||
ac_optarg=$2
|
||
ac_shift=shift
|
||
;;
|
||
- *) # This is not an option, so the user has probably given explicit
|
||
- # arguments.
|
||
- ac_option=$1
|
||
- ac_need_defaults=false;;
|
||
esac
|
||
|
||
case $ac_option in
|
||
# Handling of the options.
|
||
-_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
|
||
ac_cs_recheck=: ;;
|
||
- --version | --vers* | -V )
|
||
- echo "$ac_cs_version"; exit 0 ;;
|
||
- --he | --h)
|
||
- # Conflict between --help and --header
|
||
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
|
||
-Try \`$0 --help' for more information." >&5
|
||
-echo "$as_me: error: ambiguous option: $1
|
||
-Try \`$0 --help' for more information." >&2;}
|
||
- { (exit 1); exit 1; }; };;
|
||
- --help | --hel | -h )
|
||
- echo "$ac_cs_usage"; exit 0 ;;
|
||
- --debug | --d* | -d )
|
||
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
|
||
+ $as_echo "$ac_cs_version"; exit ;;
|
||
+ --debug | --debu | --deb | --de | --d | -d )
|
||
debug=: ;;
|
||
--file | --fil | --fi | --f )
|
||
$ac_shift
|
||
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
|
||
+ case $ac_optarg in
|
||
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ esac
|
||
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
|
||
ac_need_defaults=false;;
|
||
--header | --heade | --head | --hea )
|
||
$ac_shift
|
||
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
|
||
+ case $ac_optarg in
|
||
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
||
+ esac
|
||
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
|
||
ac_need_defaults=false;;
|
||
+ --he | --h)
|
||
+ # Conflict between --help and --header
|
||
+ as_fn_error "ambiguous option: \`$1'
|
||
+Try \`$0 --help' for more information.";;
|
||
+ --help | --hel | -h )
|
||
+ $as_echo "$ac_cs_usage"; exit ;;
|
||
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
||
| -silent | --silent | --silen | --sile | --sil | --si | --s)
|
||
ac_cs_silent=: ;;
|
||
|
||
# This is an error.
|
||
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
|
||
-Try \`$0 --help' for more information." >&5
|
||
-echo "$as_me: error: unrecognized option: $1
|
||
-Try \`$0 --help' for more information." >&2;}
|
||
- { (exit 1); exit 1; }; } ;;
|
||
+ -*) as_fn_error "unrecognized option: \`$1'
|
||
+Try \`$0 --help' for more information." ;;
|
||
|
||
- *) ac_config_targets="$ac_config_targets $1" ;;
|
||
+ *) as_fn_append ac_config_targets " $1"
|
||
+ ac_need_defaults=false ;;
|
||
|
||
esac
|
||
shift
|
||
@@ -5210,36 +5022,50 @@
|
||
fi
|
||
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
if \$ac_cs_recheck; then
|
||
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
|
||
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
||
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
||
+ shift
|
||
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
||
+ CONFIG_SHELL='$SHELL'
|
||
+ export CONFIG_SHELL
|
||
+ exec "\$@"
|
||
fi
|
||
|
||
_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+exec 5>>config.log
|
||
+{
|
||
+ echo
|
||
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
|
||
+## Running $as_me. ##
|
||
+_ASBOX
|
||
+ $as_echo "$ac_log"
|
||
+} >&5
|
||
|
||
+_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+_ACEOF
|
||
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
|
||
-
|
||
-
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+# Handling of arguments.
|
||
for ac_config_target in $ac_config_targets
|
||
do
|
||
- case "$ac_config_target" in
|
||
- # Handling of arguments.
|
||
- "Makefile.sim" ) CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;;
|
||
- "Make-common.sim" ) CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;;
|
||
- ".gdbinit" ) CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;;
|
||
- "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;;
|
||
- "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
|
||
- "stamp-h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;;
|
||
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
|
||
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||
- { (exit 1); exit 1; }; };;
|
||
+ case $ac_config_target in
|
||
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
|
||
+ "$ac_config_links_1") CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;;
|
||
+ "Makefile.sim") CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;;
|
||
+ "Make-common.sim") CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;;
|
||
+ ".gdbinit") CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;;
|
||
+ "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
|
||
+ "stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;;
|
||
+
|
||
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||
esac
|
||
done
|
||
|
||
+
|
||
# If the user did not use the arguments to specify the items to instantiate,
|
||
# then the envvar interface is used. Set only those that are not.
|
||
# We use the long form for the default assignment because of an extremely
|
||
@@ -5252,862 +5078,565 @@
|
||
fi
|
||
|
||
# Have a temporary directory for convenience. Make it in the build tree
|
||
-# simply because there is no reason to put it here, and in addition,
|
||
+# simply because there is no reason against having it here, and in addition,
|
||
# creating and moving files from /tmp can sometimes cause problems.
|
||
-# Create a temporary directory, and hook for its removal unless debugging.
|
||
+# Hook for its removal unless debugging.
|
||
+# Note that there is a small window in which the directory will not be cleaned:
|
||
+# after its creation but before its name has been assigned to `$tmp'.
|
||
$debug ||
|
||
{
|
||
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
|
||
- trap '{ (exit 1); exit 1; }' 1 2 13 15
|
||
+ tmp=
|
||
+ trap 'exit_status=$?
|
||
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
||
+' 0
|
||
+ trap 'as_fn_exit 1' 1 2 13 15
|
||
}
|
||
-
|
||
# Create a (secure) tmp directory for tmp files.
|
||
|
||
{
|
||
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
|
||
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
|
||
test -n "$tmp" && test -d "$tmp"
|
||
} ||
|
||
{
|
||
- tmp=./confstat$$-$RANDOM
|
||
- (umask 077 && mkdir $tmp)
|
||
-} ||
|
||
-{
|
||
- echo "$me: cannot create a temporary directory in ." >&2
|
||
- { (exit 1); exit 1; }
|
||
-}
|
||
-
|
||
-_ACEOF
|
||
-
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
-
|
||
-#
|
||
-# CONFIG_FILES section.
|
||
-#
|
||
-
|
||
-# No need to generate the scripts if there are no CONFIG_FILES.
|
||
-# This happens for instance when ./config.status config.h
|
||
-if test -n "\$CONFIG_FILES"; then
|
||
- # Protect against being on the right side of a sed subst in config.status.
|
||
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
|
||
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
|
||
-s,@SHELL@,$SHELL,;t t
|
||
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
|
||
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
|
||
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
|
||
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
|
||
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
|
||
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
|
||
-s,@exec_prefix@,$exec_prefix,;t t
|
||
-s,@prefix@,$prefix,;t t
|
||
-s,@program_transform_name@,$program_transform_name,;t t
|
||
-s,@bindir@,$bindir,;t t
|
||
-s,@sbindir@,$sbindir,;t t
|
||
-s,@libexecdir@,$libexecdir,;t t
|
||
-s,@datadir@,$datadir,;t t
|
||
-s,@sysconfdir@,$sysconfdir,;t t
|
||
-s,@sharedstatedir@,$sharedstatedir,;t t
|
||
-s,@localstatedir@,$localstatedir,;t t
|
||
-s,@libdir@,$libdir,;t t
|
||
-s,@includedir@,$includedir,;t t
|
||
-s,@oldincludedir@,$oldincludedir,;t t
|
||
-s,@infodir@,$infodir,;t t
|
||
-s,@mandir@,$mandir,;t t
|
||
-s,@build_alias@,$build_alias,;t t
|
||
-s,@host_alias@,$host_alias,;t t
|
||
-s,@target_alias@,$target_alias,;t t
|
||
-s,@DEFS@,$DEFS,;t t
|
||
-s,@ECHO_C@,$ECHO_C,;t t
|
||
-s,@ECHO_N@,$ECHO_N,;t t
|
||
-s,@ECHO_T@,$ECHO_T,;t t
|
||
-s,@LIBS@,$LIBS,;t t
|
||
-s,@sim_environment@,$sim_environment,;t t
|
||
-s,@sim_alignment@,$sim_alignment,;t t
|
||
-s,@sim_assert@,$sim_assert,;t t
|
||
-s,@sim_bitsize@,$sim_bitsize,;t t
|
||
-s,@sim_endian@,$sim_endian,;t t
|
||
-s,@sim_hostendian@,$sim_hostendian,;t t
|
||
-s,@sim_float@,$sim_float,;t t
|
||
-s,@sim_scache@,$sim_scache,;t t
|
||
-s,@sim_default_model@,$sim_default_model,;t t
|
||
-s,@sim_hw_cflags@,$sim_hw_cflags,;t t
|
||
-s,@sim_hw_objs@,$sim_hw_objs,;t t
|
||
-s,@sim_hw@,$sim_hw,;t t
|
||
-s,@sim_inline@,$sim_inline,;t t
|
||
-s,@sim_packages@,$sim_packages,;t t
|
||
-s,@sim_regparm@,$sim_regparm,;t t
|
||
-s,@sim_reserved_bits@,$sim_reserved_bits,;t t
|
||
-s,@sim_smp@,$sim_smp,;t t
|
||
-s,@sim_stdcall@,$sim_stdcall,;t t
|
||
-s,@sim_xor_endian@,$sim_xor_endian,;t t
|
||
-s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
|
||
-s,@WERROR_CFLAGS@,$WERROR_CFLAGS,;t t
|
||
-s,@build@,$build,;t t
|
||
-s,@build_cpu@,$build_cpu,;t t
|
||
-s,@build_vendor@,$build_vendor,;t t
|
||
-s,@build_os@,$build_os,;t t
|
||
-s,@host@,$host,;t t
|
||
-s,@host_cpu@,$host_cpu,;t t
|
||
-s,@host_vendor@,$host_vendor,;t t
|
||
-s,@host_os@,$host_os,;t t
|
||
-s,@target@,$target,;t t
|
||
-s,@target_cpu@,$target_cpu,;t t
|
||
-s,@target_vendor@,$target_vendor,;t t
|
||
-s,@target_os@,$target_os,;t t
|
||
-s,@CC@,$CC,;t t
|
||
-s,@CFLAGS@,$CFLAGS,;t t
|
||
-s,@LDFLAGS@,$LDFLAGS,;t t
|
||
-s,@CPPFLAGS@,$CPPFLAGS,;t t
|
||
-s,@ac_ct_CC@,$ac_ct_CC,;t t
|
||
-s,@EXEEXT@,$EXEEXT,;t t
|
||
-s,@OBJEXT@,$OBJEXT,;t t
|
||
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
||
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
||
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
||
-s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
|
||
-s,@HDEFINES@,$HDEFINES,;t t
|
||
-s,@AR@,$AR,;t t
|
||
-s,@RANLIB@,$RANLIB,;t t
|
||
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
|
||
-s,@USE_NLS@,$USE_NLS,;t t
|
||
-s,@LIBINTL@,$LIBINTL,;t t
|
||
-s,@LIBINTL_DEP@,$LIBINTL_DEP,;t t
|
||
-s,@INCINTL@,$INCINTL,;t t
|
||
-s,@XGETTEXT@,$XGETTEXT,;t t
|
||
-s,@GMSGFMT@,$GMSGFMT,;t t
|
||
-s,@POSUB@,$POSUB,;t t
|
||
-s,@CATALOGS@,$CATALOGS,;t t
|
||
-s,@DATADIRNAME@,$DATADIRNAME,;t t
|
||
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
|
||
-s,@GENCAT@,$GENCAT,;t t
|
||
-s,@CATOBJEXT@,$CATOBJEXT,;t t
|
||
-s,@CPP@,$CPP,;t t
|
||
-s,@EGREP@,$EGREP,;t t
|
||
-s,@MAINT@,$MAINT,;t t
|
||
-s,@sim_bswap@,$sim_bswap,;t t
|
||
-s,@sim_cflags@,$sim_cflags,;t t
|
||
-s,@sim_debug@,$sim_debug,;t t
|
||
-s,@sim_stdio@,$sim_stdio,;t t
|
||
-s,@sim_trace@,$sim_trace,;t t
|
||
-s,@sim_profile@,$sim_profile,;t t
|
||
-s,@TERMCAP@,$TERMCAP,;t t
|
||
-s,@READLINE@,$READLINE,;t t
|
||
-s,@cgen_breaks@,$cgen_breaks,;t t
|
||
-s,@LIBOBJS@,$LIBOBJS,;t t
|
||
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||
-CEOF
|
||
-
|
||
-_ACEOF
|
||
-
|
||
- cat >>$CONFIG_STATUS <<\_ACEOF
|
||
- # Split the substitutions into bite-sized pieces for seds with
|
||
- # small command number limits, like on Digital OSF/1 and HP-UX.
|
||
- ac_max_sed_lines=48
|
||
- ac_sed_frag=1 # Number of current file.
|
||
- ac_beg=1 # First line for current file.
|
||
- ac_end=$ac_max_sed_lines # Line after last line for current file.
|
||
- ac_more_lines=:
|
||
- ac_sed_cmds=
|
||
- while $ac_more_lines; do
|
||
- if test $ac_beg -gt 1; then
|
||
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
|
||
- else
|
||
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
|
||
- fi
|
||
- if test ! -s $tmp/subs.frag; then
|
||
- ac_more_lines=false
|
||
- else
|
||
- # The purpose of the label and of the branching condition is to
|
||
- # speed up the sed processing (if there are no `@' at all, there
|
||
- # is no need to browse any of the substitutions).
|
||
- # These are the two extra sed commands mentioned above.
|
||
- (echo ':t
|
||
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
|
||
- if test -z "$ac_sed_cmds"; then
|
||
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
|
||
- else
|
||
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
|
||
- fi
|
||
- ac_sed_frag=`expr $ac_sed_frag + 1`
|
||
- ac_beg=$ac_end
|
||
- ac_end=`expr $ac_end + $ac_max_sed_lines`
|
||
- fi
|
||
- done
|
||
- if test -z "$ac_sed_cmds"; then
|
||
- ac_sed_cmds=cat
|
||
- fi
|
||
-fi # test -n "$CONFIG_FILES"
|
||
+ tmp=./conf$$-$RANDOM
|
||
+ (umask 077 && mkdir "$tmp")
|
||
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
||
|
||
-_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
|
||
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
||
- case $ac_file in
|
||
- - | *:- | *:-:* ) # input from stdin
|
||
- cat >$tmp/stdin
|
||
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
||
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
||
- * ) ac_file_in=$ac_file.in ;;
|
||
- esac
|
||
-
|
||
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
|
||
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$ac_file" : 'X\(//\)[^/]' \| \
|
||
- X"$ac_file" : 'X\(//\)$' \| \
|
||
- X"$ac_file" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$ac_file" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- { if $as_mkdir_p; then
|
||
- mkdir -p "$ac_dir"
|
||
- else
|
||
- as_dir="$ac_dir"
|
||
- as_dirs=
|
||
- while test ! -d "$as_dir"; do
|
||
- as_dirs="$as_dir $as_dirs"
|
||
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
- X"$as_dir" : 'X\(//\)$' \| \
|
||
- X"$as_dir" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$as_dir" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- done
|
||
- test ! -n "$as_dirs" || mkdir $as_dirs
|
||
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
||
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; }
|
||
+# Set up the scripts for CONFIG_FILES section.
|
||
+# No need to generate them if there are no CONFIG_FILES.
|
||
+# This happens for instance with `./config.status config.h'.
|
||
+if test -n "$CONFIG_FILES"; then
|
||
|
||
- ac_builddir=.
|
||
|
||
-if test "$ac_dir" != .; then
|
||
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
||
- # A "../" for each directory in $ac_dir_suffix.
|
||
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
||
+ac_cr=`echo X | tr X '\015'`
|
||
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
|
||
+# But we know of no other shell where ac_cr would be empty at this
|
||
+# point, so we can use a bashism as a fallback.
|
||
+if test "x$ac_cr" = x; then
|
||
+ eval ac_cr=\$\'\\r\'
|
||
+fi
|
||
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
|
||
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
|
||
+ ac_cs_awk_cr='\r'
|
||
else
|
||
- ac_dir_suffix= ac_top_builddir=
|
||
+ ac_cs_awk_cr=$ac_cr
|
||
fi
|
||
|
||
-case $srcdir in
|
||
- .) # No --srcdir option. We are building in place.
|
||
- ac_srcdir=.
|
||
- if test -z "$ac_top_builddir"; then
|
||
- ac_top_srcdir=.
|
||
- else
|
||
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
||
- fi ;;
|
||
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
||
- ac_srcdir=$srcdir$ac_dir_suffix;
|
||
- ac_top_srcdir=$srcdir ;;
|
||
- *) # Relative path.
|
||
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
||
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
||
-esac
|
||
-
|
||
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
||
-# the directories may not exist.
|
||
-case `pwd` in
|
||
-.) ac_abs_builddir="$ac_dir";;
|
||
-*)
|
||
- case "$ac_dir" in
|
||
- .) ac_abs_builddir=`pwd`;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
||
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
-*)
|
||
- case ${ac_top_builddir}. in
|
||
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_srcdir=$ac_srcdir;;
|
||
-*)
|
||
- case $ac_srcdir in
|
||
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
||
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
-*)
|
||
- case $ac_top_srcdir in
|
||
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
|
||
+_ACEOF
|
||
|
||
|
||
- case $INSTALL in
|
||
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
||
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
|
||
- esac
|
||
+{
|
||
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
|
||
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
||
+ echo "_ACEOF"
|
||
+} >conf$$subs.sh ||
|
||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
|
||
+ac_delim='%!_!# '
|
||
+for ac_last_try in false false false false false :; do
|
||
+ . ./conf$$subs.sh ||
|
||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
|
||
- if test x"$ac_file" != x-; then
|
||
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
||
-echo "$as_me: creating $ac_file" >&6;}
|
||
- rm -f "$ac_file"
|
||
- fi
|
||
- # Let's still pretend it is `configure' which instantiates (i.e., don't
|
||
- # use $as_me), people would be surprised to read:
|
||
- # /* config.h. Generated by config.status. */
|
||
- if test x"$ac_file" = x-; then
|
||
- configure_input=
|
||
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
|
||
+ if test $ac_delim_n = $ac_delim_num; then
|
||
+ break
|
||
+ elif $ac_last_try; then
|
||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
||
else
|
||
- configure_input="$ac_file. "
|
||
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||
fi
|
||
- configure_input=$configure_input"Generated from `echo $ac_file_in |
|
||
- sed 's,.*/,,'` by configure."
|
||
+done
|
||
+rm -f conf$$subs.sh
|
||
|
||
- # First look for the input files in the build tree, otherwise in the
|
||
- # src tree.
|
||
- ac_file_inputs=`IFS=:
|
||
- for f in $ac_file_in; do
|
||
- case $f in
|
||
- -) echo $tmp/stdin ;;
|
||
- [\\/$]*)
|
||
- # Absolute (can't be DOS-style, as IFS=:)
|
||
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
||
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- echo "$f";;
|
||
- *) # Relative
|
||
- if test -f "$f"; then
|
||
- # Build tree
|
||
- echo "$f"
|
||
- elif test -f "$srcdir/$f"; then
|
||
- # Source tree
|
||
- echo "$srcdir/$f"
|
||
- else
|
||
- # /dev/null tree
|
||
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
||
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- fi;;
|
||
- esac
|
||
- done` || { (exit 1); exit 1; }
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<_ACEOF
|
||
- sed "$ac_vpsub
|
||
-$extrasub
|
||
-_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-:t
|
||
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
||
-s,@configure_input@,$configure_input,;t t
|
||
-s,@srcdir@,$ac_srcdir,;t t
|
||
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
|
||
-s,@top_srcdir@,$ac_top_srcdir,;t t
|
||
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
|
||
-s,@builddir@,$ac_builddir,;t t
|
||
-s,@abs_builddir@,$ac_abs_builddir,;t t
|
||
-s,@top_builddir@,$ac_top_builddir,;t t
|
||
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
|
||
-s,@INSTALL@,$ac_INSTALL,;t t
|
||
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
|
||
- rm -f $tmp/stdin
|
||
- if test x"$ac_file" != x-; then
|
||
- mv $tmp/out $ac_file
|
||
- else
|
||
- cat $tmp/out
|
||
- rm -f $tmp/out
|
||
- fi
|
||
+sed -n '
|
||
+h
|
||
+s/^/S["/; s/!.*/"]=/
|
||
+p
|
||
+g
|
||
+s/^[^!]*!//
|
||
+:repl
|
||
+t repl
|
||
+s/'"$ac_delim"'$//
|
||
+t delim
|
||
+:nl
|
||
+h
|
||
+s/\(.\{148\}\).*/\1/
|
||
+t more1
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
|
||
+p
|
||
+n
|
||
+b repl
|
||
+:more1
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
||
+p
|
||
+g
|
||
+s/.\{148\}//
|
||
+t nl
|
||
+:delim
|
||
+h
|
||
+s/\(.\{148\}\).*/\1/
|
||
+t more2
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"/
|
||
+p
|
||
+b
|
||
+:more2
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
|
||
+p
|
||
+g
|
||
+s/.\{148\}//
|
||
+t delim
|
||
+' <conf$$subs.awk | sed '
|
||
+/^[^""]/{
|
||
+ N
|
||
+ s/\n//
|
||
+}
|
||
+' >>$CONFIG_STATUS || ac_write_fail=1
|
||
+rm -f conf$$subs.awk
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+_ACAWK
|
||
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
|
||
+ for (key in S) S_is_set[key] = 1
|
||
+ FS = ""
|
||
|
||
-done
|
||
-_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
+}
|
||
+{
|
||
+ line = $ 0
|
||
+ nfields = split(line, field, "@")
|
||
+ substed = 0
|
||
+ len = length(field[1])
|
||
+ for (i = 2; i < nfields; i++) {
|
||
+ key = field[i]
|
||
+ keylen = length(key)
|
||
+ if (S_is_set[key]) {
|
||
+ value = S[key]
|
||
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
|
||
+ len += length(value) + length(field[++i])
|
||
+ substed = 1
|
||
+ } else
|
||
+ len += 1 + keylen
|
||
+ }
|
||
|
||
-#
|
||
-# CONFIG_HEADER section.
|
||
-#
|
||
+ print line
|
||
+}
|
||
|
||
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
|
||
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
|
||
-#
|
||
-# ac_d sets the value in "#define NAME VALUE" lines.
|
||
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
|
||
-ac_dB='[ ].*$,\1#\2'
|
||
-ac_dC=' '
|
||
-ac_dD=',;t'
|
||
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
|
||
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
|
||
-ac_uB='$,\1#\2define\3'
|
||
-ac_uC=' '
|
||
-ac_uD=',;t'
|
||
+_ACAWK
|
||
+_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
|
||
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
|
||
+else
|
||
+ cat
|
||
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
||
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
||
+_ACEOF
|
||
|
||
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
|
||
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
||
- case $ac_file in
|
||
- - | *:- | *:-:* ) # input from stdin
|
||
- cat >$tmp/stdin
|
||
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
||
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
|
||
- * ) ac_file_in=$ac_file.in ;;
|
||
- esac
|
||
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
||
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
||
+# trailing colons and then remove the whole line if VPATH becomes empty
|
||
+# (actually we leave an empty line to preserve line numbers).
|
||
+if test "x$srcdir" = x.; then
|
||
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
|
||
+s/:*\$(srcdir):*/:/
|
||
+s/:*\${srcdir}:*/:/
|
||
+s/:*@srcdir@:*/:/
|
||
+s/^\([^=]*=[ ]*\):*/\1/
|
||
+s/:*$//
|
||
+s/^[^=]*=[ ]*$//
|
||
+}'
|
||
+fi
|
||
|
||
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
|
||
-echo "$as_me: creating $ac_file" >&6;}
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+fi # test -n "$CONFIG_FILES"
|
||
|
||
- # First look for the input files in the build tree, otherwise in the
|
||
- # src tree.
|
||
- ac_file_inputs=`IFS=:
|
||
- for f in $ac_file_in; do
|
||
- case $f in
|
||
- -) echo $tmp/stdin ;;
|
||
- [\\/$]*)
|
||
- # Absolute (can't be DOS-style, as IFS=:)
|
||
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
||
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- # Do quote $f, to prevent DOS paths from being IFS'd.
|
||
- echo "$f";;
|
||
- *) # Relative
|
||
- if test -f "$f"; then
|
||
- # Build tree
|
||
- echo "$f"
|
||
- elif test -f "$srcdir/$f"; then
|
||
- # Source tree
|
||
- echo "$srcdir/$f"
|
||
- else
|
||
- # /dev/null tree
|
||
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
|
||
-echo "$as_me: error: cannot find input file: $f" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- fi;;
|
||
- esac
|
||
- done` || { (exit 1); exit 1; }
|
||
- # Remove the trailing spaces.
|
||
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
|
||
+# Set up the scripts for CONFIG_HEADERS section.
|
||
+# No need to generate them if there are no CONFIG_HEADERS.
|
||
+# This happens for instance with `./config.status Makefile'.
|
||
+if test -n "$CONFIG_HEADERS"; then
|
||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
|
||
+BEGIN {
|
||
+_ACEOF
|
||
+
|
||
+# Transform confdefs.h into an awk script `defines.awk', embedded as
|
||
+# here-document in config.status, that substitutes the proper values into
|
||
+# config.h.in to produce config.h.
|
||
+
|
||
+# Create a delimiter string that does not exist in confdefs.h, to ease
|
||
+# handling of long lines.
|
||
+ac_delim='%!_!# '
|
||
+for ac_last_try in false false :; do
|
||
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
|
||
+ if test -z "$ac_t"; then
|
||
+ break
|
||
+ elif $ac_last_try; then
|
||
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
|
||
+ else
|
||
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||
+ fi
|
||
+done
|
||
|
||
+# For the awk script, D is an array of macro values keyed by name,
|
||
+# likewise P contains macro parameters if any. Preserve backslash
|
||
+# newline sequences.
|
||
+
|
||
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
|
||
+sed -n '
|
||
+s/.\{148\}/&'"$ac_delim"'/g
|
||
+t rset
|
||
+:rset
|
||
+s/^[ ]*#[ ]*define[ ][ ]*/ /
|
||
+t def
|
||
+d
|
||
+:def
|
||
+s/\\$//
|
||
+t bsnl
|
||
+s/["\\]/\\&/g
|
||
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
|
||
+D["\1"]=" \3"/p
|
||
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
|
||
+d
|
||
+:bsnl
|
||
+s/["\\]/\\&/g
|
||
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
|
||
+D["\1"]=" \3\\\\\\n"\\/p
|
||
+t cont
|
||
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
|
||
+t cont
|
||
+d
|
||
+:cont
|
||
+n
|
||
+s/.\{148\}/&'"$ac_delim"'/g
|
||
+t clear
|
||
+:clear
|
||
+s/\\$//
|
||
+t bsnlc
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
|
||
+d
|
||
+:bsnlc
|
||
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
|
||
+b cont
|
||
+' <confdefs.h | sed '
|
||
+s/'"$ac_delim"'/"\\\
|
||
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
|
||
+
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+ for (key in D) D_is_set[key] = 1
|
||
+ FS = ""
|
||
+}
|
||
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
|
||
+ line = \$ 0
|
||
+ split(line, arg, " ")
|
||
+ if (arg[1] == "#") {
|
||
+ defundef = arg[2]
|
||
+ mac1 = arg[3]
|
||
+ } else {
|
||
+ defundef = substr(arg[1], 2)
|
||
+ mac1 = arg[2]
|
||
+ }
|
||
+ split(mac1, mac2, "(") #)
|
||
+ macro = mac2[1]
|
||
+ prefix = substr(line, 1, index(line, defundef) - 1)
|
||
+ if (D_is_set[macro]) {
|
||
+ # Preserve the white space surrounding the "#".
|
||
+ print prefix "define", macro P[macro] D[macro]
|
||
+ next
|
||
+ } else {
|
||
+ # Replace #undef with comments. This is necessary, for example,
|
||
+ # in the case of _POSIX_SOURCE, which is predefined and required
|
||
+ # on some systems where configure will not decide to define it.
|
||
+ if (defundef == "undef") {
|
||
+ print "/*", prefix defundef, macro, "*/"
|
||
+ next
|
||
+ }
|
||
+ }
|
||
+}
|
||
+{ print }
|
||
+_ACAWK
|
||
_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
|
||
+fi # test -n "$CONFIG_HEADERS"
|
||
|
||
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
|
||
-# `conftest.undefs', that substitutes the proper values into
|
||
-# config.h.in to produce config.h. The first handles `#define'
|
||
-# templates, and the second `#undef' templates.
|
||
-# And first: Protect against being on the right side of a sed subst in
|
||
-# config.status. Protect against being in an unquoted here document
|
||
-# in config.status.
|
||
-rm -f conftest.defines conftest.undefs
|
||
-# Using a here document instead of a string reduces the quoting nightmare.
|
||
-# Putting comments in sed scripts is not portable.
|
||
-#
|
||
-# `end' is used to avoid that the second main sed command (meant for
|
||
-# 0-ary CPP macros) applies to n-ary macro definitions.
|
||
-# See the Autoconf documentation for `clear'.
|
||
-cat >confdef2sed.sed <<\_ACEOF
|
||
-s/[\\&,]/\\&/g
|
||
-s,[\\$`],\\&,g
|
||
-t clear
|
||
-: clear
|
||
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
|
||
-t end
|
||
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
|
||
-: end
|
||
-_ACEOF
|
||
-# If some macros were called several times there might be several times
|
||
-# the same #defines, which is useless. Nevertheless, we may not want to
|
||
-# sort them, since we want the *last* AC-DEFINE to be honored.
|
||
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
|
||
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
|
||
-rm -f confdef2sed.sed
|
||
-
|
||
-# This sed command replaces #undef with comments. This is necessary, for
|
||
-# example, in the case of _POSIX_SOURCE, which is predefined and required
|
||
-# on some systems where configure will not decide to define it.
|
||
-cat >>conftest.undefs <<\_ACEOF
|
||
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
|
||
-_ACEOF
|
||
-
|
||
-# Break up conftest.defines because some shells have a limit on the size
|
||
-# of here documents, and old seds have small limits too (100 cmds).
|
||
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
|
||
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
|
||
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
|
||
-echo ' :' >>$CONFIG_STATUS
|
||
-rm -f conftest.tail
|
||
-while grep . conftest.defines >/dev/null
|
||
-do
|
||
- # Write a limited-size here document to $tmp/defines.sed.
|
||
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
|
||
- # Speed up: don't consider the non `#define' lines.
|
||
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
|
||
- # Work around the forget-to-reset-the-flag bug.
|
||
- echo 't clr' >>$CONFIG_STATUS
|
||
- echo ': clr' >>$CONFIG_STATUS
|
||
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
|
||
- echo 'CEOF
|
||
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
|
||
- rm -f $tmp/in
|
||
- mv $tmp/out $tmp/in
|
||
-' >>$CONFIG_STATUS
|
||
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
|
||
- rm -f conftest.defines
|
||
- mv conftest.tail conftest.defines
|
||
-done
|
||
-rm -f conftest.defines
|
||
-echo ' fi # grep' >>$CONFIG_STATUS
|
||
-echo >>$CONFIG_STATUS
|
||
-
|
||
-# Break up conftest.undefs because some shells have a limit on the size
|
||
-# of here documents, and old seds have small limits too (100 cmds).
|
||
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
|
||
-rm -f conftest.tail
|
||
-while grep . conftest.undefs >/dev/null
|
||
+
|
||
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS"
|
||
+shift
|
||
+for ac_tag
|
||
do
|
||
- # Write a limited-size here document to $tmp/undefs.sed.
|
||
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
|
||
- # Speed up: don't consider the non `#undef'
|
||
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
|
||
- # Work around the forget-to-reset-the-flag bug.
|
||
- echo 't clr' >>$CONFIG_STATUS
|
||
- echo ': clr' >>$CONFIG_STATUS
|
||
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
|
||
- echo 'CEOF
|
||
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
|
||
- rm -f $tmp/in
|
||
- mv $tmp/out $tmp/in
|
||
-' >>$CONFIG_STATUS
|
||
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
|
||
- rm -f conftest.undefs
|
||
- mv conftest.tail conftest.undefs
|
||
-done
|
||
-rm -f conftest.undefs
|
||
-
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
- # Let's still pretend it is `configure' which instantiates (i.e., don't
|
||
- # use $as_me), people would be surprised to read:
|
||
- # /* config.h. Generated by config.status. */
|
||
- if test x"$ac_file" = x-; then
|
||
- echo "/* Generated by configure. */" >$tmp/config.h
|
||
- else
|
||
- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
|
||
- fi
|
||
- cat $tmp/in >>$tmp/config.h
|
||
- rm -f $tmp/in
|
||
- if test x"$ac_file" != x-; then
|
||
- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
|
||
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
|
||
-echo "$as_me: $ac_file is unchanged" >&6;}
|
||
- else
|
||
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
|
||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$ac_file" : 'X\(//\)[^/]' \| \
|
||
- X"$ac_file" : 'X\(//\)$' \| \
|
||
- X"$ac_file" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$ac_file" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- { if $as_mkdir_p; then
|
||
- mkdir -p "$ac_dir"
|
||
- else
|
||
- as_dir="$ac_dir"
|
||
- as_dirs=
|
||
- while test ! -d "$as_dir"; do
|
||
- as_dirs="$as_dir $as_dirs"
|
||
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
- X"$as_dir" : 'X\(//\)$' \| \
|
||
- X"$as_dir" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$as_dir" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
+ case $ac_tag in
|
||
+ :[FHLC]) ac_mode=$ac_tag; continue;;
|
||
+ esac
|
||
+ case $ac_mode$ac_tag in
|
||
+ :[FHL]*:*);;
|
||
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
||
+ :[FH]-) ac_tag=-:-;;
|
||
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
||
+ esac
|
||
+ ac_save_IFS=$IFS
|
||
+ IFS=:
|
||
+ set x $ac_tag
|
||
+ IFS=$ac_save_IFS
|
||
+ shift
|
||
+ ac_file=$1
|
||
+ shift
|
||
+
|
||
+ case $ac_mode in
|
||
+ :L) ac_source=$1;;
|
||
+ :[FH])
|
||
+ ac_file_inputs=
|
||
+ for ac_f
|
||
+ do
|
||
+ case $ac_f in
|
||
+ -) ac_f="$tmp/stdin";;
|
||
+ *) # Look for the file first in the build tree, then in the source tree
|
||
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
|
||
+ # because $ac_f cannot contain `:'.
|
||
+ test -f "$ac_f" ||
|
||
+ case $ac_f in
|
||
+ [\\/$]*) false;;
|
||
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
||
+ esac ||
|
||
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
|
||
+ esac
|
||
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
|
||
+ as_fn_append ac_file_inputs " '$ac_f'"
|
||
done
|
||
- test ! -n "$as_dirs" || mkdir $as_dirs
|
||
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
||
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; }
|
||
|
||
- rm -f $ac_file
|
||
- mv $tmp/config.h $ac_file
|
||
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
|
||
+ # use $as_me), people would be surprised to read:
|
||
+ # /* config.h. Generated by config.status. */
|
||
+ configure_input='Generated from '`
|
||
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
|
||
+ `' by configure.'
|
||
+ if test x"$ac_file" != x-; then
|
||
+ configure_input="$ac_file. $configure_input"
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
|
||
+$as_echo "$as_me: creating $ac_file" >&6;}
|
||
fi
|
||
- else
|
||
- cat $tmp/config.h
|
||
- rm -f $tmp/config.h
|
||
- fi
|
||
-done
|
||
-_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
-
|
||
-#
|
||
-# CONFIG_LINKS section.
|
||
-#
|
||
+ # Neutralize special characters interpreted by sed in replacement strings.
|
||
+ case $configure_input in #(
|
||
+ *\&* | *\|* | *\\* )
|
||
+ ac_sed_conf_input=`$as_echo "$configure_input" |
|
||
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
|
||
+ *) ac_sed_conf_input=$configure_input;;
|
||
+ esac
|
||
|
||
-for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
|
||
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
|
||
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||
-
|
||
- { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
|
||
-echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
|
||
-
|
||
- if test ! -r $srcdir/$ac_source; then
|
||
- { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
|
||
-echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- fi
|
||
- rm -f $ac_dest
|
||
-
|
||
- # Make relative symlinks.
|
||
- ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
|
||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$ac_dest" : 'X\(//\)[^/]' \| \
|
||
- X"$ac_dest" : 'X\(//\)$' \| \
|
||
- X"$ac_dest" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$ac_dest" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- { if $as_mkdir_p; then
|
||
- mkdir -p "$ac_dest_dir"
|
||
- else
|
||
- as_dir="$ac_dest_dir"
|
||
- as_dirs=
|
||
- while test ! -d "$as_dir"; do
|
||
- as_dirs="$as_dir $as_dirs"
|
||
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
- X"$as_dir" : 'X\(//\)$' \| \
|
||
- X"$as_dir" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$as_dir" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- done
|
||
- test ! -n "$as_dirs" || mkdir $as_dirs
|
||
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
|
||
-echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; }
|
||
+ case $ac_tag in
|
||
+ *:-:* | *:-) cat >"$tmp/stdin" \
|
||
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
||
+ esac
|
||
+ ;;
|
||
+ esac
|
||
|
||
+ ac_dir=`$as_dirname -- "$ac_file" ||
|
||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
|
||
+ X"$ac_file" : 'X\(//\)$' \| \
|
||
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
|
||
+$as_echo X"$ac_file" |
|
||
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)[^/].*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\/\)$/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ /^X\(\/\).*/{
|
||
+ s//\1/
|
||
+ q
|
||
+ }
|
||
+ s/.*/./; q'`
|
||
+ as_dir="$ac_dir"; as_fn_mkdir_p
|
||
ac_builddir=.
|
||
|
||
-if test "$ac_dest_dir" != .; then
|
||
- ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
|
||
- # A "../" for each directory in $ac_dir_suffix.
|
||
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
||
-else
|
||
- ac_dir_suffix= ac_top_builddir=
|
||
-fi
|
||
+case "$ac_dir" in
|
||
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
+*)
|
||
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
|
||
+ # A ".." for each directory in $ac_dir_suffix.
|
||
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
|
||
+ case $ac_top_builddir_sub in
|
||
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
|
||
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
|
||
+ esac ;;
|
||
+esac
|
||
+ac_abs_top_builddir=$ac_pwd
|
||
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
|
||
+# for backward compatibility:
|
||
+ac_top_builddir=$ac_top_build_prefix
|
||
|
||
case $srcdir in
|
||
- .) # No --srcdir option. We are building in place.
|
||
+ .) # We are building in place.
|
||
ac_srcdir=.
|
||
- if test -z "$ac_top_builddir"; then
|
||
- ac_top_srcdir=.
|
||
- else
|
||
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
||
- fi ;;
|
||
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
||
+ ac_top_srcdir=$ac_top_builddir_sub
|
||
+ ac_abs_top_srcdir=$ac_pwd ;;
|
||
+ [\\/]* | ?:[\\/]* ) # Absolute name.
|
||
ac_srcdir=$srcdir$ac_dir_suffix;
|
||
- ac_top_srcdir=$srcdir ;;
|
||
- *) # Relative path.
|
||
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
||
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
||
+ ac_top_srcdir=$srcdir
|
||
+ ac_abs_top_srcdir=$srcdir ;;
|
||
+ *) # Relative name.
|
||
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
|
||
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
|
||
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
|
||
esac
|
||
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
|
||
|
||
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
||
-# the directories may not exist.
|
||
-case `pwd` in
|
||
-.) ac_abs_builddir="$ac_dest_dir";;
|
||
-*)
|
||
- case "$ac_dest_dir" in
|
||
- .) ac_abs_builddir=`pwd`;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
|
||
- *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
-*)
|
||
- case ${ac_top_builddir}. in
|
||
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_srcdir=$ac_srcdir;;
|
||
-*)
|
||
- case $ac_srcdir in
|
||
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
||
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
-*)
|
||
- case $ac_top_srcdir in
|
||
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
|
||
+ case $ac_mode in
|
||
+ :F)
|
||
+ #
|
||
+ # CONFIG_FILE
|
||
+ #
|
||
|
||
- case $srcdir in
|
||
- [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
|
||
- *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
|
||
+ case $INSTALL in
|
||
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
|
||
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
|
||
esac
|
||
+_ACEOF
|
||
|
||
- # Try a symlink, then a hard link, then a copy.
|
||
- ln -s $ac_rel_source $ac_dest 2>/dev/null ||
|
||
- ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
|
||
- cp -p $srcdir/$ac_source $ac_dest ||
|
||
- { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
|
||
-echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-done
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+# If the template does not know about datarootdir, expand it.
|
||
+# FIXME: This hack should be removed a few years after 2.60.
|
||
+ac_datarootdir_hack=; ac_datarootdir_seen=
|
||
+ac_sed_dataroot='
|
||
+/datarootdir/ {
|
||
+ p
|
||
+ q
|
||
+}
|
||
+/@datadir@/p
|
||
+/@docdir@/p
|
||
+/@infodir@/p
|
||
+/@localedir@/p
|
||
+/@mandir@/p'
|
||
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
|
||
+*datarootdir*) ac_datarootdir_seen=yes;;
|
||
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
||
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
|
||
+_ACEOF
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+ ac_datarootdir_hack='
|
||
+ s&@datadir@&$datadir&g
|
||
+ s&@docdir@&$docdir&g
|
||
+ s&@infodir@&$infodir&g
|
||
+ s&@localedir@&$localedir&g
|
||
+ s&@mandir@&$mandir&g
|
||
+ s&\\\${datarootdir}&$datarootdir&g' ;;
|
||
+esac
|
||
_ACEOF
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
|
||
-#
|
||
-# CONFIG_COMMANDS section.
|
||
-#
|
||
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
|
||
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
|
||
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
|
||
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
|
||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$ac_dest" : 'X\(//\)[^/]' \| \
|
||
- X"$ac_dest" : 'X\(//\)$' \| \
|
||
- X"$ac_dest" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$ac_dest" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- { if $as_mkdir_p; then
|
||
- mkdir -p "$ac_dir"
|
||
+# Neutralize VPATH when `$srcdir' = `.'.
|
||
+# Shell code in configure.ac might set extrasub.
|
||
+# FIXME: do we really want to maintain this feature?
|
||
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||
+ac_sed_extra="$ac_vpsub
|
||
+$extrasub
|
||
+_ACEOF
|
||
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||
+:t
|
||
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
||
+s|@configure_input@|$ac_sed_conf_input|;t t
|
||
+s&@top_builddir@&$ac_top_builddir_sub&;t t
|
||
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
|
||
+s&@srcdir@&$ac_srcdir&;t t
|
||
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
|
||
+s&@top_srcdir@&$ac_top_srcdir&;t t
|
||
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
|
||
+s&@builddir@&$ac_builddir&;t t
|
||
+s&@abs_builddir@&$ac_abs_builddir&;t t
|
||
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||
+s&@INSTALL@&$ac_INSTALL&;t t
|
||
+$ac_datarootdir_hack
|
||
+"
|
||
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
||
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+
|
||
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
+which seems to be undefined. Please make sure it is defined." >&5
|
||
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
||
+which seems to be undefined. Please make sure it is defined." >&2;}
|
||
+
|
||
+ rm -f "$tmp/stdin"
|
||
+ case $ac_file in
|
||
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
|
||
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
||
+ esac \
|
||
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+ ;;
|
||
+ :H)
|
||
+ #
|
||
+ # CONFIG_HEADER
|
||
+ #
|
||
+ if test x"$ac_file" != x-; then
|
||
+ {
|
||
+ $as_echo "/* $configure_input */" \
|
||
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
|
||
+ } >"$tmp/config.h" \
|
||
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
|
||
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
|
||
+ else
|
||
+ rm -f "$ac_file"
|
||
+ mv "$tmp/config.h" "$ac_file" \
|
||
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
||
+ fi
|
||
else
|
||
- as_dir="$ac_dir"
|
||
- as_dirs=
|
||
- while test ! -d "$as_dir"; do
|
||
- as_dirs="$as_dir $as_dirs"
|
||
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
|
||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||
- X"$as_dir" : 'X\(//\)[^/]' \| \
|
||
- X"$as_dir" : 'X\(//\)$' \| \
|
||
- X"$as_dir" : 'X\(/\)' \| \
|
||
- . : '\(.\)' 2>/dev/null ||
|
||
-echo X"$as_dir" |
|
||
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
||
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
|
||
- /^X\(\/\/\)$/{ s//\1/; q; }
|
||
- /^X\(\/\).*/{ s//\1/; q; }
|
||
- s/.*/./; q'`
|
||
- done
|
||
- test ! -n "$as_dirs" || mkdir $as_dirs
|
||
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
|
||
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
|
||
- { (exit 1); exit 1; }; }; }
|
||
+ $as_echo "/* $configure_input */" \
|
||
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|
||
+ || as_fn_error "could not create -" "$LINENO" 5
|
||
+ fi
|
||
+ ;;
|
||
+ :L)
|
||
+ #
|
||
+ # CONFIG_LINK
|
||
+ #
|
||
|
||
- ac_builddir=.
|
||
+ if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then
|
||
+ :
|
||
+ else
|
||
+ # Prefer the file from the source tree if names are identical.
|
||
+ if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then
|
||
+ ac_source=$srcdir/$ac_source
|
||
+ fi
|
||
|
||
-if test "$ac_dir" != .; then
|
||
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
|
||
- # A "../" for each directory in $ac_dir_suffix.
|
||
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
|
||
-else
|
||
- ac_dir_suffix= ac_top_builddir=
|
||
-fi
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5
|
||
+$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
|
||
|
||
-case $srcdir in
|
||
- .) # No --srcdir option. We are building in place.
|
||
- ac_srcdir=.
|
||
- if test -z "$ac_top_builddir"; then
|
||
- ac_top_srcdir=.
|
||
- else
|
||
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|
||
- fi ;;
|
||
- [\\/]* | ?:[\\/]* ) # Absolute path.
|
||
- ac_srcdir=$srcdir$ac_dir_suffix;
|
||
- ac_top_srcdir=$srcdir ;;
|
||
- *) # Relative path.
|
||
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|
||
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
|
||
-esac
|
||
+ if test ! -r "$ac_source"; then
|
||
+ as_fn_error "$ac_source: file not found" "$LINENO" 5
|
||
+ fi
|
||
+ rm -f "$ac_file"
|
||
|
||
-# Do not use `cd foo && pwd` to compute absolute paths, because
|
||
-# the directories may not exist.
|
||
-case `pwd` in
|
||
-.) ac_abs_builddir="$ac_dir";;
|
||
-*)
|
||
- case "$ac_dir" in
|
||
- .) ac_abs_builddir=`pwd`;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
|
||
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
-*)
|
||
- case ${ac_top_builddir}. in
|
||
- .) ac_abs_top_builddir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
|
||
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_srcdir=$ac_srcdir;;
|
||
-*)
|
||
- case $ac_srcdir in
|
||
- .) ac_abs_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
|
||
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
-case $ac_abs_builddir in
|
||
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
-*)
|
||
- case $ac_top_srcdir in
|
||
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
|
||
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
|
||
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
|
||
- esac;;
|
||
-esac
|
||
+ # Try a relative symlink, then a hard link, then a copy.
|
||
+ case $srcdir in
|
||
+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;;
|
||
+ *) ac_rel_source=$ac_top_build_prefix$ac_source ;;
|
||
+ esac
|
||
+ ln -s "$ac_rel_source" "$ac_file" 2>/dev/null ||
|
||
+ ln "$ac_source" "$ac_file" 2>/dev/null ||
|
||
+ cp -p "$ac_source" "$ac_file" ||
|
||
+ as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5
|
||
+ fi
|
||
+ ;;
|
||
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
|
||
+$as_echo "$as_me: executing $ac_file commands" >&6;}
|
||
+ ;;
|
||
+ esac
|
||
|
||
|
||
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
|
||
-echo "$as_me: executing $ac_dest commands" >&6;}
|
||
- case $ac_dest in
|
||
- Makefile ) echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
|
||
+ case $ac_file$ac_mode in
|
||
+ "Makefile":C) echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
|
||
rm -f Makesim1.tmp Makesim2.tmp Makefile
|
||
sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
|
||
sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
|
||
@@ -6116,18 +5645,19 @@
|
||
<Makefile.sim >Makefile
|
||
rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
|
||
;;
|
||
- stamp-h ) echo > stamp-h ;;
|
||
+ "stamp-h":C) echo > stamp-h ;;
|
||
+
|
||
esac
|
||
-done
|
||
-_ACEOF
|
||
+done # for ac_tag
|
||
|
||
-cat >>$CONFIG_STATUS <<\_ACEOF
|
||
|
||
-{ (exit 0); exit 0; }
|
||
+as_fn_exit 0
|
||
_ACEOF
|
||
-chmod +x $CONFIG_STATUS
|
||
ac_clean_files=$ac_clean_files_save
|
||
|
||
+test $ac_write_fail = 0 ||
|
||
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
||
+
|
||
|
||
# configure is writing to config.log, and then calls config.status.
|
||
# config.status does its own redirection, appending to config.log.
|
||
@@ -6147,7 +5677,11 @@
|
||
exec 5>>config.log
|
||
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
|
||
# would make configure fail if this is the last instruction.
|
||
- $ac_cs_success || { (exit 1); exit 1; }
|
||
+ $ac_cs_success || as_fn_exit $?
|
||
+fi
|
||
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
||
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
||
fi
|
||
|
||
|
||
diff -Naur gdb-6.8.orig/sim/erc32/configure.ac gdb-6.8/sim/erc32/configure.ac
|
||
--- gdb-6.8.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
|
||
+++ gdb-6.8/sim/erc32/configure.ac 2009-09-23 18:02:13.000000000 +0200
|
||
@@ -11,27 +11,32 @@
|
||
|
||
AC_CHECK_HEADERS(stdlib.h)
|
||
|
||
-# In the Cygwin environment, we need some additional flags.
|
||
-AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
|
||
-[AC_EGREP_CPP(lose, [
|
||
-#ifdef __CYGWIN__
|
||
-lose
|
||
-#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
|
||
+AC_ARG_WITH([system-readline],
|
||
+ [AS_HELP_STRING([--with-system-readline],
|
||
+ [use installed readline library])])
|
||
|
||
-if test x$sim_cv_os_cygwin = xyes; then
|
||
- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
|
||
+if test "$with_system_readline" = yes; then
|
||
+ AC_MSG_CHECKING([for readline])
|
||
+ save_LIBS="$LIBS"
|
||
+ LIBS="-lreadline $save_LIBS"
|
||
+ AC_LINK_IFELSE([AC_LANG_CALL([],
|
||
+ [add_history])], [READLINE=-lreadline],
|
||
+ [ LIBS="-lreadline -lncurses $save_LIBS"
|
||
+ AC_LINK_IFELSE([AC_LANG_CALL([],
|
||
+ [add_history])], [READLINE="-lreadline -lncurses"],
|
||
+ [AC_MSG_ERROR([unable to detect readline])])
|
||
+ ])
|
||
+ LIBS="$save_LIBS"
|
||
+ AC_MSG_RESULT($READLINE)
|
||
+ READLINE_DEPS=
|
||
+ READLINE_CFLAGS=
|
||
else
|
||
- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
|
||
-fi
|
||
-AC_SUBST(TERMCAP)
|
||
-
|
||
-# We prefer the in-tree readline. Top-level dependencies make sure
|
||
-# src/readline (if it's there) is configured before src/sim.
|
||
-if test -r ../../readline/Makefile; then
|
||
- READLINE=../../readline/libreadline.a
|
||
-else
|
||
- AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
|
||
- AC_ERROR([the required "readline" library is missing]), $TERMCAP)
|
||
+ READLINE='../../readline/libreadline.a -lncurses'
|
||
+ READLINE_DEPS='$(READLINE)'
|
||
+ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
|
||
fi
|
||
AC_SUBST(READLINE)
|
||
+AC_SUBST(READLINE_DEPS)
|
||
+AC_SUBST(READLINE_CFLAGS)
|
||
+
|
||
SIM_AC_OUTPUT
|
||
diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8/sim/erc32/erc32.c
|
||
--- gdb-6.8.orig/sim/erc32/erc32.c 1999-04-16 03:35:00.000000000 +0200
|
||
+++ gdb-6.8/sim/erc32/erc32.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -24,6 +24,7 @@
|
||
|
||
#include <sys/types.h>
|
||
#include <stdio.h>
|
||
+#include <string.h>
|
||
#include <termios.h>
|
||
#include <sys/fcntl.h>
|
||
#include <sys/file.h>
|
||
@@ -413,7 +414,7 @@
|
||
if (rom8) mec_memcfg &= ~0x20000;
|
||
else mec_memcfg |= 0x20000;
|
||
|
||
- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
|
||
+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
|
||
mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
|
||
|
||
if (sparclite_board) {
|
||
@@ -1659,7 +1660,7 @@
|
||
errmec = 0;
|
||
return(1);
|
||
}
|
||
-#endif;
|
||
+#endif
|
||
|
||
if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
|
||
fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz);
|
||
@@ -1736,7 +1737,7 @@
|
||
errmec = 0;
|
||
return(1);
|
||
}
|
||
-#endif;
|
||
+#endif
|
||
|
||
if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
|
||
if (mem_accprot) {
|
||
diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8/sim/erc32/exec.c
|
||
--- gdb-6.8.orig/sim/erc32/exec.c 2005-03-07 12:09:05.000000000 +0100
|
||
+++ gdb-6.8/sim/erc32/exec.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -1713,7 +1713,7 @@
|
||
sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1];
|
||
sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1];
|
||
default:
|
||
- ;
|
||
+ break;
|
||
}
|
||
#endif
|
||
|
||
@@ -1886,7 +1886,7 @@
|
||
sregs->fs[rd & ~1] = sregs->fdp[rd | 1];
|
||
sregs->fs[rd | 1] = sregs->fdp[rd & ~1];
|
||
default:
|
||
- ;
|
||
+ break;
|
||
}
|
||
#endif
|
||
if (sregs->fpstate == FP_EXC_PE) {
|
||
diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8/sim/erc32/Makefile.in
|
||
--- gdb-6.8.orig/sim/erc32/Makefile.in 2008-01-01 23:53:24.000000000 +0100
|
||
+++ gdb-6.8/sim/erc32/Makefile.in 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -18,12 +18,12 @@
|
||
|
||
## COMMON_PRE_CONFIG_FRAG
|
||
|
||
-TERMCAP_LIB = @TERMCAP@
|
||
+# TERMCAP_LIB = -lncurses
|
||
READLINE_LIB = @READLINE@
|
||
|
||
SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
|
||
SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
|
||
-SIM_EXTRA_ALL = sis
|
||
+SIM_EXTRA_ALL = sis$(EXEEXT)
|
||
SIM_EXTRA_INSTALL = install-sis
|
||
SIM_EXTRA_CLEAN = clean-sis
|
||
|
||
@@ -37,8 +37,8 @@
|
||
# `sis' doesn't need interf.o.
|
||
SIS_OFILES = exec.o erc32.o func.o help.o float.o
|
||
|
||
-sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
|
||
- $(CC) $(ALL_CFLAGS) -o sis \
|
||
+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
|
||
+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
|
||
sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
|
||
|
||
# FIXME: This computes the build host's endianness, doesn't it?
|
||
@@ -51,11 +51,11 @@
|
||
|
||
# Copy the files into directories where they will be run.
|
||
install-sis: installdirs
|
||
- n=`echo sis | sed '$(program_transform_name)'`; \
|
||
- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
|
||
+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
|
||
+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
|
||
|
||
clean-sis:
|
||
- rm -f sis end end.h
|
||
+ rm -f sis$(EXEEXT) end end.h
|
||
|
||
configure:
|
||
@echo "Rebuilding configure..."
|
||
diff -Naur gdb-6.8.orig/sim/erc32/sis.c gdb-6.8/sim/erc32/sis.c
|
||
--- gdb-6.8.orig/sim/erc32/sis.c 2005-03-07 12:09:05.000000000 +0100
|
||
+++ gdb-6.8/sim/erc32/sis.c 2009-09-23 18:03:21.000000000 +0200
|
||
@@ -177,7 +177,7 @@
|
||
cfile = 0;
|
||
for (i = 0; i < 64; i++)
|
||
cmdq[i] = 0;
|
||
- printf("\n SIS - SPARC intruction simulator %s, copyright Jiri Gaisler 1995\n", sis_version);
|
||
+ printf("\n SIS - SPARC instruction simulator %s, copyright Jiri Gaisler 1995\n", sis_version);
|
||
printf(" Bug-reports to jgais@wd.estec.esa.nl\n\n");
|
||
while (stat < argc) {
|
||
if (argv[stat][0] == '-') {
|
||
diff -Naur gdb-6.8.orig/sim/h8300/compile.c gdb-6.8/sim/h8300/compile.c
|
||
--- gdb-6.8.orig/sim/h8300/compile.c 2007-07-03 19:19:38.000000000 +0200
|
||
+++ gdb-6.8/sim/h8300/compile.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -38,6 +38,12 @@
|
||
# define SIGTRAP 5
|
||
#endif
|
||
|
||
+#ifdef _WIN32
|
||
+#ifndef SIGBUS
|
||
+#define SIGBUS 10
|
||
+#endif
|
||
+#endif
|
||
+
|
||
int debug;
|
||
|
||
host_callback *sim_callback;
|
||
@@ -599,7 +605,7 @@
|
||
/* Find the exact opcode/arg combo. */
|
||
for (q = h8_opcodes; q->name; q++)
|
||
{
|
||
- op_type *nib = q->data.nib;
|
||
+ const op_type *nib = q->data.nib;
|
||
unsigned int len = 0;
|
||
|
||
if ((q->available == AV_H8SX && !h8300sxmode) ||
|
||
@@ -924,7 +930,7 @@
|
||
#endif
|
||
/* Fill in the args. */
|
||
{
|
||
- op_type *args = q->args.nib;
|
||
+ const op_type *args = q->args.nib;
|
||
int hadone = 0;
|
||
int nargs;
|
||
|
||
diff -Naur gdb-6.8.orig/sim/m32c/gdb-if.c gdb-6.8/sim/m32c/gdb-if.c
|
||
--- gdb-6.8.orig/sim/m32c/gdb-if.c 2008-01-01 23:53:25.000000000 +0100
|
||
+++ gdb-6.8/sim/m32c/gdb-if.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -534,8 +534,12 @@
|
||
#endif
|
||
|
||
case 5:
|
||
+#ifdef SIGTRAP
|
||
return SIGTRAP;
|
||
-
|
||
+#else
|
||
+ return SIGSEGV;
|
||
+#endif
|
||
+
|
||
case 10:
|
||
#ifdef SIGBUS
|
||
return SIGBUS;
|
||
diff -Naur gdb-6.8.orig/sim/m32c/Makefile.in gdb-6.8/sim/m32c/Makefile.in
|
||
--- gdb-6.8.orig/sim/m32c/Makefile.in 2008-01-01 23:53:24.000000000 +0100
|
||
+++ gdb-6.8/sim/m32c/Makefile.in 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -55,7 +55,7 @@
|
||
./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
|
||
|
||
opc2c : opc2c.o safe-fgets.o
|
||
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
|
||
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@
|
||
|
||
sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
|
||
../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
|
||
@@ -83,8 +83,10 @@
|
||
mem.o : mem.h cpu.h syscalls.h
|
||
misc.o : cpu.h misc.h
|
||
opc2c.o : safe-fgets.h
|
||
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
|
||
reg.o : cpu.h
|
||
safe-fgets.o : safe-fgets.h
|
||
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
|
||
srcdest.c : cpu.h mem.h
|
||
syscalls.c : cpu.h mem.h syscalls.h
|
||
|
||
diff -Naur gdb-6.8.orig/sim/ppc/configure gdb-6.8/sim/ppc/configure
|
||
--- gdb-6.8.orig/sim/ppc/configure 2008-03-14 22:35:27.000000000 +0100
|
||
+++ gdb-6.8/sim/ppc/configure 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -2709,10 +2709,263 @@
|
||
|
||
fi;
|
||
|
||
+echo "$as_me:$LINENO: checking if union semun defined" >&5
|
||
+echo $ECHO_N "checking if union semun defined... $ECHO_C" >&6
|
||
+if test "${ac_cv_HAS_UNION_SEMUN+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+
|
||
+#include <sys/types.h>
|
||
+#include <sys/ipc.h>
|
||
+#include <sys/sem.h>
|
||
+int
|
||
+main ()
|
||
+{
|
||
+union semun arg ;
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+rm -f conftest.$ac_objext
|
||
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||
+ (eval $ac_compile) 2>conftest.er1
|
||
+ ac_status=$?
|
||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||
+ rm -f conftest.er1
|
||
+ cat conftest.err >&5
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } &&
|
||
+ { ac_try='test -z "$ac_c_werror_flag"
|
||
+ || test ! -s conftest.err'
|
||
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
+ (eval $ac_try) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; } &&
|
||
+ { ac_try='test -s conftest.$ac_objext'
|
||
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
+ (eval $ac_try) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; }; then
|
||
+ ac_cv_has_union_semun="yes"
|
||
+else
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+ac_cv_has_union_semun="no"
|
||
+fi
|
||
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+echo "$as_me:$LINENO: result: $ac_cv_has_union_semun" >&5
|
||
+echo "${ECHO_T}$ac_cv_has_union_semun" >&6
|
||
+
|
||
+fi
|
||
+echo "$as_me:$LINENO: result: $ac_cv_HAS_UNION_SEMUN" >&5
|
||
+echo "${ECHO_T}$ac_cv_HAS_UNION_SEMUN" >&6
|
||
+
|
||
+
|
||
+if test "$ac_cv_has_union_semun" = "yes"; then
|
||
+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5
|
||
+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6
|
||
+if test "${ac_cv_sysv_sem+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+
|
||
+ if test "$cross_compiling" = yes; then
|
||
+ :
|
||
+else
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+
|
||
+ #include <sys/types.h>
|
||
+ #include <sys/ipc.h>
|
||
+ #include <sys/sem.h>
|
||
+ int main () {
|
||
+ union semun arg ;
|
||
+
|
||
+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400);
|
||
+ if (id == -1)
|
||
+ exit(1);
|
||
+ arg.val = 0; /* avoid implicit type cast to union */
|
||
+ if (semctl(id, 0, IPC_RMID, arg) == -1)
|
||
+ exit(1);
|
||
+ exit(0);
|
||
+ }
|
||
+
|
||
+_ACEOF
|
||
+rm -f conftest$ac_exeext
|
||
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
+ (eval $ac_link) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
+ (eval $ac_try) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; }; then
|
||
+ ac_cv_sysv_sem="yes"
|
||
+else
|
||
+ echo "$as_me: program exited with status $ac_status" >&5
|
||
+echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+( exit $ac_status )
|
||
+ac_cv_sysv_sem="no"
|
||
+fi
|
||
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+
|
||
+fi
|
||
+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5
|
||
+echo "${ECHO_T}$ac_cv_sysv_sem" >&6
|
||
+else # semun is not defined
|
||
+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5
|
||
+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6
|
||
+if test "${ac_cv_sysv_sem+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+
|
||
+ if test "$cross_compiling" = yes; then
|
||
+ :
|
||
+else
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+
|
||
+ #include <sys/types.h>
|
||
+ #include <sys/ipc.h>
|
||
+ #include <sys/sem.h>
|
||
+ union semun {
|
||
+ int val;
|
||
+ struct semid_ds *buf;
|
||
+ ushort *array;
|
||
+ };
|
||
+ int main () {
|
||
+ union semun arg ;
|
||
+
|
||
+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400);
|
||
+ if (id == -1)
|
||
+ exit(1);
|
||
+ arg.val = 0; /* avoid implicit type cast to union */
|
||
+ if (semctl(id, 0, IPC_RMID, arg) == -1)
|
||
+ exit(1);
|
||
+ exit(0);
|
||
+ }
|
||
+
|
||
+_ACEOF
|
||
+rm -f conftest$ac_exeext
|
||
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
+ (eval $ac_link) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
+ (eval $ac_try) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; }; then
|
||
+ ac_cv_sysv_sem="yes"
|
||
+else
|
||
+ echo "$as_me: program exited with status $ac_status" >&5
|
||
+echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+( exit $ac_status )
|
||
+ac_cv_sysv_sem="no"
|
||
+fi
|
||
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+
|
||
+fi
|
||
+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5
|
||
+echo "${ECHO_T}$ac_cv_sysv_sem" >&6
|
||
+fi
|
||
+
|
||
+echo "$as_me:$LINENO: checking whether System V shared memory is supported" >&5
|
||
+echo $ECHO_N "checking whether System V shared memory is supported... $ECHO_C" >&6
|
||
+if test "${ac_cv_sysv_shm+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+
|
||
+if test "$cross_compiling" = yes; then
|
||
+ :
|
||
+else
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+
|
||
+#include <sys/types.h>
|
||
+#include <sys/ipc.h>
|
||
+#include <sys/shm.h>
|
||
+int main () {
|
||
+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400);
|
||
+ if (id == -1)
|
||
+ exit(1);
|
||
+ if (shmctl(id, IPC_RMID, 0) == -1)
|
||
+ exit(1);
|
||
+ exit(0);
|
||
+}
|
||
+
|
||
+_ACEOF
|
||
+rm -f conftest$ac_exeext
|
||
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||
+ (eval $ac_link) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||
+ (eval $ac_try) 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; }; then
|
||
+ ac_cv_sysv_shm="yes"
|
||
+else
|
||
+ echo "$as_me: program exited with status $ac_status" >&5
|
||
+echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+( exit $ac_status )
|
||
+ac_cv_sysv_shm="no"
|
||
+fi
|
||
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+
|
||
+fi
|
||
+echo "$as_me:$LINENO: result: $ac_cv_sysv_shm" >&5
|
||
+echo "${ECHO_T}$ac_cv_sysv_shm" >&6
|
||
+
|
||
+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
||
+ sim_sysv_ipc_hw=",sem,shm";
|
||
+else
|
||
+ sim_sysv_ipc_hw="";
|
||
+fi
|
||
+
|
||
+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
||
+ sim_hwflags="-DHAS_UNION_SEMUN";
|
||
+fi
|
||
+
|
||
+
|
||
# Check whether --enable-sim-hardware or --disable-sim-hardware was given.
|
||
if test "${enable_sim_hardware+set}" = set; then
|
||
enableval="$enable_sim_hardware"
|
||
- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide"
|
||
+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}"
|
||
case "${enableval}" in
|
||
yes) ;;
|
||
no) { { echo "$as_me:$LINENO: error: \"List of hardware must be specified for --enable-sim-hardware\"" >&5
|
||
@@ -2728,14 +2981,13 @@
|
||
echo "Setting hardware to $sim_hw_src, $sim_hw_obj"
|
||
fi
|
||
else
|
||
- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide"
|
||
+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}"
|
||
sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'`
|
||
sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'`
|
||
if test x"$silent" != x"yes"; then
|
||
echo "Setting hardware to $sim_hw_src, $sim_hw_obj"
|
||
fi
|
||
fi;
|
||
-
|
||
# Check whether --enable-sim-hostbitsize or --disable-sim-hostbitsize was given.
|
||
if test "${enable_sim_hostbitsize+set}" = set; then
|
||
enableval="$enable_sim_hostbitsize"
|
||
@@ -2752,7 +3004,6 @@
|
||
sim_hostbitsize=""
|
||
fi;
|
||
|
||
-
|
||
# Check whether --enable-sim-hostendian or --disable-sim-hostendian was given.
|
||
if test "${enable_sim_hostendian+set}" = set; then
|
||
enableval="$enable_sim_hostendian"
|
||
diff -Naur gdb-6.8.orig/sim/ppc/configure.ac gdb-6.8/sim/ppc/configure.ac
|
||
--- gdb-6.8.orig/sim/ppc/configure.ac 2008-03-14 22:35:27.000000000 +0100
|
||
+++ gdb-6.8/sim/ppc/configure.ac 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -209,10 +209,105 @@
|
||
esac
|
||
])dnl
|
||
|
||
+AC_CACHE_CHECK([if union semun defined],
|
||
+ ac_cv_HAS_UNION_SEMUN,
|
||
+ [AC_TRY_COMPILE([
|
||
+#include <sys/types.h>
|
||
+#include <sys/ipc.h>
|
||
+#include <sys/sem.h>],
|
||
+[union semun arg ;],
|
||
+[ac_cv_has_union_semun="yes"],
|
||
+[ac_cv_has_union_semun="no"])
|
||
+AC_MSG_RESULT($ac_cv_has_union_semun)
|
||
+])
|
||
+
|
||
+
|
||
+if test "$ac_cv_has_union_semun" = "yes"; then
|
||
+ AC_CACHE_CHECK(whether System V semaphores are supported,
|
||
+ ac_cv_sysv_sem,
|
||
+ [
|
||
+ AC_TRY_RUN(
|
||
+ [
|
||
+ #include <sys/types.h>
|
||
+ #include <sys/ipc.h>
|
||
+ #include <sys/sem.h>
|
||
+ int main () {
|
||
+ union semun arg ;
|
||
+
|
||
+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400);
|
||
+ if (id == -1)
|
||
+ exit(1);
|
||
+ arg.val = 0; /* avoid implicit type cast to union */
|
||
+ if (semctl(id, 0, IPC_RMID, arg) == -1)
|
||
+ exit(1);
|
||
+ exit(0);
|
||
+ }
|
||
+ ],
|
||
+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :)
|
||
+ ])
|
||
+else # semun is not defined
|
||
+ AC_CACHE_CHECK(whether System V semaphores are supported,
|
||
+ ac_cv_sysv_sem,
|
||
+ [
|
||
+ AC_TRY_RUN(
|
||
+ [
|
||
+ #include <sys/types.h>
|
||
+ #include <sys/ipc.h>
|
||
+ #include <sys/sem.h>
|
||
+ union semun {
|
||
+ int val;
|
||
+ struct semid_ds *buf;
|
||
+ ushort *array;
|
||
+ };
|
||
+ int main () {
|
||
+ union semun arg ;
|
||
+
|
||
+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400);
|
||
+ if (id == -1)
|
||
+ exit(1);
|
||
+ arg.val = 0; /* avoid implicit type cast to union */
|
||
+ if (semctl(id, 0, IPC_RMID, arg) == -1)
|
||
+ exit(1);
|
||
+ exit(0);
|
||
+ }
|
||
+ ],
|
||
+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :)
|
||
+ ])
|
||
+fi
|
||
+
|
||
+AC_CACHE_CHECK(whether System V shared memory is supported,
|
||
+ac_cv_sysv_shm,
|
||
+[
|
||
+AC_TRY_RUN([
|
||
+#include <sys/types.h>
|
||
+#include <sys/ipc.h>
|
||
+#include <sys/shm.h>
|
||
+int main () {
|
||
+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400);
|
||
+ if (id == -1)
|
||
+ exit(1);
|
||
+ if (shmctl(id, IPC_RMID, 0) == -1)
|
||
+ exit(1);
|
||
+ exit(0);
|
||
+}
|
||
+],
|
||
+ac_cv_sysv_shm="yes", ac_cv_sysv_shm="no", :)
|
||
+])
|
||
+
|
||
+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
||
+ sim_sysv_ipc_hw=",sem,shm";
|
||
+else
|
||
+ sim_sysv_ipc_hw="";
|
||
+fi
|
||
+
|
||
+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
||
+ sim_hwflags="-DHAS_UNION_SEMUN";
|
||
+fi
|
||
+
|
||
|
||
AC_ARG_ENABLE(sim-hardware,
|
||
[ --enable-sim-hardware=list Specify the hardware to be included in the build.],
|
||
-[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide"
|
||
+[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}"
|
||
case "${enableval}" in
|
||
yes) ;;
|
||
no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";;
|
||
@@ -224,14 +319,13 @@
|
||
sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'`
|
||
if test x"$silent" != x"yes" && test x"$hardware" != x""; then
|
||
echo "Setting hardware to $sim_hw_src, $sim_hw_obj"
|
||
-fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide"
|
||
+fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}"
|
||
sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'`
|
||
sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'`
|
||
if test x"$silent" != x"yes"; then
|
||
echo "Setting hardware to $sim_hw_src, $sim_hw_obj"
|
||
fi])dnl
|
||
|
||
-
|
||
AC_ARG_ENABLE(sim-hostbitsize,
|
||
[ --enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).],
|
||
[case "${enableval}" in
|
||
diff -Naur gdb-6.8.orig/sim/ppc/debug.c gdb-6.8/sim/ppc/debug.c
|
||
--- gdb-6.8.orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200
|
||
+++ gdb-6.8/sim/ppc/debug.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -70,6 +70,8 @@
|
||
{ trace_pass_device, "pass-device" },
|
||
{ trace_phb_device, "phb-device" },
|
||
{ trace_register_device, "register-device", "Device initializing registers" },
|
||
+ { trace_sem_device, "sem-device" },
|
||
+ { trace_shm_device, "shm-device" },
|
||
{ trace_stack_device, "stack-device" },
|
||
{ trace_vm_device, "vm-device" },
|
||
/* packages */
|
||
diff -Naur gdb-6.8.orig/sim/ppc/debug.h gdb-6.8/sim/ppc/debug.h
|
||
--- gdb-6.8.orig/sim/ppc/debug.h 1999-04-16 03:35:08.000000000 +0200
|
||
+++ gdb-6.8/sim/ppc/debug.h 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -51,6 +51,8 @@
|
||
trace_pal_device,
|
||
trace_pass_device,
|
||
trace_phb_device,
|
||
+ trace_sem_device,
|
||
+ trace_shm_device,
|
||
trace_stack_device,
|
||
trace_register_device,
|
||
trace_vm_device,
|
||
diff -Naur gdb-6.8.orig/sim/ppc/hw_sem.c gdb-6.8/sim/ppc/hw_sem.c
|
||
--- gdb-6.8.orig/sim/ppc/hw_sem.c 1970-01-01 01:00:00.000000000 +0100
|
||
+++ gdb-6.8/sim/ppc/hw_sem.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -0,0 +1,301 @@
|
||
+/* This file is part of the program psim.
|
||
+
|
||
+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com>
|
||
+
|
||
+ This program is free software; you can redistribute it and/or modify
|
||
+ it under the terms of the GNU General Public License as published by
|
||
+ the Free Software Foundation; either version 2 of the License, or
|
||
+ (at your option) any later version.
|
||
+
|
||
+ This program is distributed in the hope that it will be useful,
|
||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
+ GNU General Public License for more details.
|
||
+
|
||
+ You should have received a copy of the GNU General Public License
|
||
+ along with this program; if not, write to the Free Software
|
||
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
+
|
||
+ */
|
||
+
|
||
+
|
||
+#ifndef _HW_SEM_C_
|
||
+#define _HW_SEM_C_
|
||
+
|
||
+#include "device_table.h"
|
||
+
|
||
+#ifdef HAVE_STRING_H
|
||
+#include <string.h>
|
||
+#else
|
||
+#ifdef HAVE_STRINGS_H
|
||
+#include <strings.h>
|
||
+#endif
|
||
+#endif
|
||
+
|
||
+#include <sys/ipc.h>
|
||
+#include <sys/sem.h>
|
||
+
|
||
+#include <errno.h>
|
||
+
|
||
+/* DEVICE
|
||
+
|
||
+
|
||
+ sem - provide access to a unix semaphore
|
||
+
|
||
+
|
||
+ DESCRIPTION
|
||
+
|
||
+
|
||
+ This device implements an interface to a unix semaphore.
|
||
+
|
||
+
|
||
+ PROPERTIES
|
||
+
|
||
+
|
||
+ reg = <address> <size> (required)
|
||
+
|
||
+ Determine where the memory lives in the parents address space.
|
||
+
|
||
+ key = <integer> (required)
|
||
+
|
||
+ This is the key of the unix semaphore.
|
||
+
|
||
+ EXAMPLES
|
||
+
|
||
+
|
||
+ Enable tracing of the sem:
|
||
+
|
||
+ | bash$ psim -t sem-device \
|
||
+
|
||
+
|
||
+ Configure a UNIX semaphore using key 0x12345678 mapped into psim
|
||
+ address space at 0xfff00000:
|
||
+
|
||
+ | -o '/sem@0xfff00000/reg 0xfff00000 0x80000' \
|
||
+ | -o '/sem@0xfff00000/key 0x12345678' \
|
||
+
|
||
+ sim/ppc/run -o '/#address-cells 1' \
|
||
+ -o '/sem@0xc0000000/reg 0xc0000000 0x80000' \
|
||
+ -o '/sem@0xc0000000/key 0x12345678' ../psim-hello/hello
|
||
+
|
||
+ REGISTERS
|
||
+
|
||
+ offset 0 - lock count
|
||
+ offset 4 - lock operation
|
||
+ offset 8 - unlock operation
|
||
+
|
||
+ All reads return the current or resulting count.
|
||
+
|
||
+ BUGS
|
||
+
|
||
+ None known.
|
||
+
|
||
+ */
|
||
+
|
||
+typedef struct _hw_sem_device {
|
||
+ unsigned_word physical_address;
|
||
+ key_t key;
|
||
+ int id;
|
||
+ int initial;
|
||
+ int count;
|
||
+} hw_sem_device;
|
||
+
|
||
+static void
|
||
+hw_sem_init_data(device *me)
|
||
+{
|
||
+ hw_sem_device *sem = (hw_sem_device*)device_data(me);
|
||
+ const device_unit *d;
|
||
+ int status;
|
||
+#if !HAS_UNION_SEMUN
|
||
+ union semun {
|
||
+ int val;
|
||
+ struct semid_ds *buf;
|
||
+ unsigned short int *array;
|
||
+#if defined(__linux__)
|
||
+ struct seminfo *__buf;
|
||
+#endif
|
||
+ } ;
|
||
+#endif
|
||
+ union semun help;
|
||
+
|
||
+ /* initialize the properties of the sem */
|
||
+
|
||
+ if (device_find_property(me, "key") == NULL)
|
||
+ error("sem_init_data() required key property is missing\n");
|
||
+
|
||
+ if (device_find_property(me, "value") == NULL)
|
||
+ error("sem_init_data() required value property is missing\n");
|
||
+
|
||
+ sem->key = (key_t) device_find_integer_property(me, "key");
|
||
+ DTRACE(sem, ("semaphore key (%d)\n", sem->key) );
|
||
+
|
||
+ sem->initial = (int) device_find_integer_property(me, "value");
|
||
+ DTRACE(sem, ("semaphore initial value (%d)\n", sem->initial) );
|
||
+
|
||
+ d = device_unit_address(me);
|
||
+ sem->physical_address = d->cells[ d->nr_cells-1 ];
|
||
+ DTRACE(sem, ("semaphore physical_address=0x%x\n", sem->physical_address));
|
||
+
|
||
+ /* Now to initialize the semaphore */
|
||
+
|
||
+ if ( sem->initial != -1 ) {
|
||
+
|
||
+ sem->id = semget(sem->key, 1, IPC_CREAT | 0660);
|
||
+ if (sem->id == -1)
|
||
+ error("hw_sem_init_data() semget failed\n");
|
||
+
|
||
+ help.val = sem->initial;
|
||
+ status = semctl( sem->id, 0, SETVAL, help );
|
||
+ if (status == -1)
|
||
+ error("hw_sem_init_data() semctl -- set value failed\n");
|
||
+
|
||
+ } else {
|
||
+ sem->id = semget(sem->key, 1, 0660);
|
||
+ if (sem->id == -1)
|
||
+ error("hw_sem_init_data() semget failed\n");
|
||
+ }
|
||
+
|
||
+ sem->count = semctl( sem->id, 0, GETVAL, help );
|
||
+ if (sem->count == -1)
|
||
+ error("hw_sem_init_data() semctl -- get value failed\n");
|
||
+ DTRACE(sem, ("semaphore OS value (%d)\n", sem->count) );
|
||
+
|
||
+ if (sizeof(int) != 4)
|
||
+ error("hw_sem_init_data() typing problem\n");
|
||
+}
|
||
+
|
||
+static void
|
||
+hw_sem_attach_address_callback(device *me,
|
||
+ attach_type attach,
|
||
+ int space,
|
||
+ unsigned_word addr,
|
||
+ unsigned nr_bytes,
|
||
+ access_type access,
|
||
+ device *client) /*callback/default*/
|
||
+{
|
||
+ hw_sem_device *sem = (hw_sem_device*)device_data(me);
|
||
+
|
||
+ if (space != 0)
|
||
+ error("sem_attach_address_callback() invalid address space\n");
|
||
+
|
||
+ if (nr_bytes == 12)
|
||
+ error("sem_attach_address_callback() invalid size\n");
|
||
+
|
||
+ sem->physical_address = addr;
|
||
+ DTRACE(sem, ("semaphore physical_address=0x%x\n", addr));
|
||
+}
|
||
+
|
||
+static unsigned
|
||
+hw_sem_io_read_buffer(device *me,
|
||
+ void *dest,
|
||
+ int space,
|
||
+ unsigned_word addr,
|
||
+ unsigned nr_bytes,
|
||
+ cpu *processor,
|
||
+ unsigned_word cia)
|
||
+{
|
||
+ hw_sem_device *sem = (hw_sem_device*)device_data(me);
|
||
+ struct sembuf sb;
|
||
+ int status;
|
||
+ unsigned32 u32;
|
||
+#if !HAS_UNION_SEMUN
|
||
+ union semun {
|
||
+ int val;
|
||
+ struct semid_ds *buf;
|
||
+ unsigned short int *array;
|
||
+#if defined(__linux__)
|
||
+ struct seminfo *__buf;
|
||
+#endif
|
||
+ } ;
|
||
+#endif
|
||
+ union semun help;
|
||
+
|
||
+ /* do we need to worry about out of range addresses? */
|
||
+
|
||
+ DTRACE(sem, ("semaphore read addr=0x%x length=%d\n", addr, nr_bytes));
|
||
+
|
||
+ if (!(addr >= sem->physical_address && addr <= sem->physical_address + 11))
|
||
+ error("hw_sem_io_read_buffer() invalid address - out of range\n");
|
||
+
|
||
+ if ((addr % 4) != 0)
|
||
+ error("hw_sem_io_read_buffer() invalid address - alignment\n");
|
||
+
|
||
+ if (nr_bytes != 4)
|
||
+ error("hw_sem_io_read_buffer() invalid length\n");
|
||
+
|
||
+ switch ( (addr - sem->physical_address) / 4 ) {
|
||
+
|
||
+ case 0: /* OBTAIN CURRENT VALUE */
|
||
+ break;
|
||
+
|
||
+ case 1: /* LOCK */
|
||
+ sb.sem_num = 0;
|
||
+ sb.sem_op = -1;
|
||
+ sb.sem_flg = 0;
|
||
+
|
||
+ status = semop(sem->id, &sb, 1);
|
||
+ if (status == -1) {
|
||
+ perror( "hw_sem.c: lock" );
|
||
+ error("hw_sem_io_read_buffer() sem lock\n");
|
||
+ }
|
||
+
|
||
+ DTRACE(sem, ("semaphore lock %d\n", sem->count));
|
||
+ break;
|
||
+
|
||
+ case 2: /* UNLOCK */
|
||
+ sb.sem_num = 0;
|
||
+ sb.sem_op = 1;
|
||
+ sb.sem_flg = 0;
|
||
+
|
||
+ status = semop(sem->id, &sb, 1);
|
||
+ if (status == -1) {
|
||
+ perror( "hw_sem.c: unlock" );
|
||
+ error("hw_sem_io_read_buffer() sem unlock\n");
|
||
+ }
|
||
+ DTRACE(sem, ("semaphore unlock %d\n", sem->count));
|
||
+ break;
|
||
+
|
||
+ default:
|
||
+ error("hw_sem_io_read_buffer() invalid address - unknown error\n");
|
||
+ break;
|
||
+ }
|
||
+
|
||
+ /* assume target is big endian */
|
||
+ u32 = H2T_4(semctl( sem->id, 0, GETVAL, help ));
|
||
+
|
||
+ DTRACE(sem, ("semaphore OS value (%d)\n", u32) );
|
||
+ if (u32 == 0xffffffff) {
|
||
+ perror( "hw_sem.c: getval" );
|
||
+ error("hw_sem_io_read_buffer() semctl -- get value failed\n");
|
||
+ }
|
||
+
|
||
+ memcpy(dest, &u32, nr_bytes);
|
||
+ return nr_bytes;
|
||
+
|
||
+}
|
||
+
|
||
+static device_callbacks const hw_sem_callbacks = {
|
||
+ { generic_device_init_address, hw_sem_init_data },
|
||
+ { hw_sem_attach_address_callback, }, /* address */
|
||
+ { hw_sem_io_read_buffer, NULL }, /* IO */
|
||
+ { NULL, }, /* DMA */
|
||
+ { NULL, }, /* interrupt */
|
||
+ { NULL, }, /* unit */
|
||
+ NULL,
|
||
+};
|
||
+
|
||
+static void *
|
||
+hw_sem_create(const char *name,
|
||
+ const device_unit *unit_address,
|
||
+ const char *args)
|
||
+{
|
||
+ hw_sem_device *sem = ZALLOC(hw_sem_device);
|
||
+ return sem;
|
||
+}
|
||
+
|
||
+const device_descriptor hw_sem_device_descriptor[] = {
|
||
+ { "sem", hw_sem_create, &hw_sem_callbacks },
|
||
+ { NULL },
|
||
+};
|
||
+
|
||
+#endif /* _HW_SEM_C_ */
|
||
diff -Naur gdb-6.8.orig/sim/ppc/hw_shm.c gdb-6.8/sim/ppc/hw_shm.c
|
||
--- gdb-6.8.orig/sim/ppc/hw_shm.c 1970-01-01 01:00:00.000000000 +0100
|
||
+++ gdb-6.8/sim/ppc/hw_shm.c 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -0,0 +1,236 @@
|
||
+/* This file is part of the program psim.
|
||
+
|
||
+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com>
|
||
+
|
||
+ This program is free software; you can redistribute it and/or modify
|
||
+ it under the terms of the GNU General Public License as published by
|
||
+ the Free Software Foundation; either version 2 of the License, or
|
||
+ (at your option) any later version.
|
||
+
|
||
+ This program is distributed in the hope that it will be useful,
|
||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
+ GNU General Public License for more details.
|
||
+
|
||
+ You should have received a copy of the GNU General Public License
|
||
+ along with this program; if not, write to the Free Software
|
||
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||
+
|
||
+ */
|
||
+
|
||
+
|
||
+#ifndef _HW_SHM_C_
|
||
+#define _HW_SHM_C_
|
||
+
|
||
+#include "device_table.h"
|
||
+
|
||
+#ifdef HAVE_STRING_H
|
||
+#include <string.h>
|
||
+#else
|
||
+#ifdef HAVE_STRINGS_H
|
||
+#include <strings.h>
|
||
+#endif
|
||
+#endif
|
||
+
|
||
+#include <sys/ipc.h>
|
||
+#include <sys/shm.h>
|
||
+
|
||
+
|
||
+/* DEVICE
|
||
+
|
||
+
|
||
+ shm - map unix shared memory into psim address space
|
||
+
|
||
+
|
||
+ DESCRIPTION
|
||
+
|
||
+
|
||
+ This device implements an area of memory which is mapped into UNIX
|
||
+ shared memory.
|
||
+
|
||
+
|
||
+ PROPERTIES
|
||
+
|
||
+
|
||
+ reg = <address> <size> (required)
|
||
+
|
||
+ Determine where the memory lives in the parents address space.
|
||
+ The SHM area is assumed to be of the same length.
|
||
+
|
||
+ key = <integer> (required)
|
||
+
|
||
+ This is the key of the unix shared memory area.
|
||
+
|
||
+ EXAMPLES
|
||
+
|
||
+
|
||
+ Enable tracing of the shm:
|
||
+
|
||
+ | bash$ psim -t shm-device \
|
||
+
|
||
+
|
||
+ Configure a 512 kilobytes of UNIX shared memory with the key 0x12345678
|
||
+ mapped into psim address space at 0x0c000000.
|
||
+
|
||
+ | -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \
|
||
+ | -o '/shm@0x0c000000/key 0x12345678' \
|
||
+
|
||
+ sim/ppc/run -o '/#address-cells 1' \
|
||
+ -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \
|
||
+ -o '/shm@0x0c000000/key 0x12345678' ../psim-hello/hello
|
||
+
|
||
+ BUGS
|
||
+
|
||
+ None known.
|
||
+
|
||
+ */
|
||
+
|
||
+typedef struct _hw_shm_device {
|
||
+ unsigned_word physical_address;
|
||
+ char *shm_address;
|
||
+ unsigned sizeof_memory;
|
||
+ key_t key;
|
||
+ int id;
|
||
+} hw_shm_device;
|
||
+
|
||
+static void
|
||
+hw_shm_init_data(device *me)
|
||
+{
|
||
+ hw_shm_device *shm = (hw_shm_device*)device_data(me);
|
||
+ const device_unit *d;
|
||
+ reg_property_spec reg;
|
||
+ int i;
|
||
+
|
||
+ /* Obtain the Key Value */
|
||
+ if (device_find_property(me, "key") == NULL)
|
||
+ error("shm_init_data() required key property is missing\n");
|
||
+
|
||
+ shm->key = (key_t) device_find_integer_property(me, "key");
|
||
+ DTRACE(shm, ("shm key (0x%08x)\n", shm->key) );
|
||
+
|
||
+ /* Figure out where this memory is in address space and how long it is */
|
||
+ if ( !device_find_reg_array_property(me, "reg", 0, ®) )
|
||
+ error("hw_shm_init_data() no address registered\n");
|
||
+
|
||
+ /* Determine the address and length being as paranoid as possible */
|
||
+ shm->physical_address = 0xffffffff;
|
||
+ shm->sizeof_memory = 0xffffffff;
|
||
+
|
||
+ for ( i=0 ; i<reg.address.nr_cells; i++ ) {
|
||
+ if (reg.address.cells[0] == 0 && reg.size.cells[0] == 0)
|
||
+ continue;
|
||
+
|
||
+ if ( shm->physical_address != 0xffffffff )
|
||
+ device_error(me, "Only single celled address ranges supported\n");
|
||
+
|
||
+ shm->physical_address = reg.address.cells[i];
|
||
+ DTRACE(shm, ("shm physical_address=0x%x\n", shm->physical_address));
|
||
+
|
||
+ shm->sizeof_memory = reg.size.cells[i];
|
||
+ DTRACE(shm, ("shm length=0x%x\n", shm->sizeof_memory));
|
||
+ }
|
||
+
|
||
+ if ( shm->physical_address == 0xffffffff )
|
||
+ device_error(me, "Address not specified\n" );
|
||
+
|
||
+ if ( shm->sizeof_memory == 0xffffffff )
|
||
+ device_error(me, "Length not specified\n" );
|
||
+
|
||
+ /* Now actually attach to or create the shared memory area */
|
||
+ shm->id = shmget(shm->key, shm->sizeof_memory, IPC_CREAT | 0660);
|
||
+ if (shm->id == -1)
|
||
+ error("hw_shm_init_data() shmget failed\n");
|
||
+
|
||
+ shm->shm_address = shmat(shm->id, (char *)0, SHM_RND);
|
||
+ if (shm->shm_address == (void *)-1)
|
||
+ error("hw_shm_init_data() shmat failed\n");
|
||
+}
|
||
+
|
||
+static void
|
||
+hw_shm_attach_address_callback(device *me,
|
||
+ attach_type attach,
|
||
+ int space,
|
||
+ unsigned_word addr,
|
||
+ unsigned nr_bytes,
|
||
+ access_type access,
|
||
+ device *client) /*callback/default*/
|
||
+{
|
||
+ hw_shm_device *shm = (hw_shm_device*)device_data(me);
|
||
+
|
||
+ if (space != 0)
|
||
+ error("shm_attach_address_callback() invalid address space\n");
|
||
+
|
||
+ if (nr_bytes == 0)
|
||
+ error("shm_attach_address_callback() invalid size\n");
|
||
+}
|
||
+
|
||
+
|
||
+static unsigned
|
||
+hw_shm_io_read_buffer(device *me,
|
||
+ void *dest,
|
||
+ int space,
|
||
+ unsigned_word addr,
|
||
+ unsigned nr_bytes,
|
||
+ cpu *processor,
|
||
+ unsigned_word cia)
|
||
+{
|
||
+ hw_shm_device *shm = (hw_shm_device*)device_data(me);
|
||
+
|
||
+ /* do we need to worry about out of range addresses? */
|
||
+
|
||
+ DTRACE(shm, ("read %p %x %x %x\n", \
|
||
+ shm->shm_address, shm->physical_address, addr, nr_bytes) );
|
||
+
|
||
+ memcpy(dest, &shm->shm_address[addr - shm->physical_address], nr_bytes);
|
||
+ return nr_bytes;
|
||
+}
|
||
+
|
||
+
|
||
+static unsigned
|
||
+hw_shm_io_write_buffer(device *me,
|
||
+ const void *source,
|
||
+ int space,
|
||
+ unsigned_word addr,
|
||
+ unsigned nr_bytes,
|
||
+ cpu *processor,
|
||
+ unsigned_word cia)
|
||
+{
|
||
+ hw_shm_device *shm = (hw_shm_device*)device_data(me);
|
||
+
|
||
+ /* do we need to worry about out of range addresses? */
|
||
+
|
||
+ DTRACE(shm, ("write %p %x %x %x\n", \
|
||
+ shm->shm_address, shm->physical_address, addr, nr_bytes) );
|
||
+
|
||
+ memcpy(&shm->shm_address[addr - shm->physical_address], source, nr_bytes);
|
||
+ return nr_bytes;
|
||
+}
|
||
+
|
||
+static device_callbacks const hw_shm_callbacks = {
|
||
+ { generic_device_init_address, hw_shm_init_data },
|
||
+ { hw_shm_attach_address_callback, }, /* address */
|
||
+ { hw_shm_io_read_buffer,
|
||
+ hw_shm_io_write_buffer }, /* IO */
|
||
+ { NULL, }, /* DMA */
|
||
+ { NULL, }, /* interrupt */
|
||
+ { NULL, }, /* unit */
|
||
+ NULL,
|
||
+};
|
||
+
|
||
+static void *
|
||
+hw_shm_create(const char *name,
|
||
+ const device_unit *unit_address,
|
||
+ const char *args)
|
||
+{
|
||
+ hw_shm_device *shm = ZALLOC(hw_shm_device);
|
||
+ return shm;
|
||
+}
|
||
+
|
||
+
|
||
+
|
||
+const device_descriptor hw_shm_device_descriptor[] = {
|
||
+ { "shm", hw_shm_create, &hw_shm_callbacks },
|
||
+ { NULL },
|
||
+};
|
||
+
|
||
+#endif /* _HW_SHM_C_ */
|
||
diff -Naur gdb-6.8.orig/sim/ppc/Makefile.in gdb-6.8/sim/ppc/Makefile.in
|
||
--- gdb-6.8.orig/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200
|
||
+++ gdb-6.8/sim/ppc/Makefile.in 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -834,6 +834,8 @@
|
||
hw_pal.o: hw_pal.c $(DEVICE_TABLE_H) $(CPU_H)
|
||
hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) $(HW_PHB_H) $(COREFILE_H)
|
||
hw_register.o: hw_register.c $(DEVICE_TABLE_H) $(PSIM_H)
|
||
+hw_sem.o: hw_sem.c $(DEVICE_TABLE_H) $(PSIM_H)
|
||
+hw_shm.o: hw_shm.c $(DEVICE_TABLE_H) $(PSIM_H)
|
||
hw_trace.o: hw_trace.c $(DEVICE_TABLE_H)
|
||
hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H)
|
||
# ignore this line, it stops make from getting confused
|
||
diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8/sim/ppc/ppc-instructions
|
||
--- gdb-6.8.orig/sim/ppc/ppc-instructions 2006-11-29 16:20:55.000000000 +0100
|
||
+++ gdb-6.8/sim/ppc/ppc-instructions 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -3402,6 +3402,14 @@
|
||
case spr_dec:
|
||
*rT = cpu_get_decrementer(processor);
|
||
break;
|
||
+ case spr_tbrl:
|
||
+ if (is_64bit_implementation) *rT = TB;
|
||
+ else *rT = EXTRACTED64(TB, 32, 63);
|
||
+ break;
|
||
+ case spr_tbru:
|
||
+ if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31);
|
||
+ else *rT = EXTRACTED64(TB, 0, 31);
|
||
+ break;
|
||
case spr_tbu:
|
||
case spr_tbl:
|
||
/* NOTE - these SPR's are not readable. Use mftb[ul] */
|
||
diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8/sim/ppc/ppc-spr-table
|
||
--- gdb-6.8.orig/sim/ppc/ppc-spr-table 2003-06-22 18:48:12.000000000 +0200
|
||
+++ gdb-6.8/sim/ppc/ppc-spr-table 2009-09-23 18:00:02.000000000 +0200
|
||
@@ -32,6 +32,8 @@
|
||
SRR0:26:0:0
|
||
SRR1:27:0:0
|
||
VRSAVE:256:0:0
|
||
+TBRL:268:0:0
|
||
+TBRU:269:0:0
|
||
SPRG0:272:0:0
|
||
SPRG1:273:0:0
|
||
SPRG2:274:0:0
|