9403 lines
299 KiB
Diff
9403 lines
299 KiB
Diff
diff -Naur json-c-0.9.orig/arraylist.c json-c-0.9/arraylist.c
|
|
--- json-c-0.9.orig/arraylist.c 2009-07-31 10:10:16.000000000 +0800
|
|
+++ json-c-0.9/arraylist.c 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -23,6 +23,12 @@
|
|
#include "bits.h"
|
|
#include "arraylist.h"
|
|
|
|
+typedef int boolean;
|
|
+
|
|
+extern struct json_object* json_object_new_object(void);
|
|
+extern void json_object_object_add(struct json_object*, const char *, struct json_object *);
|
|
+extern struct json_object* json_object_new_boolean(boolean);
|
|
+
|
|
struct array_list*
|
|
array_list_new(array_list_free_fn *free_fn)
|
|
{
|
|
@@ -53,7 +59,7 @@
|
|
void*
|
|
array_list_get_idx(struct array_list *arr, int i)
|
|
{
|
|
- if(i >= arr->length) return NULL;
|
|
+ if(i >= arr->length || i < 0) return NULL;
|
|
return arr->array[i];
|
|
}
|
|
|
|
@@ -78,7 +84,11 @@
|
|
if(arr->array[idx]) arr->free_fn(arr->array[idx]);
|
|
arr->array[idx] = data;
|
|
if(arr->length <= idx) arr->length = idx + 1;
|
|
+#if 0 /* ZyXEL, john */
|
|
return 0;
|
|
+#else
|
|
+ return idx + 1;
|
|
+#endif
|
|
}
|
|
|
|
int
|
|
@@ -92,3 +102,23 @@
|
|
{
|
|
return arr->length;
|
|
}
|
|
+
|
|
+#if 1 /* zyxel, john */
|
|
+int array_list_delete_idx(struct array_list *arr, int idx)
|
|
+{
|
|
+ if(idx > arr->length) return -1;
|
|
+
|
|
+ if(arr->array[idx]) arr->free_fn(arr->array[idx]);
|
|
+
|
|
+ if((idx + 1) == arr->length) {
|
|
+ arr->array[idx] = NULL;
|
|
+ arr->length--;
|
|
+ }
|
|
+ else {
|
|
+ arr->array[idx] = json_object_new_object();
|
|
+ json_object_object_add(arr->array[idx], "emptyIns", json_object_new_boolean(1));
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
diff -Naur json-c-0.9.orig/arraylist.h json-c-0.9/arraylist.h
|
|
--- json-c-0.9.orig/arraylist.h 2009-02-25 10:26:37.000000000 +0800
|
|
+++ json-c-0.9/arraylist.h 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -46,6 +46,8 @@
|
|
extern int
|
|
array_list_length(struct array_list *al);
|
|
|
|
+extern int
|
|
+array_list_delete_idx(struct array_list *arr, int idx);
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
diff -Naur json-c-0.9.orig/config.h json-c-0.9/config.h
|
|
--- json-c-0.9.orig/config.h 1970-01-01 08:00:00.000000000 +0800
|
|
+++ json-c-0.9/config.h 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -0,0 +1,119 @@
|
|
+/* config.h. Generated from config.h.in by configure. */
|
|
+/* config.h.in. Generated from configure.in by autoheader. */
|
|
+
|
|
+/* Define to 1 if you have the <dlfcn.h> header file. */
|
|
+#define HAVE_DLFCN_H 1
|
|
+
|
|
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
|
|
+/* #undef HAVE_DOPRNT */
|
|
+
|
|
+/* Define to 1 if you have the <fcntl.h> header file. */
|
|
+#define HAVE_FCNTL_H 1
|
|
+
|
|
+/* Define to 1 if you have the <inttypes.h> header file. */
|
|
+#define HAVE_INTTYPES_H 1
|
|
+
|
|
+/* Define to 1 if you have the <limits.h> header file. */
|
|
+#define HAVE_LIMITS_H 1
|
|
+
|
|
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
|
|
+ to 0 otherwise. */
|
|
+#define HAVE_MALLOC 0
|
|
+
|
|
+/* Define to 1 if you have the <memory.h> header file. */
|
|
+#define HAVE_MEMORY_H 1
|
|
+
|
|
+/* Define to 1 if you have the `open' function. */
|
|
+#define HAVE_OPEN 1
|
|
+
|
|
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
|
|
+ and to 0 otherwise. */
|
|
+#define HAVE_REALLOC 0
|
|
+
|
|
+/* Define to 1 if you have the <stdarg.h> header file. */
|
|
+#define HAVE_STDARG_H 1
|
|
+
|
|
+/* Define to 1 if you have the <stdint.h> header file. */
|
|
+#define HAVE_STDINT_H 1
|
|
+
|
|
+/* Define to 1 if you have the <stdlib.h> header file. */
|
|
+#define HAVE_STDLIB_H 1
|
|
+
|
|
+/* Define to 1 if you have the `strerror' function. */
|
|
+#define HAVE_STRERROR 1
|
|
+
|
|
+/* Define to 1 if you have the <strings.h> header file. */
|
|
+#define HAVE_STRINGS_H 1
|
|
+
|
|
+/* Define to 1 if you have the <string.h> header file. */
|
|
+#define HAVE_STRING_H 1
|
|
+
|
|
+/* Define to 1 if you have the `strncasecmp' function. */
|
|
+#define HAVE_STRNCASECMP 1
|
|
+
|
|
+/* Define to 1 if you have the `strndup' function. */
|
|
+#define HAVE_STRNDUP 1
|
|
+
|
|
+/* Define to 1 if you have the <syslog.h> header file. */
|
|
+#define HAVE_SYSLOG_H 1
|
|
+
|
|
+/* Define to 1 if you have the <sys/param.h> header file. */
|
|
+#define HAVE_SYS_PARAM_H 1
|
|
+
|
|
+/* Define to 1 if you have the <sys/stat.h> header file. */
|
|
+#define HAVE_SYS_STAT_H 1
|
|
+
|
|
+/* Define to 1 if you have the <sys/types.h> header file. */
|
|
+#define HAVE_SYS_TYPES_H 1
|
|
+
|
|
+/* Define to 1 if you have the <unistd.h> header file. */
|
|
+#define HAVE_UNISTD_H 1
|
|
+
|
|
+/* Define to 1 if you have the `vasprintf' function. */
|
|
+#define HAVE_VASPRINTF 1
|
|
+
|
|
+/* Define to 1 if you have the `vprintf' function. */
|
|
+#define HAVE_VPRINTF 1
|
|
+
|
|
+/* Define to 1 if you have the `vsnprintf' function. */
|
|
+#define HAVE_VSNPRINTF 1
|
|
+
|
|
+/* Define to 1 if you have the `vsyslog' function. */
|
|
+#define HAVE_VSYSLOG 1
|
|
+
|
|
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
|
+ */
|
|
+#define LT_OBJDIR ".libs/"
|
|
+
|
|
+/* Name of package */
|
|
+#define PACKAGE "json-c"
|
|
+
|
|
+/* Define to the address where bug reports for this package should be sent. */
|
|
+#define PACKAGE_BUGREPORT "michael@metaparadigm.com"
|
|
+
|
|
+/* Define to the full name of this package. */
|
|
+#define PACKAGE_NAME "json-c"
|
|
+
|
|
+/* Define to the full name and version of this package. */
|
|
+#define PACKAGE_STRING "json-c 0.9"
|
|
+
|
|
+/* Define to the one symbol short name of this package. */
|
|
+#define PACKAGE_TARNAME "json-c"
|
|
+
|
|
+/* Define to the home page for this package. */
|
|
+#define PACKAGE_URL ""
|
|
+
|
|
+/* Define to the version of this package. */
|
|
+#define PACKAGE_VERSION "0.9"
|
|
+
|
|
+/* Define to 1 if you have the ANSI C header files. */
|
|
+#define STDC_HEADERS 1
|
|
+
|
|
+/* Version number of package */
|
|
+#define VERSION "0.9"
|
|
+
|
|
+/* Define to empty if `const' does not conform to ANSI C. */
|
|
+/* #undef const */
|
|
+
|
|
+/* Define to `unsigned int' if <sys/types.h> does not define. */
|
|
+/* #undef size_t */
|
|
diff -Naur json-c-0.9.orig/config.h.in json-c-0.9/config.h.in
|
|
--- json-c-0.9.orig/config.h.in 2009-07-08 11:57:27.000000000 +0800
|
|
+++ json-c-0.9/config.h.in 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -99,6 +99,9 @@
|
|
/* Define to the one symbol short name of this package. */
|
|
#undef PACKAGE_TARNAME
|
|
|
|
+/* Define to the home page for this package. */
|
|
+#undef PACKAGE_URL
|
|
+
|
|
/* Define to the version of this package. */
|
|
#undef PACKAGE_VERSION
|
|
|
|
@@ -111,11 +114,5 @@
|
|
/* Define to empty if `const' does not conform to ANSI C. */
|
|
#undef const
|
|
|
|
-/* Define to rpl_malloc if the replacement function should be used. */
|
|
-#undef malloc
|
|
-
|
|
-/* Define to rpl_realloc if the replacement function should be used. */
|
|
-#undef realloc
|
|
-
|
|
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
|
#undef size_t
|
|
diff -Naur json-c-0.9.orig/configure json-c-0.9/configure
|
|
--- json-c-0.9.orig/configure 2009-07-31 10:17:29.000000000 +0800
|
|
+++ json-c-0.9/configure 2013-03-07 10:15:34.000000000 +0800
|
|
@@ -1,20 +1,22 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.63 for json-c 0.9.
|
|
+# Generated by GNU Autoconf 2.64 for json-c 0.9.
|
|
#
|
|
# Report bugs to <michael@metaparadigm.com>.
|
|
#
|
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 more Bourne compatible
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+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
|
|
@@ -22,23 +24,15 @@
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
setopt NO_GLOB_SUBST
|
|
else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
+ case `(set -o) 2>/dev/null` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
esac
|
|
-
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-# PATH needs CR
|
|
-# Avoid depending upon Character Ranges.
|
|
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
-as_cr_digits='0123456789'
|
|
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
-
|
|
as_nl='
|
|
'
|
|
export as_nl
|
|
@@ -46,7 +40,13 @@
|
|
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
|
|
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+# 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
|
|
@@ -57,7 +57,7 @@
|
|
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
as_echo_n_body='eval
|
|
arg=$1;
|
|
- case $arg in
|
|
+ case $arg in #(
|
|
*"$as_nl"*)
|
|
expr "X$arg" : "X\\(.*\\)$as_nl";
|
|
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
|
@@ -80,13 +80,6 @@
|
|
}
|
|
fi
|
|
|
|
-# Support unset when possible.
|
|
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
- as_unset=unset
|
|
-else
|
|
- as_unset=false
|
|
-fi
|
|
-
|
|
|
|
# IFS
|
|
# We need space, tab and new line, in precisely that order. Quoting is
|
|
@@ -96,15 +89,15 @@
|
|
IFS=" "" $as_nl"
|
|
|
|
# Find who we are. Look in the path if we contain no directory separator.
|
|
-case $0 in
|
|
+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
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -116,12 +109,16 @@
|
|
fi
|
|
if test ! -f "$as_myself"; then
|
|
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
- { (exit 1); exit 1; }
|
|
+ exit 1
|
|
fi
|
|
|
|
-# Work around bugs in pre-3.0 UWIN ksh.
|
|
-for as_var in ENV MAIL MAILPATH
|
|
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+# 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='> '
|
|
@@ -133,330 +130,300 @@
|
|
LANGUAGE=C
|
|
export LANGUAGE
|
|
|
|
-# Required to use basename.
|
|
-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
|
|
- as_basename=basename
|
|
-else
|
|
- as_basename=false
|
|
-fi
|
|
-
|
|
-
|
|
-# Name of the executable.
|
|
-as_me=`$as_basename -- "$0" ||
|
|
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
- X"$0" : 'X\(//\)$' \| \
|
|
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-$as_echo X/"$0" |
|
|
- sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\/\)$/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- /^X\/\(\/\).*/{
|
|
- s//\1/
|
|
- q
|
|
- }
|
|
- s/.*/./; q'`
|
|
-
|
|
# CDPATH.
|
|
-$as_unset CDPATH
|
|
-
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
|
if test "x$CONFIG_SHELL" = x; then
|
|
- if (eval ":") 2>/dev/null; then
|
|
- as_have_required=yes
|
|
+ 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
|
|
- as_have_required=no
|
|
+ case \`(set -o) 2>/dev/null\` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
+esac
|
|
fi
|
|
-
|
|
- if test $as_have_required = yes && (eval ":
|
|
-(as_func_return () {
|
|
- (exit \$1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
+"
|
|
+ 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
|
|
-if as_func_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
-
|
|
-if as_func_ret_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
-fi
|
|
-
|
|
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
- :
|
|
+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
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
+ as_have_required=no
|
|
fi
|
|
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
|
|
|
|
-test \$exitcode = 0) || { (exit 1); exit 1; }
|
|
-
|
|
-(
|
|
- as_lineno_1=\$LINENO
|
|
- as_lineno_2=\$LINENO
|
|
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
|
|
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
|
|
-") 2> /dev/null; then
|
|
- :
|
|
else
|
|
- as_candidate_shells=
|
|
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+as_found=false
|
|
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- case $as_dir in
|
|
+ as_found=:
|
|
+ case $as_dir in #(
|
|
/*)
|
|
for as_base in sh bash ksh sh5; do
|
|
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
|
|
+ # 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
|
|
|
|
|
|
- for as_shell in $as_candidate_shells $SHELL; do
|
|
- # Try only shells that exist, to save several forks.
|
|
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
|
|
- { ("$as_shell") 2> /dev/null <<\_ASEOF
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
- emulate sh
|
|
- NULLCMD=:
|
|
- # 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
|
|
-
|
|
-
|
|
-:
|
|
-_ASEOF
|
|
-}; then
|
|
- CONFIG_SHELL=$as_shell
|
|
- as_have_required=yes
|
|
- if { "$as_shell" 2> /dev/null <<\_ASEOF
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
- emulate sh
|
|
- NULLCMD=:
|
|
- # 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_func_return () {
|
|
- (exit $1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
-
|
|
-exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
-
|
|
-if as_func_ret_success; then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
-fi
|
|
-
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
-fi
|
|
-
|
|
-if ( set x; as_func_ret_success y && test x = "$1" ); then
|
|
- :
|
|
-else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
-fi
|
|
-
|
|
-test $exitcode = 0) || { (exit 1); exit 1; }
|
|
-
|
|
-(
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
|
|
-
|
|
-_ASEOF
|
|
-}; then
|
|
- break
|
|
-fi
|
|
-
|
|
-fi
|
|
-
|
|
- done
|
|
-
|
|
- if test "x$CONFIG_SHELL" != x; then
|
|
- for as_var in BASH_ENV ENV
|
|
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
- done
|
|
+ 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 $as_have_required = no; then
|
|
- echo This script requires a shell more modern than all the
|
|
- echo shells that I found on your system. Please install a
|
|
- echo modern shell, or manually run the script under such a
|
|
- echo shell if you do have one.
|
|
- { (exit 1); exit 1; }
|
|
+ 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_echo "$0: Please tell bug-autoconf@gnu.org and
|
|
+$0: michael@metaparadigm.com about your system, including
|
|
+$0: any error possibly output before this message. Then
|
|
+$0: install a modern shell, or manually run the script
|
|
+$0: under such a shell if you do have one."
|
|
+ fi
|
|
+ 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"
|
|
|
|
|
|
-(eval "as_func_return () {
|
|
- (exit \$1)
|
|
-}
|
|
-as_func_success () {
|
|
- as_func_return 0
|
|
-}
|
|
-as_func_failure () {
|
|
- as_func_return 1
|
|
-}
|
|
-as_func_ret_success () {
|
|
- return 0
|
|
-}
|
|
-as_func_ret_failure () {
|
|
- return 1
|
|
-}
|
|
+} # 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
|
|
|
|
-exitcode=0
|
|
-if as_func_success; then
|
|
- :
|
|
+# 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
|
|
- exitcode=1
|
|
- echo as_func_success failed.
|
|
-fi
|
|
+ as_fn_arith ()
|
|
+ {
|
|
+ as_val=`expr "$@" || test $? -eq 1`
|
|
+ }
|
|
+fi # as_fn_arith
|
|
|
|
-if as_func_failure; then
|
|
- exitcode=1
|
|
- echo as_func_failure succeeded.
|
|
-fi
|
|
|
|
-if as_func_ret_success; 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
|
|
- exitcode=1
|
|
- echo as_func_ret_success failed.
|
|
+ as_expr=false
|
|
fi
|
|
|
|
-if as_func_ret_failure; then
|
|
- exitcode=1
|
|
- echo as_func_ret_failure succeeded.
|
|
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
|
|
+ as_basename=basename
|
|
+else
|
|
+ as_basename=false
|
|
fi
|
|
|
|
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
|
|
- :
|
|
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
+ as_dirname=dirname
|
|
else
|
|
- exitcode=1
|
|
- echo positional parameters were not saved.
|
|
+ as_dirname=false
|
|
fi
|
|
|
|
-test \$exitcode = 0") || {
|
|
- echo No shell found that supports shell functions.
|
|
- echo Please tell bug-autoconf@gnu.org about your system,
|
|
- echo including any error possibly output before this message.
|
|
- echo This can help us improve future autoconf versions.
|
|
- echo Configuration will now proceed without shell functions.
|
|
-}
|
|
+as_me=`$as_basename -- "$0" ||
|
|
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
+ X"$0" : 'X\(//\)$' \| \
|
|
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
|
|
+$as_echo X/"$0" |
|
|
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\/\)$/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ /^X\/\(\/\).*/{
|
|
+ s//\1/
|
|
+ q
|
|
+ }
|
|
+ s/.*/./; q'`
|
|
|
|
+# Avoid depending upon Character Ranges.
|
|
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
+as_cr_digits='0123456789'
|
|
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
|
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
-
|
|
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
- # uniformly replaced by the line number. The first 'sed' inserts a
|
|
- # line-number line after each line using $LINENO; the second 'sed'
|
|
- # does the real work. The second script uses 'N' to pair each
|
|
- # line-number line with the line containing $LINENO, and appends
|
|
- # trailing '-' during substitution so that $LINENO is not a special
|
|
- # case at line end.
|
|
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
+ 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/=
|
|
@@ -473,8 +440,7 @@
|
|
s/-\n.*//
|
|
' >$as_me.lineno &&
|
|
chmod +x "$as_me.lineno" ||
|
|
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ { $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
|
|
@@ -484,29 +450,18 @@
|
|
exit
|
|
}
|
|
|
|
-
|
|
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
- as_dirname=dirname
|
|
-else
|
|
- as_dirname=false
|
|
-fi
|
|
-
|
|
ECHO_C= ECHO_N= ECHO_T=
|
|
-case `echo -n x` in
|
|
+case `echo -n x` in #(((((
|
|
-n*)
|
|
- case `echo 'x\c'` in
|
|
+ case `echo 'xy\c'` in
|
|
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
- *) ECHO_C='\c';;
|
|
+ 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 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
|
|
rm -f conf$$ conf$$.exe conf$$.file
|
|
if test -d conf$$.dir; then
|
|
@@ -536,7 +491,7 @@
|
|
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
|
|
@@ -555,10 +510,10 @@
|
|
if test -d "$1"; then
|
|
test -d "$1/.";
|
|
else
|
|
- case $1 in
|
|
+ case $1 in #(
|
|
-*)set "./$1";;
|
|
esac;
|
|
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
???[sx]*):;;*)false;;esac;fi
|
|
'\'' sh
|
|
'
|
|
@@ -573,7 +528,6 @@
|
|
|
|
|
|
|
|
-
|
|
# Check that we are running under the correct shell.
|
|
SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
|
@@ -740,7 +694,6 @@
|
|
subdirs=
|
|
MFLAGS=
|
|
MAKEFLAGS=
|
|
-SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
|
# Identity of this package.
|
|
PACKAGE_NAME='json-c'
|
|
@@ -748,6 +701,7 @@
|
|
PACKAGE_VERSION='0.9'
|
|
PACKAGE_STRING='json-c 0.9'
|
|
PACKAGE_BUGREPORT='michael@metaparadigm.com'
|
|
+PACKAGE_URL=''
|
|
|
|
# Factoring default headers for most tests.
|
|
ac_includes_default="\
|
|
@@ -884,6 +838,7 @@
|
|
program_transform_name
|
|
prefix
|
|
exec_prefix
|
|
+PACKAGE_URL
|
|
PACKAGE_BUGREPORT
|
|
PACKAGE_STRING
|
|
PACKAGE_VERSION
|
|
@@ -1019,8 +974,7 @@
|
|
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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
|
|
@@ -1046,8 +1000,7 @@
|
|
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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
|
|
@@ -1251,8 +1204,7 @@
|
|
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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
|
|
@@ -1268,8 +1220,7 @@
|
|
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
|
|
# Reject names that are not valid shell variable names.
|
|
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
|
|
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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
|
|
@@ -1299,17 +1250,17 @@
|
|
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
|
|
x_libraries=$ac_optarg ;;
|
|
|
|
- -*) { $as_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 &&
|
|
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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 ;;
|
|
|
|
@@ -1326,15 +1277,13 @@
|
|
|
|
if test -n "$ac_prev"; then
|
|
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
|
|
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "missing argument to $ac_option"
|
|
fi
|
|
|
|
if test -n "$ac_unrecognized_opts"; then
|
|
case $enable_option_checking in
|
|
no) ;;
|
|
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
|
|
- { (exit 1); exit 1; }; } ;;
|
|
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
|
|
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
|
|
esac
|
|
fi
|
|
@@ -1357,8 +1306,7 @@
|
|
[\\/$]* | ?:[\\/]* ) continue;;
|
|
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
|
|
esac
|
|
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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'
|
|
@@ -1388,11 +1336,9 @@
|
|
ac_pwd=`pwd` && test -n "$ac_pwd" &&
|
|
ac_ls_di=`ls -di .` &&
|
|
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
|
|
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "working directory cannot be determined"
|
|
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
|
|
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "pwd does not report name of working directory"
|
|
|
|
|
|
# Find the source files, if location was not specified.
|
|
@@ -1431,13 +1377,11 @@
|
|
fi
|
|
if test ! -r "$srcdir/$ac_unique_file"; then
|
|
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
|
|
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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_echo "$as_me: error: $ac_msg" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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
|
|
@@ -1633,21 +1577,432 @@
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
json-c configure 0.9
|
|
-generated by GNU Autoconf 2.63
|
|
+generated by GNU Autoconf 2.64
|
|
|
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
-2002, 2003, 2004, 2005, 2006, 2007, 2008 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
|
|
fi
|
|
+
|
|
+## ------------------------ ##
|
|
+## Autoconf initialization. ##
|
|
+## ------------------------ ##
|
|
+
|
|
+# ac_fn_c_try_compile LINENO
|
|
+# --------------------------
|
|
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
|
|
+ac_fn_c_try_compile ()
|
|
+{
|
|
+ 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
|
|
+
|
|
+ ac_retval=1
|
|
+fi
|
|
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
|
+ return $ac_retval
|
|
+
|
|
+} # ac_fn_c_try_compile
|
|
+
|
|
+# 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
|
|
+
|
|
+} # ac_fn_c_try_cpp
|
|
+
|
|
+# 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_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; }
|
|
+
|
|
+# 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;}
|
|
+( cat <<\_ASBOX
|
|
+## --------------------------------------- ##
|
|
+## Report this to michael@metaparadigm.com ##
|
|
+## --------------------------------------- ##
|
|
+_ASBOX
|
|
+ ) | sed "s/^/$as_me: WARNING: /" >&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_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_check_type LINENO TYPE VAR INCLUDES
|
|
+# -------------------------------------------
|
|
+# Tests whether TYPE exists after having included INCLUDES, setting cache
|
|
+# variable VAR accordingly.
|
|
+ac_fn_c_check_type ()
|
|
+{
|
|
+ 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
|
|
+ eval "$3=no"
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if (sizeof ($2))
|
|
+ return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$4
|
|
+int
|
|
+main ()
|
|
+{
|
|
+if (sizeof (($2)))
|
|
+ return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
+
|
|
+else
|
|
+ eval "$3=yes"
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+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_type
|
|
+
|
|
+# 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 json-c $as_me 0.9, which was
|
|
-generated by GNU Autoconf 2.63. Invocation command line was
|
|
+generated by GNU Autoconf 2.64. Invocation command line was
|
|
|
|
$ $0 $@
|
|
|
|
@@ -1683,8 +2038,8 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- $as_echo "PATH: $as_dir"
|
|
-done
|
|
+ $as_echo "PATH: $as_dir"
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
} >&5
|
|
@@ -1721,9 +2076,9 @@
|
|
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
|
|
@@ -1739,13 +2094,13 @@
|
|
-* ) ac_must_keep_next=true ;;
|
|
esac
|
|
fi
|
|
- ac_configure_args="$ac_configure_args '$ac_arg'"
|
|
+ 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
|
|
@@ -1770,13 +2125,13 @@
|
|
case $ac_val in #(
|
|
*${as_nl}*)
|
|
case $ac_var in #(
|
|
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
|
|
+ *_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= ;; #(
|
|
- *) $as_unset $ac_var ;;
|
|
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
|
esac ;;
|
|
esac
|
|
done
|
|
@@ -1848,39 +2203,41 @@
|
|
exit $exit_status
|
|
' 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 -f -r conftest* confdefs.h
|
|
|
|
+$as_echo "/* confdefs.h */" > confdefs.h
|
|
+
|
|
# Predefined preprocessor variables.
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#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 an explicitly selected file to automatically selected ones.
|
|
@@ -1899,7 +2256,7 @@
|
|
do
|
|
test "x$ac_site_file" = xNONE && continue
|
|
if test -r "$ac_site_file"; then
|
|
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
|
|
+ { $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"
|
|
@@ -1910,7 +2267,7 @@
|
|
# Some versions of bash will fail to source /dev/null (special
|
|
# files actually), so we avoid doing that.
|
|
if test -f "$cache_file"; then
|
|
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
|
|
+ { $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";;
|
|
@@ -1918,7 +2275,7 @@
|
|
esac
|
|
fi
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
|
|
$as_echo "$as_me: creating cache $cache_file" >&6;}
|
|
>$cache_file
|
|
fi
|
|
@@ -1933,11 +2290,11 @@
|
|
eval ac_new_val=\$ac_env_${ac_var}_value
|
|
case $ac_old_set,$ac_new_set in
|
|
set,)
|
|
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
|
|
+ { $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)
|
|
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
|
|
+ { $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=: ;;
|
|
,);;
|
|
@@ -1947,17 +2304,17 @@
|
|
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:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
|
|
+ { $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:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
|
|
+ { $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:$LINENO: former value: \`$ac_old_val'" >&5
|
|
+ { $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:$LINENO: current value: \`$ac_new_val'" >&5
|
|
+ { $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
|
|
@@ -1969,43 +2326,20 @@
|
|
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
|
|
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+ { $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:$LINENO: error: changes in the environment can compromise the build" >&5
|
|
+ { $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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
|
|
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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'
|
|
@@ -2019,24 +2353,16 @@
|
|
|
|
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_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
|
|
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
|
|
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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,
|
|
@@ -2062,10 +2388,10 @@
|
|
# OS/2's system install, which has a completely different semantic
|
|
# ./install, which can be erroneously created by make from ./install.sh.
|
|
# Reject install programs that cannot install multiple files.
|
|
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_path_install+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
@@ -2073,11 +2399,11 @@
|
|
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.
|
|
@@ -2114,7 +2440,7 @@
|
|
;;
|
|
esac
|
|
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
rm -rf conftest.one conftest.two conftest.dir
|
|
@@ -2130,7 +2456,7 @@
|
|
INSTALL=$ac_install_sh
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
|
|
+{ $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}.
|
|
@@ -2141,7 +2467,7 @@
|
|
|
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
|
|
$as_echo_n "checking whether build environment is sane... " >&6; }
|
|
# Just in case
|
|
sleep 1
|
|
@@ -2165,11 +2491,8 @@
|
|
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
|
# broken ls alias from the environment. This has actually
|
|
# happened. Such a system could not be considered "sane".
|
|
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
|
|
-alias in your environment" >&5
|
|
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
|
|
-alias in your environment" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
|
|
+alias in your environment" "$LINENO" 5
|
|
fi
|
|
|
|
test "$2" = conftest.file
|
|
@@ -2178,13 +2501,10 @@
|
|
# Ok.
|
|
:
|
|
else
|
|
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
|
|
-Check your system clock" >&5
|
|
-$as_echo "$as_me: error: newly created file is older than distributed files!
|
|
-Check your system clock" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "newly created file is older than distributed files!
|
|
+Check your system clock" "$LINENO" 5
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
test "$program_prefix" != NONE &&
|
|
program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
|
@@ -2205,14 +2525,14 @@
|
|
am_missing_run="$MISSING --run "
|
|
else
|
|
am_missing_run=
|
|
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
|
|
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
|
fi
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
|
|
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
|
|
if test -z "$MKDIR_P"; then
|
|
- if test "${ac_cv_path_mkdir+set}" = set; then
|
|
+ if test "${ac_cv_path_mkdir+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
@@ -2220,7 +2540,7 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in mkdir gmkdir; do
|
|
+ for ac_prog in mkdir gmkdir; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
|
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
|
@@ -2232,7 +2552,7 @@
|
|
esac
|
|
done
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
fi
|
|
@@ -2248,7 +2568,7 @@
|
|
MKDIR_P="$ac_install_sh -d"
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
|
|
$as_echo "$MKDIR_P" >&6; }
|
|
|
|
mkdir_p="$MKDIR_P"
|
|
@@ -2261,9 +2581,9 @@
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_AWK+set}" = set; then
|
|
+if test "${ac_cv_prog_AWK+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AWK"; then
|
|
@@ -2274,24 +2594,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_AWK="$ac_prog"
|
|
- $as_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
|
|
AWK=$ac_cv_prog_AWK
|
|
if test -n "$AWK"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
|
|
$as_echo "$AWK" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2299,11 +2619,11 @@
|
|
test -n "$AWK" && break
|
|
done
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
|
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
|
|
set x ${MAKE-make}
|
|
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
|
|
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
cat >conftest.make <<\_ACEOF
|
|
@@ -2321,11 +2641,11 @@
|
|
rm -f conftest.make
|
|
fi
|
|
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
|
|
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
SET_MAKE=
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
SET_MAKE="MAKE=${MAKE-make}"
|
|
fi
|
|
@@ -2345,9 +2665,7 @@
|
|
am__isrc=' -I$(srcdir)'
|
|
# test to see if srcdir already configured
|
|
if test -f $srcdir/config.status; then
|
|
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
|
|
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
|
|
fi
|
|
fi
|
|
|
|
@@ -2401,9 +2719,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_STRIP+set}" = set; then
|
|
+if test "${ac_cv_prog_STRIP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$STRIP"; then
|
|
@@ -2414,24 +2732,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_STRIP="${ac_tool_prefix}strip"
|
|
- $as_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
|
|
STRIP=$ac_cv_prog_STRIP
|
|
if test -n "$STRIP"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
|
|
$as_echo "$STRIP" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2441,9 +2759,9 @@
|
|
ac_ct_STRIP=$STRIP
|
|
# Extract the first word of "strip", so it can be a program name with args.
|
|
set dummy strip; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_STRIP+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_STRIP"; then
|
|
@@ -2454,24 +2772,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_STRIP="strip"
|
|
- $as_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_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
if test -n "$ac_ct_STRIP"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
|
|
$as_echo "$ac_ct_STRIP" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2480,7 +2798,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -2525,7 +2843,7 @@
|
|
.PHONY: am__doit
|
|
END
|
|
# If we don't find an include directive, just comment out the code.
|
|
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
|
|
$as_echo_n "checking for style of include used by $am_make... " >&6; }
|
|
am__include="#"
|
|
am__quote=
|
|
@@ -2553,12 +2871,12 @@
|
|
fi
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
|
|
$as_echo "$_am_result" >&6; }
|
|
rm -f confinc confmf
|
|
|
|
# Check whether --enable-dependency-tracking was given.
|
|
-if test "${enable_dependency_tracking+set}" = set; then
|
|
+if test "${enable_dependency_tracking+set}" = set; then :
|
|
enableval=$enable_dependency_tracking;
|
|
fi
|
|
|
|
@@ -2583,9 +2901,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
@@ -2596,24 +2914,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
$as_echo "$CC" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2623,9 +2941,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
@@ -2636,24 +2954,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2662,7 +2980,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -2676,9 +2994,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
@@ -2689,24 +3007,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
$as_echo "$CC" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2716,9 +3034,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
@@ -2730,18 +3048,18 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
@@ -2760,10 +3078,10 @@
|
|
fi
|
|
CC=$ac_cv_prog_CC
|
|
if test -n "$CC"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
$as_echo "$CC" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2775,9 +3093,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_CC+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$CC"; then
|
|
@@ -2788,24 +3106,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
|
|
$as_echo "$CC" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2819,9 +3137,9 @@
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_CC"; then
|
|
@@ -2832,24 +3150,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
|
|
$as_echo "$ac_ct_CC" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -2862,7 +3180,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -2873,73 +3191,55 @@
|
|
fi
|
|
|
|
|
|
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&5
|
|
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+as_fn_error "no acceptable C compiler found in \$PATH
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
|
|
# Provide some information about the compiler.
|
|
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
|
|
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
|
|
set X $ac_compile
|
|
ac_compiler=$2
|
|
-{ (ac_try="$ac_compiler --version >&5"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compiler --version >&5") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -v >&5"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compiler -v >&5") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
-{ (ac_try="$ac_compiler -V >&5"
|
|
+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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compiler -V >&5") 2>&5
|
|
+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=$?
|
|
- $as_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. */
|
|
-
|
|
+#include <stdio.h>
|
|
int
|
|
main ()
|
|
{
|
|
+FILE *f = fopen ("conftest.out", "w");
|
|
+ return ferror (f) || fclose (f) != 0;
|
|
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
ac_clean_files_save=$ac_clean_files
|
|
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
|
|
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.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.
|
|
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
|
+{ $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; }
|
|
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
|
|
|
@@ -2956,17 +3256,17 @@
|
|
done
|
|
rm -f $ac_rmfiles
|
|
|
|
-if { (ac_try="$ac_link_default"
|
|
+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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
+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:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $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,
|
|
@@ -2983,7 +3283,7 @@
|
|
# certainly right.
|
|
break;;
|
|
*.* )
|
|
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
|
then :; else
|
|
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
|
fi
|
|
@@ -3002,84 +3302,75 @@
|
|
else
|
|
ac_file=''
|
|
fi
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
|
|
$as_echo "$ac_file" >&6; }
|
|
-if test -z "$ac_file"; then
|
|
+if test -z "$ac_file"; then :
|
|
$as_echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+{ { $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:$LINENO: error: C compiler cannot create executables
|
|
-See \`config.log' for more details." >&5
|
|
-$as_echo "$as_me: error: C compiler cannot create executables
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 77); exit 77; }; }; }
|
|
+{ as_fn_set_status 77
|
|
+as_fn_error "C compiler cannot create executables
|
|
+See \`config.log' for more details." "$LINENO" 5; }; }
|
|
fi
|
|
-
|
|
ac_exeext=$ac_cv_exeext
|
|
|
|
# Check that the compiler produces executables we can run. If not, either
|
|
# the compiler is broken, or we cross compile.
|
|
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
|
|
$as_echo_n "checking whether the C compiler works... " >&6; }
|
|
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
|
# If not cross compiling, check that we can run a simple program.
|
|
if test "$cross_compiling" != yes; then
|
|
if { ac_try='./$ac_file'
|
|
- { (case "(($ac_try" in
|
|
+ { { case "(($ac_try" in
|
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
*) ac_try_echo=$ac_try;;
|
|
esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
+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:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
+ $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:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+ { { $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:$LINENO: error: cannot run C compiled programs.
|
|
-If you meant to cross compile, use \`--host'.
|
|
-See \`config.log' for more details." >&5
|
|
-$as_echo "$as_me: error: cannot run C compiled programs.
|
|
+as_fn_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; }; }; }
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
fi
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
|
|
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
|
|
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
|
|
ac_clean_files=$ac_clean_files_save
|
|
# Check that the compiler produces executables we can run. If not, either
|
|
# the compiler is broken, or we cross compile.
|
|
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
|
|
$as_echo_n "checking whether we are cross compiling... " >&6; }
|
|
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
|
|
$as_echo "$cross_compiling" >&6; }
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&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"
|
|
+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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
+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:$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
|
|
@@ -3094,32 +3385,24 @@
|
|
esac
|
|
done
|
|
else
|
|
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+ { { $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:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
|
-See \`config.log' for more details." >&5
|
|
-$as_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_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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
|
+{ $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
|
|
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_objext+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
|
|
@@ -3131,17 +3414,17 @@
|
|
}
|
|
_ACEOF
|
|
rm -f conftest.o conftest.obj
|
|
-if { (ac_try="$ac_compile"
|
|
+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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
+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:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; then
|
|
+ $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
|
|
@@ -3154,31 +3437,23 @@
|
|
$as_echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+{ { $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:$LINENO: error: cannot compute suffix of object files: cannot compile
|
|
-See \`config.log' for more details." >&5
|
|
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
|
+{ $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
|
|
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
|
+{ $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
|
|
+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
|
|
@@ -3192,37 +3467,16 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_compiler_gnu=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_compiler_gnu=no
|
|
+ ac_compiler_gnu=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
|
+{ $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
|
|
@@ -3231,20 +3485,16 @@
|
|
fi
|
|
ac_test_CFLAGS=${CFLAGS+set}
|
|
ac_save_CFLAGS=$CFLAGS
|
|
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
|
+{ $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
|
|
+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 >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
|
|
@@ -3255,35 +3505,11 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- CFLAGS=""
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ CFLAGS=""
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3294,36 +3520,12 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- :
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
|
|
- ac_c_werror_flag=$ac_save_c_werror_flag
|
|
+else
|
|
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
|
CFLAGS="-g"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
int
|
|
@@ -3334,42 +3536,17 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_g=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-
|
|
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:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
|
+{ $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
|
|
@@ -3386,18 +3563,14 @@
|
|
CFLAGS=
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
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>
|
|
@@ -3454,32 +3627,9 @@
|
|
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
|
do
|
|
CC="$ac_save_CC $ac_arg"
|
|
- rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+ if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_prog_cc_c89=$ac_arg
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext
|
|
test "x$ac_cv_prog_cc_c89" != "xno" && break
|
|
done
|
|
@@ -3490,17 +3640,19 @@
|
|
# AC_CACHE_VAL
|
|
case "x$ac_cv_prog_cc_c89" in
|
|
x)
|
|
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
|
|
$as_echo "none needed" >&6; } ;;
|
|
xno)
|
|
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
|
|
$as_echo "unsupported" >&6; } ;;
|
|
*)
|
|
CC="$CC $ac_cv_prog_cc_c89"
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
|
|
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
|
|
esac
|
|
+if test "x$ac_cv_prog_cc_c89" != xno; then :
|
|
|
|
+fi
|
|
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -3510,9 +3662,9 @@
|
|
|
|
depcc="$CC" am_compiler_list=
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
|
$as_echo_n "checking dependency style of $depcc... " >&6; }
|
|
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
|
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
|
@@ -3601,7 +3753,7 @@
|
|
fi
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
|
|
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
|
|
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
|
|
|
|
@@ -3622,14 +3774,14 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
|
|
+{ $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
|
|
+ if test "${ac_cv_prog_CPP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
# Double quotes because CPP needs to be expanded
|
|
@@ -3644,11 +3796,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>
|
|
@@ -3657,78 +3805,34 @@
|
|
#endif
|
|
Syntax error
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- :
|
|
-else
|
|
- $as_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 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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
# Broken: success on invalid input.
|
|
continue
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
# Passes both tests.
|
|
ac_preproc_ok=:
|
|
break
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
|
|
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
|
|
|
|
@@ -3740,7 +3844,7 @@
|
|
else
|
|
ac_cv_prog_CPP=$CPP
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
|
|
+{ $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
|
|
@@ -3751,11 +3855,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>
|
|
@@ -3764,87 +3864,40 @@
|
|
#endif
|
|
Syntax error
|
|
_ACEOF
|
|
-if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- :
|
|
-else
|
|
- $as_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 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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
+if ac_fn_c_try_cpp "$LINENO"; then :
|
|
# Broken: success on invalid input.
|
|
continue
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
# Passes both tests.
|
|
ac_preproc_ok=:
|
|
break
|
|
fi
|
|
-
|
|
rm -f conftest.err conftest.$ac_ext
|
|
|
|
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
|
|
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
+ { { $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:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
|
-See \`config.log' for more details." >&5
|
|
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
|
-See \`config.log' for more details." >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
|
|
+See \`config.log' for more details." "$LINENO" 5; }
|
|
fi
|
|
|
|
ac_ext=c
|
|
@@ -3854,9 +3907,9 @@
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_path_GREP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$GREP"; then
|
|
@@ -3867,7 +3920,7 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in grep ggrep; do
|
|
+ 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
|
|
@@ -3887,7 +3940,7 @@
|
|
$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
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ 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"
|
|
@@ -3902,26 +3955,24 @@
|
|
$ac_path_GREP_found && break 3
|
|
done
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
if test -z "$ac_cv_path_GREP"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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:$LINENO: result: $ac_cv_path_GREP" >&5
|
|
+{ $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:$LINENO: checking for egrep" >&5
|
|
+{ $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
|
|
+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
|
|
@@ -3935,7 +3986,7 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in egrep; do
|
|
+ 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
|
|
@@ -3955,7 +4006,7 @@
|
|
$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
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ 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"
|
|
@@ -3970,12 +4021,10 @@
|
|
$ac_path_EGREP_found && break 3
|
|
done
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
if test -z "$ac_cv_path_EGREP"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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
|
|
@@ -3983,21 +4032,17 @@
|
|
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
|
|
+{ $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"
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
|
|
+{ $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
|
|
+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>
|
|
@@ -4012,48 +4057,23 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_header_stdc=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_header_stdc=no
|
|
+ ac_cv_header_stdc=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
|
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
|
|
@@ -4063,18 +4083,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
|
|
@@ -4084,14 +4100,10 @@
|
|
|
|
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>
|
|
@@ -4118,296 +4130,65 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_try") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- :
|
|
-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
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
|
|
-( exit $ac_status )
|
|
-ac_cv_header_stdc=no
|
|
+else
|
|
+ ac_cv_header_stdc=no
|
|
fi
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core *.core core.conftest.* 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
|
|
+{ $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=`$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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+_ACEOF
|
|
|
|
+fi
|
|
|
|
+done
|
|
|
|
|
|
+for ac_header in fcntl.h limits.h strings.h syslog.h unistd.h sys/param.h stdarg.h
|
|
+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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+_ACEOF
|
|
|
|
+fi
|
|
|
|
+done
|
|
|
|
|
|
-
|
|
-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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
+# Checks for typedefs, structures, and compiler characteristics.
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
|
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
|
+if test "${ac_cv_c_const+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
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- eval "$as_ac_Header=yes"
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_Header=no"
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-as_val=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-for ac_header in fcntl.h limits.h strings.h syslog.h unistd.h sys/param.h stdarg.h
|
|
-do
|
|
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-$as_echo_n "checking $ac_header usability... " >&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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-$as_echo "$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-$as_echo_n "checking $ac_header presence... " >&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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- $as_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
|
|
-{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## --------------------------------------- ##
|
|
-## Report this to michael@metaparadigm.com ##
|
|
-## --------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-as_val=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
-
|
|
-# Checks for typedefs, structures, and compiler characteristics.
|
|
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
|
|
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
|
-if test "${ac_cv_c_const+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
|
|
@@ -4467,140 +4248,24 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
+if ac_fn_c_try_compile "$LINENO"; then :
|
|
ac_cv_c_const=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_c_const=no
|
|
+ ac_cv_c_const=no
|
|
fi
|
|
-
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
|
|
$as_echo "$ac_cv_c_const" >&6; }
|
|
if test $ac_cv_c_const = no; then
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define const /**/
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
|
|
-$as_echo_n "checking for size_t... " >&6; }
|
|
-if test "${ac_cv_type_size_t+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- ac_cv_type_size_t=no
|
|
-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
|
|
-int
|
|
-main ()
|
|
-{
|
|
-if (sizeof (size_t))
|
|
- return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- 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
|
|
-int
|
|
-main ()
|
|
-{
|
|
-if (sizeof ((size_t)))
|
|
- return 0;
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- :
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+$as_echo "#define const /**/" >>confdefs.h
|
|
|
|
- ac_cv_type_size_t=yes
|
|
fi
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
|
|
+if test "x$ac_cv_type_size_t" = x""yes; then :
|
|
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
|
|
-$as_echo "$ac_cv_type_size_t" >&6; }
|
|
-if test "x$ac_cv_type_size_t" = x""yes; then
|
|
- :
|
|
else
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -4611,882 +4276,227 @@
|
|
|
|
|
|
# Checks for library functions.
|
|
-
|
|
for ac_func in vprintf
|
|
-do
|
|
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-$as_echo_n "checking for $ac_func... " >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
+do :
|
|
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
|
|
+if test "x$ac_cv_func_vprintf" = x""yes; then :
|
|
+ cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_VPRINTF 1
|
|
_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. */
|
|
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
|
|
+if test "x$ac_cv_func__doprnt" = x""yes; then :
|
|
|
|
-#ifdef __STDC__
|
|
-# include <limits.h>
|
|
-#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
|
|
|
|
-#undef $ac_func
|
|
+fi
|
|
|
|
-/* 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 $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
|
|
-#endif
|
|
+fi
|
|
+done
|
|
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
|
|
+$as_echo_n "checking for working memcmp... " >&6; }
|
|
+if test "${ac_cv_func_memcmp_working+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ ac_cv_func_memcmp_working=no
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$ac_includes_default
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+
|
|
+ /* Some versions of memcmp are not 8-bit clean. */
|
|
+ char c0 = '\100', c1 = '\200', c2 = '\201';
|
|
+ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
|
|
+ return 1;
|
|
+
|
|
+ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
|
|
+ or more and with at least one buffer not starting on a 4-byte boundary.
|
|
+ William Lewis provided this test program. */
|
|
+ {
|
|
+ char foo[21];
|
|
+ char bar[21];
|
|
+ int i;
|
|
+ for (i = 0; i < 4; i++)
|
|
+ {
|
|
+ char *a = foo + i;
|
|
+ char *b = bar + i;
|
|
+ strcpy (a, "--------01111111");
|
|
+ strcpy (b, "--------10000000");
|
|
+ if (memcmp (a, b, 16) >= 0)
|
|
+ return 1;
|
|
+ }
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+ ac_cv_func_memcmp_working=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_var=no"
|
|
-fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_var'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-as_val=`eval 'as_val=${'$as_ac_var'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
|
|
-$as_echo_n "checking for _doprnt... " >&6; }
|
|
-if test "${ac_cv_func__doprnt+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
|
|
-/* end confdefs.h. */
|
|
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define _doprnt innocuous__doprnt
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char _doprnt (); 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 _doprnt
|
|
-
|
|
-/* 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 _doprnt ();
|
|
-/* 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__doprnt || defined __stub____doprnt
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return _doprnt ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
- ac_cv_func__doprnt=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func__doprnt=no
|
|
-fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
|
|
-$as_echo "$ac_cv_func__doprnt" >&6; }
|
|
-if test "x$ac_cv_func__doprnt" = x""yes; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_DOPRNT 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-fi
|
|
-done
|
|
-
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
|
|
-$as_echo_n "checking for working memcmp... " >&6; }
|
|
-if test "${ac_cv_func_memcmp_working+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- if test "$cross_compiling" = yes; then
|
|
ac_cv_func_memcmp_working=no
|
|
-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
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
- /* Some versions of memcmp are not 8-bit clean. */
|
|
- char c0 = '\100', c1 = '\200', c2 = '\201';
|
|
- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
|
|
- return 1;
|
|
-
|
|
- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
|
|
- or more and with at least one buffer not starting on a 4-byte boundary.
|
|
- William Lewis provided this test program. */
|
|
- {
|
|
- char foo[21];
|
|
- char bar[21];
|
|
- int i;
|
|
- for (i = 0; i < 4; i++)
|
|
- {
|
|
- char *a = foo + i;
|
|
- char *b = bar + i;
|
|
- strcpy (a, "--------01111111");
|
|
- strcpy (b, "--------10000000");
|
|
- if (memcmp (a, b, 16) >= 0)
|
|
- return 1;
|
|
- }
|
|
- return 0;
|
|
- }
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_try") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- ac_cv_func_memcmp_working=yes
|
|
-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
|
|
-
|
|
-( exit $ac_status )
|
|
-ac_cv_func_memcmp_working=no
|
|
-fi
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-
|
|
-
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
|
|
-$as_echo "$ac_cv_func_memcmp_working" >&6; }
|
|
-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
|
|
- *" memcmp.$ac_objext "* ) ;;
|
|
- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
|
|
- ;;
|
|
-esac
|
|
-
|
|
-
|
|
-
|
|
-for ac_header in stdlib.h
|
|
-do
|
|
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-$as_echo_n "checking $ac_header usability... " >&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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-$as_echo "$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-$as_echo_n "checking $ac_header presence... " >&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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- $as_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
|
|
-{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## --------------------------------------- ##
|
|
-## Report this to michael@metaparadigm.com ##
|
|
-## --------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-
|
|
-fi
|
|
-as_val=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
- cat >>confdefs.h <<_ACEOF
|
|
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-done
|
|
-
|
|
-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
|
|
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
|
|
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- if test "$cross_compiling" = yes; then
|
|
- ac_cv_func_malloc_0_nonnull=no
|
|
-else
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
-/* confdefs.h. */
|
|
-_ACEOF
|
|
-cat confdefs.h >>conftest.$ac_ext
|
|
-cat >>conftest.$ac_ext <<_ACEOF
|
|
-/* end confdefs.h. */
|
|
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
|
|
-# include <stdlib.h>
|
|
-#else
|
|
-char *malloc ();
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return ! malloc (0);
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_try") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- ac_cv_func_malloc_0_nonnull=yes
|
|
-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
|
|
-
|
|
-( exit $ac_status )
|
|
-ac_cv_func_malloc_0_nonnull=no
|
|
-fi
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-
|
|
-
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
|
|
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
|
|
-if test $ac_cv_func_malloc_0_nonnull = yes; then
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_MALLOC 1
|
|
-_ACEOF
|
|
-
|
|
-else
|
|
- cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_MALLOC 0
|
|
-_ACEOF
|
|
-
|
|
- case " $LIBOBJS " in
|
|
- *" malloc.$ac_objext "* ) ;;
|
|
- *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
|
|
- ;;
|
|
-esac
|
|
-
|
|
-
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define malloc rpl_malloc
|
|
-_ACEOF
|
|
-
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-for ac_header in stdlib.h
|
|
-do
|
|
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-else
|
|
- # Is the header compilable?
|
|
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
|
|
-$as_echo_n "checking $ac_header usability... " >&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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- ac_header_compiler=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_header_compiler=no
|
|
-fi
|
|
-
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
-$as_echo "$ac_header_compiler" >&6; }
|
|
-
|
|
-# Is the header present?
|
|
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
|
|
-$as_echo_n "checking $ac_header presence... " >&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 { (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:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&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
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } >/dev/null && {
|
|
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- }; then
|
|
- ac_header_preproc=yes
|
|
-else
|
|
- $as_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
|
|
-{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
|
|
- ac_header_preproc=yes
|
|
- ;;
|
|
- no:yes:* )
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
|
|
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
|
|
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
|
- ( cat <<\_ASBOX
|
|
-## --------------------------------------- ##
|
|
-## Report this to michael@metaparadigm.com ##
|
|
-## --------------------------------------- ##
|
|
-_ASBOX
|
|
- ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
- ;;
|
|
-esac
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
- $as_echo_n "(cached) " >&6
|
|
-else
|
|
- eval "$as_ac_Header=\$ac_header_preproc"
|
|
fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
+fi
|
|
|
|
fi
|
|
-as_val=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
|
|
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
|
|
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
|
|
+ *" memcmp.$ac_objext "* ) ;;
|
|
+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+
|
|
+for ac_header in stdlib.h
|
|
+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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+#define HAVE_STDLIB_H 1
|
|
_ACEOF
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
|
|
-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
|
|
-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
|
|
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
|
|
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
- if test "$cross_compiling" = yes; then
|
|
- ac_cv_func_realloc_0_nonnull=no
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ ac_cv_func_malloc_0_nonnull=no
|
|
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. */
|
|
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
|
|
# include <stdlib.h>
|
|
#else
|
|
-char *realloc ();
|
|
+char *malloc ();
|
|
#endif
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return ! realloc (0, 0);
|
|
+return ! malloc (0);
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
|
- { (case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_try") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }; }; then
|
|
- ac_cv_func_realloc_0_nonnull=yes
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+ ac_cv_func_malloc_0_nonnull=yes
|
|
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
|
|
-
|
|
-( exit $ac_status )
|
|
-ac_cv_func_realloc_0_nonnull=no
|
|
+ ac_cv_func_malloc_0_nonnull=no
|
|
fi
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core *.core core.conftest.* 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
|
|
-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
|
|
-if test $ac_cv_func_realloc_0_nonnull = yes; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
|
|
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
|
|
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_REALLOC 1
|
|
-_ACEOF
|
|
+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
|
|
|
|
else
|
|
- cat >>confdefs.h <<\_ACEOF
|
|
-#define HAVE_REALLOC 0
|
|
-_ACEOF
|
|
+ $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
|
|
|
|
case " $LIBOBJS " in
|
|
- *" realloc.$ac_objext "* ) ;;
|
|
- *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
|
|
+ *" malloc.$ac_objext "* ) ;;
|
|
+ *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
|
|
;;
|
|
esac
|
|
|
|
|
|
-cat >>confdefs.h <<\_ACEOF
|
|
-#define realloc rpl_realloc
|
|
-_ACEOF
|
|
+$as_echo "#define malloc rpl_malloc" >>confdefs.h
|
|
|
|
fi
|
|
|
|
|
|
+for ac_header in stdlib.h
|
|
+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 HAVE_STDLIB_H 1
|
|
+_ACEOF
|
|
|
|
+fi
|
|
|
|
+done
|
|
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-for ac_func in strndup strerror vsnprintf vasprintf open vsyslog strncasecmp
|
|
-do
|
|
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
-$as_echo_n "checking for $ac_func... " >&6; }
|
|
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
|
|
+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
|
|
+if test "${ac_cv_func_realloc_0_nonnull+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
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ ac_cv_func_realloc_0_nonnull=no
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* 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>
|
|
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
|
|
+# include <stdlib.h>
|
|
#else
|
|
-# include <assert.h>
|
|
-#endif
|
|
-
|
|
-#undef $ac_func
|
|
-
|
|
-/* Override any GCC internal prototype to avoid an error.
|
|
- Use char because int might match the return type of a GCC
|
|
- builtin and then its argument prototype would still apply. */
|
|
-#ifdef __cplusplus
|
|
-extern "C"
|
|
-#endif
|
|
-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
|
|
+char *realloc ();
|
|
#endif
|
|
|
|
int
|
|
main ()
|
|
{
|
|
-return $ac_func ();
|
|
+return ! realloc (0, 0);
|
|
;
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
- eval "$as_ac_var=yes"
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+ ac_cv_func_realloc_0_nonnull=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
+ ac_cv_func_realloc_0_nonnull=no
|
|
+fi
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
+fi
|
|
|
|
- eval "$as_ac_var=no"
|
|
fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
|
|
+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
|
|
+if test $ac_cv_func_realloc_0_nonnull = yes; then :
|
|
+
|
|
+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
|
|
+
|
|
+else
|
|
+ $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
|
|
+
|
|
+ case " $LIBOBJS " in
|
|
+ *" realloc.$ac_objext "* ) ;;
|
|
+ *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+
|
|
+$as_echo "#define realloc rpl_realloc" >>confdefs.h
|
|
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_var'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-as_val=`eval 'as_val=${'$as_ac_var'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
+
|
|
+
|
|
+for ac_func in strndup strerror vsnprintf vasprintf open vsyslog strncasecmp
|
|
+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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
|
_ACEOF
|
|
@@ -5497,7 +4507,7 @@
|
|
|
|
case `pwd` in
|
|
*\ * | *\ *)
|
|
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
|
|
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
|
|
esac
|
|
|
|
@@ -5522,35 +4532,27 @@
|
|
|
|
# Make sure we can run config.sub.
|
|
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
|
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
|
|
+{ $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
|
|
+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_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
|
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
|
|
$as_echo "$ac_cv_build" >&6; }
|
|
case $ac_cv_build in
|
|
*-*-*) ;;
|
|
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
|
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
|
|
esac
|
|
build=$ac_cv_build
|
|
ac_save_IFS=$IFS; IFS='-'
|
|
@@ -5566,28 +4568,24 @@
|
|
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
|
|
+{ $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
|
|
+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_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
|
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
|
|
fi
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
|
|
$as_echo "$ac_cv_host" >&6; }
|
|
case $ac_cv_host in
|
|
*-*-*) ;;
|
|
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
|
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
|
|
esac
|
|
host=$ac_cv_host
|
|
ac_save_IFS=$IFS; IFS='-'
|
|
@@ -5603,9 +4601,9 @@
|
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
|
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
|
-if test "${ac_cv_path_SED+set}" = set; then
|
|
+if test "${ac_cv_path_SED+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
|
@@ -5613,7 +4611,7 @@
|
|
ac_script="$ac_script$as_nl$ac_script"
|
|
done
|
|
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
|
|
- $as_unset ac_script || ac_script=
|
|
+ { ac_script=; unset ac_script;}
|
|
if test -z "$SED"; then
|
|
ac_path_SED_found=false
|
|
# Loop through the user's path and test for each of PROGNAME-LIST
|
|
@@ -5622,7 +4620,7 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in sed gsed; do
|
|
+ for ac_prog in sed gsed; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
|
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
|
@@ -5642,7 +4640,7 @@
|
|
$as_echo '' >> "conftest.nl"
|
|
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_SED="$ac_path_SED"
|
|
@@ -5657,19 +4655,17 @@
|
|
$ac_path_SED_found && break 3
|
|
done
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
if test -z "$ac_cv_path_SED"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
|
|
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
|
|
fi
|
|
else
|
|
ac_cv_path_SED=$SED
|
|
fi
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
|
|
$as_echo "$ac_cv_path_SED" >&6; }
|
|
SED="$ac_cv_path_SED"
|
|
rm -f conftest.sed
|
|
@@ -5687,9 +4683,9 @@
|
|
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
|
|
$as_echo_n "checking for fgrep... " >&6; }
|
|
-if test "${ac_cv_path_FGREP+set}" = set; then
|
|
+if test "${ac_cv_path_FGREP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
|
|
@@ -5703,7 +4699,7 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_prog in fgrep; do
|
|
+ for ac_prog in fgrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
|
|
@@ -5723,7 +4719,7 @@
|
|
$as_echo 'FGREP' >> "conftest.nl"
|
|
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
- ac_count=`expr $ac_count + 1`
|
|
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_FGREP="$ac_path_FGREP"
|
|
@@ -5738,12 +4734,10 @@
|
|
$ac_path_FGREP_found && break 3
|
|
done
|
|
done
|
|
-done
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
if test -z "$ac_cv_path_FGREP"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
|
|
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
fi
|
|
else
|
|
ac_cv_path_FGREP=$FGREP
|
|
@@ -5751,7 +4745,7 @@
|
|
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
|
|
$as_echo "$ac_cv_path_FGREP" >&6; }
|
|
FGREP="$ac_cv_path_FGREP"
|
|
|
|
@@ -5777,7 +4771,7 @@
|
|
|
|
|
|
# Check whether --with-gnu-ld was given.
|
|
-if test "${with_gnu_ld+set}" = set; then
|
|
+if test "${with_gnu_ld+set}" = set; then :
|
|
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
|
|
else
|
|
with_gnu_ld=no
|
|
@@ -5786,7 +4780,7 @@
|
|
ac_prog=ld
|
|
if test "$GCC" = yes; then
|
|
# Check if gcc -print-prog-name=ld gives a path.
|
|
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
|
|
$as_echo_n "checking for ld used by $CC... " >&6; }
|
|
case $host in
|
|
*-*-mingw*)
|
|
@@ -5816,13 +4810,13 @@
|
|
;;
|
|
esac
|
|
elif test "$with_gnu_ld" = yes; then
|
|
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
|
|
$as_echo_n "checking for GNU ld... " >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
|
|
$as_echo_n "checking for non-GNU ld... " >&6; }
|
|
fi
|
|
-if test "${lt_cv_path_LD+set}" = set; then
|
|
+if test "${lt_cv_path_LD+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$LD"; then
|
|
@@ -5853,18 +4847,16 @@
|
|
|
|
LD="$lt_cv_path_LD"
|
|
if test -n "$LD"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
|
|
$as_echo "$LD" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
|
|
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
|
|
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
|
|
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
|
|
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
|
|
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
# I'd rather use --version here, but apparently some GNU lds only accept -v.
|
|
@@ -5877,7 +4869,7 @@
|
|
;;
|
|
esac
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
|
|
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
|
|
with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
|
|
@@ -5889,9 +4881,9 @@
|
|
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
|
|
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
|
|
-if test "${lt_cv_path_NM+set}" = set; then
|
|
+if test "${lt_cv_path_NM+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$NM"; then
|
|
@@ -5938,7 +4930,7 @@
|
|
: ${lt_cv_path_NM=no}
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
|
|
$as_echo "$lt_cv_path_NM" >&6; }
|
|
if test "$lt_cv_path_NM" != "no"; then
|
|
NM="$lt_cv_path_NM"
|
|
@@ -5949,9 +4941,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_DUMPBIN+set}" = set; then
|
|
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$DUMPBIN"; then
|
|
@@ -5962,24 +4954,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_DUMPBIN="$ac_tool_prefix$ac_prog"
|
|
- $as_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
|
|
DUMPBIN=$ac_cv_prog_DUMPBIN
|
|
if test -n "$DUMPBIN"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
|
|
$as_echo "$DUMPBIN" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -5993,9 +4985,9 @@
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_DUMPBIN+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_DUMPBIN"; then
|
|
@@ -6006,24 +4998,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_DUMPBIN="$ac_prog"
|
|
- $as_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_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
|
|
if test -n "$ac_ct_DUMPBIN"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
|
|
$as_echo "$ac_ct_DUMPBIN" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6036,7 +5028,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -6056,44 +5048,44 @@
|
|
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
|
|
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
|
|
-if test "${lt_cv_nm_interface+set}" = set; then
|
|
+if test "${lt_cv_nm_interface+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_nm_interface="BSD nm"
|
|
echo "int some_variable = 0;" > conftest.$ac_ext
|
|
- (eval echo "\"\$as_me:6066: $ac_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:5058: $ac_compile\"" >&5)
|
|
(eval "$ac_compile" 2>conftest.err)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:6069: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
+ (eval echo "\"\$as_me:5061: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:6072: output\"" >&5)
|
|
+ (eval echo "\"\$as_me:5064: output\"" >&5)
|
|
cat conftest.out >&5
|
|
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
lt_cv_nm_interface="MS dumpbin"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
|
|
$as_echo "$lt_cv_nm_interface" >&6; }
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
|
|
$as_echo_n "checking whether ln -s works... " >&6; }
|
|
LN_S=$as_ln_s
|
|
if test "$LN_S" = "ln -s"; then
|
|
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
|
|
$as_echo "no, using $LN_S" >&6; }
|
|
fi
|
|
|
|
# find the maximum length of command line arguments
|
|
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
|
|
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
|
|
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
|
|
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
i=0
|
|
@@ -6211,10 +5203,10 @@
|
|
fi
|
|
|
|
if test -n $lt_cv_sys_max_cmd_len ; then
|
|
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
|
|
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: none" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
|
|
$as_echo "none" >&6; }
|
|
fi
|
|
max_cmd_len=$lt_cv_sys_max_cmd_len
|
|
@@ -6228,7 +5220,7 @@
|
|
: ${MV="mv -f"}
|
|
: ${RM="rm -f"}
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
|
|
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
|
|
# Try some XSI features
|
|
xsi_shell=no
|
|
@@ -6238,17 +5230,17 @@
|
|
&& eval 'test $(( 1 + 1 )) -eq 2 \
|
|
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
|
|
&& xsi_shell=yes
|
|
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
|
|
$as_echo "$xsi_shell" >&6; }
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
|
|
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
|
|
lt_shell_append=no
|
|
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
|
|
>/dev/null 2>&1 \
|
|
&& lt_shell_append=yes
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
|
|
$as_echo "$lt_shell_append" >&6; }
|
|
|
|
|
|
@@ -6283,14 +5275,14 @@
|
|
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
|
|
$as_echo_n "checking for $LD option to reload object files... " >&6; }
|
|
-if test "${lt_cv_ld_reload_flag+set}" = set; then
|
|
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_ld_reload_flag='-r'
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
|
|
$as_echo "$lt_cv_ld_reload_flag" >&6; }
|
|
reload_flag=$lt_cv_ld_reload_flag
|
|
case $reload_flag in
|
|
@@ -6319,9 +5311,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}objdump; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_OBJDUMP+set}" = set; then
|
|
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$OBJDUMP"; then
|
|
@@ -6332,24 +5324,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_OBJDUMP="${ac_tool_prefix}objdump"
|
|
- $as_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
|
|
OBJDUMP=$ac_cv_prog_OBJDUMP
|
|
if test -n "$OBJDUMP"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
|
|
$as_echo "$OBJDUMP" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6359,9 +5351,9 @@
|
|
ac_ct_OBJDUMP=$OBJDUMP
|
|
# Extract the first word of "objdump", so it can be a program name with args.
|
|
set dummy objdump; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_OBJDUMP+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_OBJDUMP"; then
|
|
@@ -6372,24 +5364,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_OBJDUMP="objdump"
|
|
- $as_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_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
|
|
if test -n "$ac_ct_OBJDUMP"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
|
|
$as_echo "$ac_ct_OBJDUMP" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6398,7 +5390,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -6418,9 +5410,9 @@
|
|
|
|
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
|
|
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
|
|
-if test "${lt_cv_deplibs_check_method+set}" = set; then
|
|
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_file_magic_cmd='$MAGIC_CMD'
|
|
@@ -6614,7 +5606,7 @@
|
|
esac
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
|
|
$as_echo "$lt_cv_deplibs_check_method" >&6; }
|
|
file_magic_cmd=$lt_cv_file_magic_cmd
|
|
deplibs_check_method=$lt_cv_deplibs_check_method
|
|
@@ -6634,9 +5626,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}ar; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_AR+set}" = set; then
|
|
+if test "${ac_cv_prog_AR+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$AR"; then
|
|
@@ -6647,24 +5639,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_AR="${ac_tool_prefix}ar"
|
|
- $as_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
|
|
AR=$ac_cv_prog_AR
|
|
if test -n "$AR"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
|
|
$as_echo "$AR" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6674,9 +5666,9 @@
|
|
ac_ct_AR=$AR
|
|
# Extract the first word of "ar", so it can be a program name with args.
|
|
set dummy ar; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_AR+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_AR"; then
|
|
@@ -6687,24 +5679,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_AR="ar"
|
|
- $as_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_AR=$ac_cv_prog_ac_ct_AR
|
|
if test -n "$ac_ct_AR"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
|
|
$as_echo "$ac_ct_AR" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6713,7 +5705,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -6739,9 +5731,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_STRIP+set}" = set; then
|
|
+if test "${ac_cv_prog_STRIP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$STRIP"; then
|
|
@@ -6752,24 +5744,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_STRIP="${ac_tool_prefix}strip"
|
|
- $as_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
|
|
STRIP=$ac_cv_prog_STRIP
|
|
if test -n "$STRIP"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
|
|
$as_echo "$STRIP" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6779,9 +5771,9 @@
|
|
ac_ct_STRIP=$STRIP
|
|
# Extract the first word of "strip", so it can be a program name with args.
|
|
set dummy strip; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_STRIP+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_STRIP"; then
|
|
@@ -6792,24 +5784,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_STRIP="strip"
|
|
- $as_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_STRIP=$ac_cv_prog_ac_ct_STRIP
|
|
if test -n "$ac_ct_STRIP"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
|
|
$as_echo "$ac_ct_STRIP" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6818,7 +5810,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -6838,9 +5830,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$RANLIB"; then
|
|
@@ -6851,24 +5843,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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
|
|
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
|
|
$as_echo "$RANLIB" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6878,9 +5870,9 @@
|
|
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
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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
|
|
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_RANLIB"; then
|
|
@@ -6891,24 +5883,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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"
|
|
- $as_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_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
|
if test -n "$ac_ct_RANLIB"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
|
|
$as_echo "$ac_ct_RANLIB" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -6917,7 +5909,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -6995,9 +5987,9 @@
|
|
|
|
|
|
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
|
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
|
|
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
|
|
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
|
|
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
|
|
@@ -7113,18 +6105,18 @@
|
|
int main(){nm_test_var='a';nm_test_func();return(0);}
|
|
_LT_EOF
|
|
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- $as_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
|
|
# Now try to grab the symbols.
|
|
nlist=conftest.nm
|
|
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
|
|
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
|
|
ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s "$nlist"; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s "$nlist"; then
|
|
# Try sorting and uniquifying the output.
|
|
if sort "$nlist" | uniq > "$nlist"T; then
|
|
mv -f "$nlist"T "$nlist"
|
|
@@ -7177,11 +6169,11 @@
|
|
lt_save_CFLAGS="$CFLAGS"
|
|
LIBS="conftstm.$ac_objext"
|
|
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
(eval $ac_link) 2>&5
|
|
ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
|
|
pipe_works=yes
|
|
fi
|
|
LIBS="$lt_save_LIBS"
|
|
@@ -7215,10 +6207,10 @@
|
|
lt_cv_sys_global_symbol_to_cdecl=
|
|
fi
|
|
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
|
|
- { $as_echo "$as_me:$LINENO: result: failed" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
|
|
$as_echo "failed" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: ok" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
$as_echo "ok" >&6; }
|
|
fi
|
|
|
|
@@ -7244,7 +6236,7 @@
|
|
|
|
|
|
# Check whether --enable-libtool-lock was given.
|
|
-if test "${enable_libtool_lock+set}" = set; then
|
|
+if test "${enable_libtool_lock+set}" = set; then :
|
|
enableval=$enable_libtool_lock;
|
|
fi
|
|
|
|
@@ -7256,11 +6248,11 @@
|
|
ia64-*-hpux*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- $as_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
|
|
case `/usr/bin/file conftest.$ac_objext` in
|
|
*ELF-32*)
|
|
HPUX_IA64_MODE="32"
|
|
@@ -7274,12 +6266,12 @@
|
|
;;
|
|
*-*-irix6*)
|
|
# Find out which ABI we are using.
|
|
- echo '#line 7277 "configure"' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ echo '#line 6269 "configure"' > conftest.$ac_ext
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- $as_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 test "$lt_cv_prog_gnu_ld" = yes; then
|
|
case `/usr/bin/file conftest.$ac_objext` in
|
|
*32-bit*)
|
|
@@ -7313,11 +6305,11 @@
|
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- $as_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
|
|
case `/usr/bin/file conftest.o` in
|
|
*32-bit*)
|
|
case $host in
|
|
@@ -7366,9 +6358,9 @@
|
|
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
|
SAVE_CFLAGS="$CFLAGS"
|
|
CFLAGS="$CFLAGS -belf"
|
|
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
|
|
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
|
|
-if test "${lt_cv_cc_needs_belf+set}" = set; then
|
|
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_ext=c
|
|
@@ -7377,11 +6369,7 @@
|
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
- 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
|
|
@@ -7392,38 +6380,13 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
lt_cv_cc_needs_belf=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- lt_cv_cc_needs_belf=no
|
|
+ lt_cv_cc_needs_belf=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
@@ -7431,7 +6394,7 @@
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
|
|
$as_echo "$lt_cv_cc_needs_belf" >&6; }
|
|
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
|
|
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
|
|
@@ -7441,11 +6404,11 @@
|
|
sparc*-*solaris*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- $as_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
|
|
case `/usr/bin/file conftest.o` in
|
|
*64-bit*)
|
|
case $lt_cv_prog_gnu_ld in
|
|
@@ -7471,9 +6434,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_DSYMUTIL+set}" = set; then
|
|
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$DSYMUTIL"; then
|
|
@@ -7484,24 +6447,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_DSYMUTIL="${ac_tool_prefix}dsymutil"
|
|
- $as_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
|
|
DSYMUTIL=$ac_cv_prog_DSYMUTIL
|
|
if test -n "$DSYMUTIL"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
|
|
$as_echo "$DSYMUTIL" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7511,9 +6474,9 @@
|
|
ac_ct_DSYMUTIL=$DSYMUTIL
|
|
# Extract the first word of "dsymutil", so it can be a program name with args.
|
|
set dummy dsymutil; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_DSYMUTIL+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_DSYMUTIL"; then
|
|
@@ -7524,24 +6487,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_DSYMUTIL="dsymutil"
|
|
- $as_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_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
|
|
if test -n "$ac_ct_DSYMUTIL"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
|
|
$as_echo "$ac_ct_DSYMUTIL" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7550,7 +6513,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -7563,9 +6526,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_NMEDIT+set}" = set; then
|
|
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$NMEDIT"; then
|
|
@@ -7576,24 +6539,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_NMEDIT="${ac_tool_prefix}nmedit"
|
|
- $as_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
|
|
NMEDIT=$ac_cv_prog_NMEDIT
|
|
if test -n "$NMEDIT"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
|
|
$as_echo "$NMEDIT" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7603,9 +6566,9 @@
|
|
ac_ct_NMEDIT=$NMEDIT
|
|
# Extract the first word of "nmedit", so it can be a program name with args.
|
|
set dummy nmedit; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_NMEDIT+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_NMEDIT"; then
|
|
@@ -7616,24 +6579,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_NMEDIT="nmedit"
|
|
- $as_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_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
|
|
if test -n "$ac_ct_NMEDIT"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
|
|
$as_echo "$ac_ct_NMEDIT" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7642,7 +6605,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -7655,9 +6618,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}lipo; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_LIPO+set}" = set; then
|
|
+if test "${ac_cv_prog_LIPO+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$LIPO"; then
|
|
@@ -7668,24 +6631,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_LIPO="${ac_tool_prefix}lipo"
|
|
- $as_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
|
|
LIPO=$ac_cv_prog_LIPO
|
|
if test -n "$LIPO"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
|
|
$as_echo "$LIPO" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7695,9 +6658,9 @@
|
|
ac_ct_LIPO=$LIPO
|
|
# Extract the first word of "lipo", so it can be a program name with args.
|
|
set dummy lipo; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_LIPO+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_LIPO"; then
|
|
@@ -7708,24 +6671,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_LIPO="lipo"
|
|
- $as_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_LIPO=$ac_cv_prog_ac_ct_LIPO
|
|
if test -n "$ac_ct_LIPO"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
|
|
$as_echo "$ac_ct_LIPO" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7734,7 +6697,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -7747,9 +6710,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}otool; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_OTOOL+set}" = set; then
|
|
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$OTOOL"; then
|
|
@@ -7760,24 +6723,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_OTOOL="${ac_tool_prefix}otool"
|
|
- $as_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
|
|
OTOOL=$ac_cv_prog_OTOOL
|
|
if test -n "$OTOOL"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
|
|
$as_echo "$OTOOL" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7787,9 +6750,9 @@
|
|
ac_ct_OTOOL=$OTOOL
|
|
# Extract the first word of "otool", so it can be a program name with args.
|
|
set dummy otool; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_OTOOL+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_OTOOL"; then
|
|
@@ -7800,24 +6763,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_OTOOL="otool"
|
|
- $as_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_OTOOL=$ac_cv_prog_ac_ct_OTOOL
|
|
if test -n "$ac_ct_OTOOL"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
|
|
$as_echo "$ac_ct_OTOOL" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7826,7 +6789,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -7839,9 +6802,9 @@
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
|
|
set dummy ${ac_tool_prefix}otool64; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_OTOOL64+set}" = set; then
|
|
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$OTOOL64"; then
|
|
@@ -7852,24 +6815,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_OTOOL64="${ac_tool_prefix}otool64"
|
|
- $as_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
|
|
OTOOL64=$ac_cv_prog_OTOOL64
|
|
if test -n "$OTOOL64"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
|
|
$as_echo "$OTOOL64" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7879,9 +6842,9 @@
|
|
ac_ct_OTOOL64=$OTOOL64
|
|
# Extract the first word of "otool64", so it can be a program name with args.
|
|
set dummy otool64; ac_word=$2
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+{ $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_OTOOL64+set}" = set; then
|
|
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -n "$ac_ct_OTOOL64"; then
|
|
@@ -7892,24 +6855,24 @@
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ 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_OTOOL64="otool64"
|
|
- $as_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_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
|
|
if test -n "$ac_ct_OTOOL64"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
|
|
$as_echo "$ac_ct_OTOOL64" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -7918,7 +6881,7 @@
|
|
else
|
|
case $cross_compiling:$ac_tool_warned in
|
|
yes:)
|
|
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
+{ $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
|
|
@@ -7954,9 +6917,9 @@
|
|
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
|
|
$as_echo_n "checking for -single_module linker flag... " >&6; }
|
|
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
|
|
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_apple_cc_single_mod=no
|
|
@@ -7981,22 +6944,18 @@
|
|
rm -f conftest.*
|
|
fi
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
|
|
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
|
|
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
|
|
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
|
|
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
|
|
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_ld_exported_symbols_list=no
|
|
save_LDFLAGS=$LDFLAGS
|
|
echo "_main" > conftest.sym
|
|
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
|
|
- 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
|
|
@@ -8007,42 +6966,17 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
lt_cv_ld_exported_symbols_list=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- lt_cv_ld_exported_symbols_list=no
|
|
+ lt_cv_ld_exported_symbols_list=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LDFLAGS="$save_LDFLAGS"
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
|
|
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
|
|
case $host_os in
|
|
rhapsody* | darwin1.[012])
|
|
@@ -8066,75 +7000,26 @@
|
|
if test "$lt_cv_apple_cc_single_mod" = "yes"; then
|
|
_lt_dar_single_mod='$single_module'
|
|
fi
|
|
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
|
|
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
|
|
- else
|
|
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
- fi
|
|
- if test "$DSYMUTIL" != ":"; then
|
|
- _lt_dsymutil='~$DSYMUTIL $lib || :'
|
|
- else
|
|
- _lt_dsymutil=
|
|
- fi
|
|
- ;;
|
|
- esac
|
|
-
|
|
-
|
|
-for ac_header in dlfcn.h
|
|
-do
|
|
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
|
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
|
|
-$as_echo_n "checking for $ac_header... " >&6; }
|
|
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+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
|
|
-/* end confdefs.h. */
|
|
-$ac_includes_default
|
|
-
|
|
-#include <$ac_header>
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext
|
|
-if { (ac_try="$ac_compile"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_compile") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest.$ac_objext; then
|
|
- eval "$as_ac_Header=yes"
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- eval "$as_ac_Header=no"
|
|
-fi
|
|
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
|
|
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
|
|
+ else
|
|
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
|
+ fi
|
|
+ if test "$DSYMUTIL" != ":"; then
|
|
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
|
|
+ else
|
|
+ _lt_dsymutil=
|
|
+ fi
|
|
+ ;;
|
|
+ esac
|
|
|
|
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
-fi
|
|
-ac_res=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
|
|
-$as_echo "$ac_res" >&6; }
|
|
-as_val=`eval 'as_val=${'$as_ac_Header'}
|
|
- $as_echo "$as_val"'`
|
|
- if test "x$as_val" = x""yes; then
|
|
+for ac_header in dlfcn.h
|
|
+do :
|
|
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
|
|
+"
|
|
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
|
+#define HAVE_DLFCN_H 1
|
|
_ACEOF
|
|
|
|
fi
|
|
@@ -8154,7 +7039,7 @@
|
|
|
|
|
|
# Check whether --enable-shared was given.
|
|
-if test "${enable_shared+set}" = set; then
|
|
+if test "${enable_shared+set}" = set; then :
|
|
enableval=$enable_shared; p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_shared=yes ;;
|
|
@@ -8185,7 +7070,7 @@
|
|
|
|
|
|
# Check whether --enable-static was given.
|
|
-if test "${enable_static+set}" = set; then
|
|
+if test "${enable_static+set}" = set; then :
|
|
enableval=$enable_static; p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_static=yes ;;
|
|
@@ -8217,7 +7102,7 @@
|
|
|
|
|
|
# Check whether --with-pic was given.
|
|
-if test "${with_pic+set}" = set; then
|
|
+if test "${with_pic+set}" = set; then :
|
|
withval=$with_pic; pic_mode="$withval"
|
|
else
|
|
pic_mode=default
|
|
@@ -8233,7 +7118,7 @@
|
|
|
|
|
|
# Check whether --enable-fast-install was given.
|
|
-if test "${enable_fast_install+set}" = set; then
|
|
+if test "${enable_fast_install+set}" = set; then :
|
|
enableval=$enable_fast_install; p=${PACKAGE-default}
|
|
case $enableval in
|
|
yes) enable_fast_install=yes ;;
|
|
@@ -8314,9 +7199,9 @@
|
|
setopt NO_GLOB_SUBST
|
|
fi
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
|
|
$as_echo_n "checking for objdir... " >&6; }
|
|
-if test "${lt_cv_objdir+set}" = set; then
|
|
+if test "${lt_cv_objdir+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
rm -f .libs 2>/dev/null
|
|
@@ -8329,7 +7214,7 @@
|
|
fi
|
|
rmdir .libs 2>/dev/null
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
|
|
$as_echo "$lt_cv_objdir" >&6; }
|
|
objdir=$lt_cv_objdir
|
|
|
|
@@ -8422,9 +7307,9 @@
|
|
case $deplibs_check_method in
|
|
file_magic*)
|
|
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
|
|
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
|
|
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
|
|
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
|
|
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
case $MAGIC_CMD in
|
|
@@ -8475,10 +7360,10 @@
|
|
|
|
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
|
if test -n "$MAGIC_CMD"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
|
|
$as_echo "$MAGIC_CMD" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -8488,9 +7373,9 @@
|
|
|
|
if test -z "$lt_cv_path_MAGIC_CMD"; then
|
|
if test -n "$ac_tool_prefix"; then
|
|
- { $as_echo "$as_me:$LINENO: checking for file" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
|
|
$as_echo_n "checking for file... " >&6; }
|
|
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
|
|
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
case $MAGIC_CMD in
|
|
@@ -8541,10 +7426,10 @@
|
|
|
|
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
|
if test -n "$MAGIC_CMD"; then
|
|
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
|
|
$as_echo "$MAGIC_CMD" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
|
|
@@ -8621,9 +7506,9 @@
|
|
if test "$GCC" = yes; then
|
|
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
|
|
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
|
|
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
|
|
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_rtti_exceptions=no
|
|
@@ -8639,11 +7524,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:8642: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:7527: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:8646: \$? = $ac_status" >&5
|
|
+ echo "$as_me:7531: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -8656,7 +7541,7 @@
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
|
|
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
|
|
|
|
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
|
|
@@ -8676,7 +7561,7 @@
|
|
lt_prog_compiler_pic=
|
|
lt_prog_compiler_static=
|
|
|
|
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
|
|
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
|
|
if test "$GCC" = yes; then
|
|
@@ -8948,7 +7833,7 @@
|
|
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
|
|
;;
|
|
esac
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
|
|
$as_echo "$lt_prog_compiler_pic" >&6; }
|
|
|
|
|
|
@@ -8960,9 +7845,9 @@
|
|
# Check to make sure the PIC flag actually works.
|
|
#
|
|
if test -n "$lt_prog_compiler_pic"; then
|
|
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
|
|
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
|
|
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
|
|
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_pic_works=no
|
|
@@ -8978,11 +7863,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:8981: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:7866: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:8985: \$? = $ac_status" >&5
|
|
+ echo "$as_me:7870: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -8995,7 +7880,7 @@
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
|
|
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
|
|
|
|
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
|
|
@@ -9019,9 +7904,9 @@
|
|
# Check to make sure the static flag actually works.
|
|
#
|
|
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
|
|
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
|
|
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
|
|
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
|
|
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_static_works=no
|
|
@@ -9047,7 +7932,7 @@
|
|
LDFLAGS="$save_LDFLAGS"
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
|
|
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
|
|
|
|
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
|
|
@@ -9062,9 +7947,9 @@
|
|
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
|
|
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
|
|
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_c_o=no
|
|
@@ -9083,11 +7968,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:9086: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:7971: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:9090: \$? = $ac_status" >&5
|
|
+ echo "$as_me:7975: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -9109,7 +7994,7 @@
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
|
|
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
|
|
|
|
|
|
@@ -9117,9 +8002,9 @@
|
|
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
|
|
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
|
|
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
|
|
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
lt_cv_prog_compiler_c_o=no
|
|
@@ -9138,11 +8023,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:9141: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:8026: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:9145: \$? = $ac_status" >&5
|
|
+ echo "$as_me:8030: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -9164,7 +8049,7 @@
|
|
$RM conftest*
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
|
|
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
|
|
|
|
|
|
@@ -9173,7 +8058,7 @@
|
|
hard_links="nottested"
|
|
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
|
|
# do not overwrite the value of need_locks provided by the user
|
|
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
|
|
$as_echo_n "checking if we can lock with hard links... " >&6; }
|
|
hard_links=yes
|
|
$RM conftest*
|
|
@@ -9181,10 +8066,10 @@
|
|
touch conftest.a
|
|
ln conftest.a conftest.b 2>&5 || hard_links=no
|
|
ln conftest.a conftest.b 2>/dev/null && hard_links=no
|
|
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
|
|
$as_echo "$hard_links" >&6; }
|
|
if test "$hard_links" = no; then
|
|
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
|
|
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
|
|
need_locks=warn
|
|
fi
|
|
@@ -9197,7 +8082,7 @@
|
|
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
|
|
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
|
|
|
|
runpath_var=
|
|
@@ -9640,11 +8525,7 @@
|
|
allow_undefined_flag='-berok'
|
|
# Determine the default libpath from the value encoded in an
|
|
# empty executable.
|
|
- 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
|
|
@@ -9655,27 +8536,7 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
|
lt_aix_libpath_sed='
|
|
/Import File Strings/,/^$/ {
|
|
@@ -9689,16 +8550,9 @@
|
|
if test -z "$aix_libpath"; then
|
|
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
fi
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
|
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
@@ -9711,11 +8565,7 @@
|
|
else
|
|
# Determine the default libpath from the value encoded in an
|
|
# empty executable.
|
|
- 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
|
|
@@ -9726,27 +8576,7 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
|
lt_aix_libpath_sed='
|
|
/Import File Strings/,/^$/ {
|
|
@@ -9760,16 +8590,9 @@
|
|
if test -z "$aix_libpath"; then
|
|
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
|
fi
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
|
|
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
@@ -9981,42 +8804,16 @@
|
|
# implicitly export all symbols.
|
|
save_LDFLAGS="$LDFLAGS"
|
|
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
|
- cat >conftest.$ac_ext <<_ACEOF
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
int foo(void) {}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
|
|
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LDFLAGS="$save_LDFLAGS"
|
|
else
|
|
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
|
|
@@ -10272,7 +9069,7 @@
|
|
fi
|
|
fi
|
|
|
|
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
|
|
$as_echo "$ld_shlibs" >&6; }
|
|
test "$ld_shlibs" = no && can_build_shared=no
|
|
|
|
@@ -10309,16 +9106,16 @@
|
|
# Test whether the compiler implicitly links with -lc since on some
|
|
# systems, -lgcc has to come before -lc. If gcc already passes -lc
|
|
# to ld, don't add -lc before -lgcc.
|
|
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
|
|
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
|
|
$RM conftest*
|
|
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
|
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } 2>conftest.err; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } 2>conftest.err; then
|
|
soname=conftest
|
|
lib=conftest
|
|
libobjs=conftest.$ac_objext
|
|
@@ -10332,11 +9129,11 @@
|
|
libname=conftest
|
|
lt_save_allow_undefined_flag=$allow_undefined_flag
|
|
allow_undefined_flag=
|
|
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
|
|
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
|
|
ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); }
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; }
|
|
then
|
|
archive_cmds_need_lc=no
|
|
else
|
|
@@ -10347,7 +9144,7 @@
|
|
cat conftest.err 1>&5
|
|
fi
|
|
$RM conftest*
|
|
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
|
|
$as_echo "$archive_cmds_need_lc" >&6; }
|
|
;;
|
|
esac
|
|
@@ -10511,7 +9308,7 @@
|
|
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
|
|
$as_echo_n "checking dynamic linker characteristics... " >&6; }
|
|
|
|
if test "$GCC" = yes; then
|
|
@@ -10933,11 +9730,7 @@
|
|
save_libdir=$libdir
|
|
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
|
|
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
|
|
- 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
|
|
@@ -10948,41 +9741,13 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
|
|
shlibpath_overrides_runpath=yes
|
|
fi
|
|
-
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
-
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LDFLAGS=$save_LDFLAGS
|
|
libdir=$save_libdir
|
|
|
|
@@ -11206,7 +9971,7 @@
|
|
dynamic_linker=no
|
|
;;
|
|
esac
|
|
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
|
|
$as_echo "$dynamic_linker" >&6; }
|
|
test "$dynamic_linker" = no && can_build_shared=no
|
|
|
|
@@ -11308,7 +10073,7 @@
|
|
|
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
|
|
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
|
|
hardcode_action=
|
|
if test -n "$hardcode_libdir_flag_spec" ||
|
|
@@ -11333,7 +10098,7 @@
|
|
# directories.
|
|
hardcode_action=unsupported
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
|
|
$as_echo "$hardcode_action" >&6; }
|
|
|
|
if test "$hardcode_action" = relink ||
|
|
@@ -11378,18 +10143,14 @@
|
|
|
|
darwin*)
|
|
# if libdl is installed we need to link against it
|
|
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
|
|
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldl $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 GCC internal prototype to avoid an error.
|
|
@@ -11407,43 +10168,18 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dl_dlopen=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dl_dlopen=no
|
|
+ ac_cv_lib_dl_dlopen=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
|
|
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
|
else
|
|
|
|
@@ -11456,106 +10192,18 @@
|
|
;;
|
|
|
|
*)
|
|
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
|
|
-$as_echo_n "checking for shl_load... " >&6; }
|
|
-if test "${ac_cv_func_shl_load+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
|
|
-/* end confdefs.h. */
|
|
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define shl_load innocuous_shl_load
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char shl_load (); 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 shl_load
|
|
-
|
|
-/* 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 shl_load ();
|
|
-/* 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_shl_load || defined __stub___shl_load
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return shl_load ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
- ac_cv_func_shl_load=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_shl_load=no
|
|
-fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
|
|
-$as_echo "$ac_cv_func_shl_load" >&6; }
|
|
-if test "x$ac_cv_func_shl_load" = x""yes; then
|
|
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
|
|
+if test "x$ac_cv_func_shl_load" = x""yes; then :
|
|
lt_cv_dlopen="shl_load"
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
|
|
$as_echo_n "checking for shl_load in -ldld... " >&6; }
|
|
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
|
|
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldld $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 GCC internal prototype to avoid an error.
|
|
@@ -11573,145 +10221,32 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dld_shl_load=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dld_shl_load=no
|
|
+ ac_cv_lib_dld_shl_load=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
|
|
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
|
|
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
|
|
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
|
|
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
|
|
-$as_echo_n "checking for dlopen... " >&6; }
|
|
-if test "${ac_cv_func_dlopen+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
|
|
-/* end confdefs.h. */
|
|
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
|
|
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
|
-#define dlopen innocuous_dlopen
|
|
-
|
|
-/* System header to define __stub macros and hopefully few prototypes,
|
|
- which can conflict with char dlopen (); 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 dlopen
|
|
-
|
|
-/* 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 dlopen ();
|
|
-/* 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_dlopen || defined __stub___dlopen
|
|
-choke me
|
|
-#endif
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dlopen ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
- ac_cv_func_dlopen=yes
|
|
-else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_func_dlopen=no
|
|
-fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
|
|
-$as_echo "$ac_cv_func_dlopen" >&6; }
|
|
-if test "x$ac_cv_func_dlopen" = x""yes; then
|
|
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
|
|
+if test "x$ac_cv_func_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen"
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
|
$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
|
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
|
|
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldl $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 GCC internal prototype to avoid an error.
|
|
@@ -11720,66 +10255,37 @@
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char dlopen ();
|
|
-int
|
|
-main ()
|
|
-{
|
|
-return dlopen ();
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+char dlopen ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+return dlopen ();
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dl_dlopen=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dl_dlopen=no
|
|
+ ac_cv_lib_dl_dlopen=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
|
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
|
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
|
|
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
|
|
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
|
|
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
|
|
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-lsvld $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 GCC internal prototype to avoid an error.
|
|
@@ -11797,57 +10303,28 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_svld_dlopen=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_svld_dlopen=no
|
|
+ ac_cv_lib_svld_dlopen=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
|
|
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
|
|
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
|
|
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
|
|
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
|
|
$as_echo_n "checking for dld_link in -ldld... " >&6; }
|
|
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
|
|
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-ldld $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 GCC internal prototype to avoid an error.
|
|
@@ -11865,43 +10342,18 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
|
-if { (ac_try="$ac_link"
|
|
-case "(($ac_try" in
|
|
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
- *) ac_try_echo=$ac_try;;
|
|
-esac
|
|
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
-$as_echo "$ac_try_echo") >&5
|
|
- (eval "$ac_link") 2>conftest.er1
|
|
- ac_status=$?
|
|
- grep -v '^ *+' conftest.er1 >conftest.err
|
|
- rm -f conftest.er1
|
|
- cat conftest.err >&5
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && {
|
|
- test -z "$ac_c_werror_flag" ||
|
|
- test ! -s conftest.err
|
|
- } && test -s conftest$ac_exeext && {
|
|
- test "$cross_compiling" = yes ||
|
|
- $as_test_x conftest$ac_exeext
|
|
- }; then
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
ac_cv_lib_dld_dld_link=yes
|
|
else
|
|
- $as_echo "$as_me: failed program was:" >&5
|
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
|
-
|
|
- ac_cv_lib_dld_dld_link=no
|
|
+ ac_cv_lib_dld_dld_link=no
|
|
fi
|
|
-
|
|
-rm -rf conftest.dSYM
|
|
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
- 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
|
|
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
|
|
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
|
|
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
|
|
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
|
|
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
|
|
fi
|
|
|
|
@@ -11940,9 +10392,9 @@
|
|
save_LIBS="$LIBS"
|
|
LIBS="$lt_cv_dlopen_libs $LIBS"
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
|
|
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
|
|
-if test "${lt_cv_dlopen_self+set}" = set; then
|
|
+if test "${lt_cv_dlopen_self+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test "$cross_compiling" = yes; then :
|
|
@@ -11951,7 +10403,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 11954 "configure"
|
|
+#line 10406 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -12010,11 +10462,11 @@
|
|
return status;
|
|
}
|
|
_LT_EOF
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
(eval $ac_link) 2>&5
|
|
ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
(./conftest; exit; ) >&5 2>/dev/null
|
|
lt_status=$?
|
|
case x$lt_status in
|
|
@@ -12031,14 +10483,14 @@
|
|
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
|
|
$as_echo "$lt_cv_dlopen_self" >&6; }
|
|
|
|
if test "x$lt_cv_dlopen_self" = xyes; then
|
|
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
|
|
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
|
|
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
|
|
-if test "${lt_cv_dlopen_self_static+set}" = set; then
|
|
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test "$cross_compiling" = yes; then :
|
|
@@ -12047,7 +10499,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 12050 "configure"
|
|
+#line 10502 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -12106,11 +10558,11 @@
|
|
return status;
|
|
}
|
|
_LT_EOF
|
|
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
|
(eval $ac_link) 2>&5
|
|
ac_status=$?
|
|
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
|
|
(./conftest; exit; ) >&5 2>/dev/null
|
|
lt_status=$?
|
|
case x$lt_status in
|
|
@@ -12127,7 +10579,7 @@
|
|
|
|
|
|
fi
|
|
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
|
|
$as_echo "$lt_cv_dlopen_self_static" >&6; }
|
|
fi
|
|
|
|
@@ -12166,12 +10618,12 @@
|
|
|
|
striplib=
|
|
old_striplib=
|
|
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
|
|
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
|
|
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
|
|
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
|
|
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
|
|
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
else
|
|
# FIXME - insert some real tests, host_os isn't really good enough
|
|
@@ -12180,15 +10632,15 @@
|
|
if test -n "$STRIP" ; then
|
|
striplib="$STRIP -x"
|
|
old_striplib="$STRIP -S"
|
|
- { $as_echo "$as_me:$LINENO: result: yes" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
else
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
fi
|
|
;;
|
|
*)
|
|
- { $as_echo "$as_me:$LINENO: result: no" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
;;
|
|
esac
|
|
@@ -12206,12 +10658,12 @@
|
|
|
|
|
|
# Report which library types will actually be built
|
|
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
|
|
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
|
|
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
|
|
$as_echo "$can_build_shared" >&6; }
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
|
|
$as_echo_n "checking whether to build shared libraries... " >&6; }
|
|
test "$can_build_shared" = "no" && enable_shared=no
|
|
|
|
@@ -12232,14 +10684,14 @@
|
|
fi
|
|
;;
|
|
esac
|
|
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
|
|
$as_echo "$enable_shared" >&6; }
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
|
|
$as_echo_n "checking whether to build static libraries... " >&6; }
|
|
# Make sure either enable_shared or enable_static is yes.
|
|
test "$enable_shared" = yes || enable_static=yes
|
|
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
|
|
$as_echo "$enable_static" >&6; }
|
|
|
|
|
|
@@ -12304,13 +10756,13 @@
|
|
case $ac_val in #(
|
|
*${as_nl}*)
|
|
case $ac_var in #(
|
|
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
|
|
+ *_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= ;; #(
|
|
- *) $as_unset $ac_var ;;
|
|
+ *) { eval $ac_var=; unset $ac_var;} ;;
|
|
esac ;;
|
|
esac
|
|
done
|
|
@@ -12318,8 +10770,8 @@
|
|
(set) 2>&1 |
|
|
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 \).
|
|
+ # `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"
|
|
@@ -12342,11 +10794,11 @@
|
|
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:$LINENO: updating cache $cache_file" >&5
|
|
+ { $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
|
|
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
|
|
+ { $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
|
|
@@ -12366,8 +10818,8 @@
|
|
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.
|
|
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
|
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
+ 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
|
|
|
|
@@ -12375,27 +10827,22 @@
|
|
|
|
|
|
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"AMDEP\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
|
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&5
|
|
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
|
-Usually this means the macro was only invoked conditionally." >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
|
|
: ${CONFIG_STATUS=./config.status}
|
|
ac_write_fail=0
|
|
ac_clean_files_save=$ac_clean_files
|
|
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
|
|
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
|
|
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
|
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
+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.
|
|
@@ -12405,17 +10852,18 @@
|
|
debug=false
|
|
ac_cs_recheck=false
|
|
ac_cs_silent=false
|
|
-SHELL=\${CONFIG_SHELL-$SHELL}
|
|
-_ACEOF
|
|
|
|
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
-## --------------------- ##
|
|
-## M4sh Initialization. ##
|
|
-## --------------------- ##
|
|
+SHELL=\${CONFIG_SHELL-$SHELL}
|
|
+export SHELL
|
|
+_ASEOF
|
|
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
|
|
+## -------------------- ##
|
|
+## M4sh Initialization. ##
|
|
+## -------------------- ##
|
|
|
|
# Be more Bourne compatible
|
|
DUALCASE=1; export DUALCASE # for MKS sh
|
|
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
+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
|
|
@@ -12423,23 +10871,15 @@
|
|
alias -g '${1+"$@"}'='"$@"'
|
|
setopt NO_GLOB_SUBST
|
|
else
|
|
- case `(set -o) 2>/dev/null` in
|
|
- *posix*) set -o posix ;;
|
|
+ case `(set -o) 2>/dev/null` in #(
|
|
+ *posix*) :
|
|
+ set -o posix ;; #(
|
|
+ *) :
|
|
+ ;;
|
|
esac
|
|
-
|
|
fi
|
|
|
|
|
|
-
|
|
-
|
|
-# PATH needs CR
|
|
-# Avoid depending upon Character Ranges.
|
|
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
-as_cr_digits='0123456789'
|
|
-as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
-
|
|
as_nl='
|
|
'
|
|
export as_nl
|
|
@@ -12447,7 +10887,13 @@
|
|
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
|
|
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
|
|
+# 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
|
|
@@ -12458,7 +10904,7 @@
|
|
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
as_echo_n_body='eval
|
|
arg=$1;
|
|
- case $arg in
|
|
+ case $arg in #(
|
|
*"$as_nl"*)
|
|
expr "X$arg" : "X\\(.*\\)$as_nl";
|
|
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
|
|
@@ -12481,13 +10927,6 @@
|
|
}
|
|
fi
|
|
|
|
-# Support unset when possible.
|
|
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
|
- as_unset=unset
|
|
-else
|
|
- as_unset=false
|
|
-fi
|
|
-
|
|
|
|
# IFS
|
|
# We need space, tab and new line, in precisely that order. Quoting is
|
|
@@ -12497,15 +10936,15 @@
|
|
IFS=" "" $as_nl"
|
|
|
|
# Find who we are. Look in the path if we contain no directory separator.
|
|
-case $0 in
|
|
+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
|
|
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
|
+ done
|
|
IFS=$as_save_IFS
|
|
|
|
;;
|
|
@@ -12517,12 +10956,16 @@
|
|
fi
|
|
if test ! -f "$as_myself"; then
|
|
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
|
|
- { (exit 1); exit 1; }
|
|
+ exit 1
|
|
fi
|
|
|
|
-# Work around bugs in pre-3.0 UWIN ksh.
|
|
-for as_var in ENV MAIL MAILPATH
|
|
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
|
+# 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='> '
|
|
@@ -12534,7 +10977,89 @@
|
|
LANGUAGE=C
|
|
export LANGUAGE
|
|
|
|
-# Required to use basename.
|
|
+# CDPATH.
|
|
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
+
|
|
+
|
|
+# 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
|
|
@@ -12548,8 +11073,12 @@
|
|
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_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
|
X"$0" : 'X\(//\)$' \| \
|
|
@@ -12569,76 +11098,25 @@
|
|
}
|
|
s/.*/./; q'`
|
|
|
|
-# CDPATH.
|
|
-$as_unset CDPATH
|
|
-
|
|
-
|
|
-
|
|
- as_lineno_1=$LINENO
|
|
- as_lineno_2=$LINENO
|
|
- test "x$as_lineno_1" != "x$as_lineno_2" &&
|
|
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
|
|
-
|
|
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
|
|
- # uniformly replaced by the line number. The first 'sed' inserts a
|
|
- # line-number line after each line using $LINENO; the second 'sed'
|
|
- # does the real work. The second script uses 'N' to pair each
|
|
- # line-number line with the line containing $LINENO, and appends
|
|
- # trailing '-' during substitution so that $LINENO is not a special
|
|
- # case at line end.
|
|
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
|
|
- # scripts with optimization help from Paolo Bonzini. Blame Lee
|
|
- # E. McMahon (1931-1989) for sed's syntax. :-)
|
|
- sed -n '
|
|
- p
|
|
- /[$]LINENO/=
|
|
- ' <$as_myself |
|
|
- sed '
|
|
- s/[$]LINENO.*/&-/
|
|
- t lineno
|
|
- b
|
|
- :lineno
|
|
- N
|
|
- :loop
|
|
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
|
|
- t loop
|
|
- s/-\n.*//
|
|
- ' >$as_me.lineno &&
|
|
- chmod +x "$as_me.lineno" ||
|
|
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
|
|
- { (exit 1); exit 1; }; }
|
|
-
|
|
- # Don't try to exec as it changes $[0], causing all sort of problems
|
|
- # (the dirname of $[0] is not the place where we might find the
|
|
- # original and so on. Autoconf is especially sensitive to this).
|
|
- . "./$as_me.lineno"
|
|
- # Exit status is that of the last command.
|
|
- exit
|
|
-}
|
|
-
|
|
-
|
|
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
|
|
- as_dirname=dirname
|
|
-else
|
|
- as_dirname=false
|
|
-fi
|
|
+# Avoid depending upon Character Ranges.
|
|
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
|
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
|
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
|
+as_cr_digits='0123456789'
|
|
+as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
|
|
ECHO_C= ECHO_N= ECHO_T=
|
|
-case `echo -n x` in
|
|
+case `echo -n x` in #(((((
|
|
-n*)
|
|
- case `echo 'x\c'` in
|
|
+ case `echo 'xy\c'` in
|
|
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
|
|
- *) ECHO_C='\c';;
|
|
+ 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 &&
|
|
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
|
- as_expr=expr
|
|
-else
|
|
- as_expr=false
|
|
-fi
|
|
|
|
rm -f conf$$ conf$$.exe conf$$.file
|
|
if test -d conf$$.dir; then
|
|
@@ -12667,8 +11145,56 @@
|
|
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
|
|
@@ -12687,10 +11213,10 @@
|
|
if test -d "$1"; then
|
|
test -d "$1/.";
|
|
else
|
|
- case $1 in
|
|
+ case $1 in #(
|
|
-*)set "./$1";;
|
|
esac;
|
|
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
???[sx]*):;;*)false;;esac;fi
|
|
'\'' sh
|
|
'
|
|
@@ -12705,13 +11231,19 @@
|
|
|
|
|
|
exec 6>&1
|
|
+## ----------------------------------- ##
|
|
+## Main body of $CONFIG_STATUS script. ##
|
|
+## ----------------------------------- ##
|
|
+_ASEOF
|
|
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
|
|
|
|
-# Save the log message, 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.
|
|
ac_log="
|
|
This file was extended by json-c $as_me 0.9, which was
|
|
-generated by GNU Autoconf 2.63. Invocation command line was
|
|
+generated by GNU Autoconf 2.64. Invocation command line was
|
|
|
|
CONFIG_FILES = $CONFIG_FILES
|
|
CONFIG_HEADERS = $CONFIG_HEADERS
|
|
@@ -12743,10 +11275,11 @@
|
|
|
|
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 [OPTION]... [FILE]...
|
|
+Usage: $0 [OPTION]... [TAG]...
|
|
|
|
-h, --help print this help, then exit
|
|
-V, --version print version number and configuration settings, then exit
|
|
@@ -12768,16 +11301,16 @@
|
|
Configuration commands:
|
|
$config_commands
|
|
|
|
-Report bugs to <bug-autoconf@gnu.org>."
|
|
+Report bugs to <michael@metaparadigm.com>."
|
|
|
|
_ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
ac_cs_version="\\
|
|
json-c config.status 0.9
|
|
-configured by $0, generated by GNU Autoconf 2.63,
|
|
+configured by $0, generated by GNU Autoconf 2.64,
|
|
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
|
|
-Copyright (C) 2008 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."
|
|
|
|
@@ -12820,20 +11353,19 @@
|
|
case $ac_optarg in
|
|
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
esac
|
|
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
|
|
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
|
|
ac_need_defaults=false;;
|
|
--header | --heade | --head | --hea )
|
|
$ac_shift
|
|
case $ac_optarg in
|
|
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
|
|
esac
|
|
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
|
|
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
|
|
ac_need_defaults=false;;
|
|
--he | --h)
|
|
# Conflict between --help and --header
|
|
- { $as_echo "$as_me: error: ambiguous option: $1
|
|
-Try \`$0 --help' for more information." >&2
|
|
- { (exit 1); exit 1; }; };;
|
|
+ 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 \
|
|
@@ -12841,11 +11373,10 @@
|
|
ac_cs_silent=: ;;
|
|
|
|
# This is an error.
|
|
- -*) { $as_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
|
|
@@ -13157,9 +11688,7 @@
|
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
|
"json.pc") CONFIG_FILES="$CONFIG_FILES json.pc" ;;
|
|
|
|
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
|
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
|
esac
|
|
done
|
|
|
|
@@ -13186,7 +11715,7 @@
|
|
trap 'exit_status=$?
|
|
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
|
|
' 0
|
|
- trap '{ (exit 1); exit 1; }' 1 2 13 15
|
|
+ trap 'as_fn_exit 1' 1 2 13 15
|
|
}
|
|
# Create a (secure) tmp directory for tmp files.
|
|
|
|
@@ -13197,11 +11726,7 @@
|
|
{
|
|
tmp=./conf$$-$RANDOM
|
|
(umask 077 && mkdir "$tmp")
|
|
-} ||
|
|
-{
|
|
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
|
|
- { (exit 1); exit 1; }
|
|
-}
|
|
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
|
|
|
|
# Set up the scripts for CONFIG_FILES section.
|
|
# No need to generate them if there are no CONFIG_FILES.
|
|
@@ -13209,10 +11734,16 @@
|
|
if test -n "$CONFIG_FILES"; then
|
|
|
|
|
|
-ac_cr='
|
|
'
|
|
+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'
|
|
+ ac_cs_awk_cr='\r'
|
|
else
|
|
ac_cs_awk_cr=$ac_cr
|
|
fi
|
|
@@ -13226,24 +11757,18 @@
|
|
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
|
|
echo "_ACEOF"
|
|
} >conf$$subs.sh ||
|
|
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ 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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
|
|
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_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
|
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
|
|
else
|
|
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
fi
|
|
@@ -13332,9 +11857,7 @@
|
|
else
|
|
cat
|
|
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|
|
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
|
|
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
|
|
_ACEOF
|
|
|
|
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
|
@@ -13375,9 +11898,7 @@
|
|
if test -z "$ac_t"; then
|
|
break
|
|
elif $ac_last_try; then
|
|
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
|
|
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
|
|
else
|
|
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
|
fi
|
|
@@ -13462,9 +11983,7 @@
|
|
_ACAWK
|
|
_ACEOF
|
|
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
|
|
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
|
|
fi # test -n "$CONFIG_HEADERS"
|
|
|
|
|
|
@@ -13477,9 +11996,7 @@
|
|
esac
|
|
case $ac_mode$ac_tag in
|
|
:[FHL]*:*);;
|
|
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
|
|
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
|
|
:[FH]-) ac_tag=-:-;;
|
|
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
|
|
esac
|
|
@@ -13507,12 +12024,10 @@
|
|
[\\/$]*) false;;
|
|
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
|
|
esac ||
|
|
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
|
|
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
|
|
- { (exit 1); exit 1; }; };;
|
|
+ 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
|
|
- ac_file_inputs="$ac_file_inputs '$ac_f'"
|
|
+ as_fn_append ac_file_inputs " '$ac_f'"
|
|
done
|
|
|
|
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
@@ -13523,7 +12038,7 @@
|
|
`' by configure.'
|
|
if test x"$ac_file" != x-; then
|
|
configure_input="$ac_file. $configure_input"
|
|
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
|
|
$as_echo "$as_me: creating $ac_file" >&6;}
|
|
fi
|
|
# Neutralize special characters interpreted by sed in replacement strings.
|
|
@@ -13536,9 +12051,7 @@
|
|
|
|
case $ac_tag in
|
|
*:-:* | *:-) cat >"$tmp/stdin" \
|
|
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
|
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
|
- { (exit 1); exit 1; }; } ;;
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
|
|
esac
|
|
;;
|
|
esac
|
|
@@ -13566,47 +12079,7 @@
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- { as_dir="$ac_dir"
|
|
- case $as_dir in #(
|
|
- -*) as_dir=./$as_dir;;
|
|
- esac
|
|
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
- 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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+ as_dir="$ac_dir"; as_fn_mkdir_p
|
|
ac_builddir=.
|
|
|
|
case "$ac_dir" in
|
|
@@ -13663,7 +12136,6 @@
|
|
# 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
|
|
@@ -13673,12 +12145,11 @@
|
|
/@docdir@/p
|
|
/@infodir@/p
|
|
/@localedir@/p
|
|
-/@mandir@/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:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
|
|
+ { $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
|
|
@@ -13688,7 +12159,7 @@
|
|
s&@infodir@&$infodir&g
|
|
s&@localedir@&$localedir&g
|
|
s&@mandir@&$mandir&g
|
|
- s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
+ s&\\\${datarootdir}&$datarootdir&g' ;;
|
|
esac
|
|
_ACEOF
|
|
|
|
@@ -13717,14 +12188,12 @@
|
|
$ac_datarootdir_hack
|
|
"
|
|
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
|
|
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
|
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ || 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:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
|
|
+ { $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;}
|
|
@@ -13734,9 +12203,7 @@
|
|
-) cat "$tmp/out" && rm -f "$tmp/out";;
|
|
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
|
|
esac \
|
|
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
|
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
;;
|
|
:H)
|
|
#
|
|
@@ -13747,25 +12214,19 @@
|
|
$as_echo "/* $configure_input */" \
|
|
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
|
|
} >"$tmp/config.h" \
|
|
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
|
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ || 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:$LINENO: $ac_file is unchanged" >&5
|
|
+ { $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_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
|
|
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
|
|
fi
|
|
else
|
|
$as_echo "/* $configure_input */" \
|
|
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|
|
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
|
|
-$as_echo "$as_me: error: could not create -" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ || as_fn_error "could not create -" "$LINENO" 5
|
|
fi
|
|
# Compute "$ac_file"'s index in $config_headers.
|
|
_am_arg="$ac_file"
|
|
@@ -13803,7 +12264,7 @@
|
|
s/.*/./; q'`/stamp-h$_am_stamp_count
|
|
;;
|
|
|
|
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
|
|
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
|
|
$as_echo "$as_me: executing $ac_file commands" >&6;}
|
|
;;
|
|
esac
|
|
@@ -13898,47 +12359,7 @@
|
|
q
|
|
}
|
|
s/.*/./; q'`
|
|
- { as_dir=$dirpart/$fdir
|
|
- case $as_dir in #(
|
|
- -*) as_dir=./$as_dir;;
|
|
- esac
|
|
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
|
|
- 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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
|
|
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
|
|
- { (exit 1); exit 1; }; }; }
|
|
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
|
|
# echo "creating $dirpart/$file"
|
|
echo '# dummy' > "$dirpart/$file"
|
|
done
|
|
@@ -14585,15 +13006,12 @@
|
|
done # for ac_tag
|
|
|
|
|
|
-{ (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_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
|
|
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
|
|
- { (exit 1); exit 1; }; }
|
|
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
|
|
|
|
|
|
# configure is writing to config.log, and then calls config.status.
|
|
@@ -14614,10 +13032,10 @@
|
|
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:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
|
+ { $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 json-c-0.9.orig/json_object.c json-c-0.9/json_object.c
|
|
--- json-c-0.9.orig/json_object.c 2009-06-30 11:38:44.000000000 +0800
|
|
+++ json-c-0.9/json_object.c 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -226,6 +226,47 @@
|
|
return sprintbuf(pb, " }");
|
|
}
|
|
|
|
+#if 0 /* for indirect access, ZyXEL, john */
|
|
+/* json_object_object_parameters_to_json_string */
|
|
+
|
|
+const char* json_object_parameters_to_json_string(struct json_object *jso)
|
|
+{
|
|
+ if(!jso) return "null";
|
|
+ if(!jso->_pb) {
|
|
+ if(!(jso->_pb = printbuf_new())) return NULL;
|
|
+ } else {
|
|
+ printbuf_reset(jso->_pb);
|
|
+ }
|
|
+ if(jso->_parameters_to_json_string(jso, jso->_pb) < 0) return NULL;
|
|
+ return jso->_pb->buf;
|
|
+}
|
|
+
|
|
+static int json_object_object_parameters_to_json_string(struct json_object* jso,
|
|
+ struct printbuf *pb)
|
|
+{
|
|
+ int i=0;
|
|
+ struct json_object_iter iter;
|
|
+ sprintbuf(pb, "{");
|
|
+
|
|
+ /* CAW: scope operator to make ANSI correctness */
|
|
+ /* CAW: switched to json_object_object_foreachC which uses an iterator struct */
|
|
+ json_object_object_foreachC(jso, iter) {
|
|
+ if(iter.val && json_object_is_type(iter.val,json_type_array)){
|
|
+ continue;
|
|
+ }
|
|
+ if(i) sprintbuf(pb, ",");
|
|
+ sprintbuf(pb, " \"");
|
|
+ json_escape_str(pb, iter.key);
|
|
+ sprintbuf(pb, "\": ");
|
|
+ if(iter.val == NULL) sprintbuf(pb, "null");
|
|
+ else iter.val->_to_json_string(iter.val, pb);
|
|
+ i++;
|
|
+ }
|
|
+
|
|
+ return sprintbuf(pb, " }");
|
|
+}
|
|
+
|
|
+#endif
|
|
static void json_object_lh_entry_free(struct lh_entry *ent)
|
|
{
|
|
free(ent->k);
|
|
@@ -244,6 +285,9 @@
|
|
if(!jso) return NULL;
|
|
jso->_delete = &json_object_object_delete;
|
|
jso->_to_json_string = &json_object_object_to_json_string;
|
|
+#if 0 /* for indirect access, ZyXEL, john */
|
|
+ jso->_parameters_to_json_string = &json_object_object_parameters_to_json_string;
|
|
+#endif
|
|
jso->o.c_object = lh_kchar_table_new(JSON_OBJECT_DEF_HASH_ENTRIES,
|
|
NULL, &json_object_lh_entry_free);
|
|
return jso;
|
|
@@ -304,8 +348,10 @@
|
|
return jso->o.c_boolean;
|
|
case json_type_int:
|
|
return (jso->o.c_int != 0);
|
|
+#if JSON_SUPPORT_DOUBLE
|
|
case json_type_double:
|
|
return (jso->o.c_double != 0);
|
|
+#endif
|
|
case json_type_string:
|
|
return (strlen(jso->o.c_string) != 0);
|
|
default:
|
|
@@ -339,8 +385,10 @@
|
|
switch(jso->o_type) {
|
|
case json_type_int:
|
|
return jso->o.c_int;
|
|
+#if JSON_SUPPORT_DOUBLE
|
|
case json_type_double:
|
|
return (int)jso->o.c_double;
|
|
+#endif
|
|
case json_type_boolean:
|
|
return jso->o.c_boolean;
|
|
case json_type_string:
|
|
@@ -352,22 +400,26 @@
|
|
|
|
|
|
/* json_object_double */
|
|
-
|
|
+#if JSON_SUPPORT_DOUBLE
|
|
static int json_object_double_to_json_string(struct json_object* jso,
|
|
struct printbuf *pb)
|
|
{
|
|
return sprintbuf(pb, "%lf", jso->o.c_double);
|
|
}
|
|
-
|
|
+#endif
|
|
struct json_object* json_object_new_double(double d)
|
|
{
|
|
+#if JSON_SUPPORT_DOUBLE
|
|
struct json_object *jso = json_object_new(json_type_double);
|
|
if(!jso) return NULL;
|
|
jso->_to_json_string = &json_object_double_to_json_string;
|
|
jso->o.c_double = d;
|
|
return jso;
|
|
+#else
|
|
+ return NULL;
|
|
+#endif
|
|
}
|
|
-
|
|
+#if JSON_SUPPORT_DOUBLE
|
|
double json_object_get_double(struct json_object *jso)
|
|
{
|
|
double cdouble;
|
|
@@ -386,7 +438,7 @@
|
|
return 0.0;
|
|
}
|
|
}
|
|
-
|
|
+#endif
|
|
|
|
/* json_object_string */
|
|
|
|
@@ -456,6 +508,24 @@
|
|
return sprintbuf(pb, " ]");
|
|
}
|
|
|
|
+#if 0 /* for indirect access, ZyXEL, john */
|
|
+static int json_object_array_parameters_to_json_string(struct json_object* jso,
|
|
+ struct printbuf *pb)
|
|
+{
|
|
+ int i;
|
|
+ sprintbuf(pb, "[");
|
|
+ for(i=0; i < json_object_array_length(jso); i++) {
|
|
+ struct json_object *val;
|
|
+ if(i) { sprintbuf(pb, ", "); }
|
|
+ else { sprintbuf(pb, " "); }
|
|
+
|
|
+ val = json_object_array_get_idx(jso, i);
|
|
+ if(val == NULL) { sprintbuf(pb, "null"); }
|
|
+ else { val->_parameters_to_json_string(val, pb); }
|
|
+ }
|
|
+ return sprintbuf(pb, " ]");
|
|
+}
|
|
+#endif
|
|
static void json_object_array_entry_free(void *data)
|
|
{
|
|
json_object_put((struct json_object*)data);
|
|
@@ -473,6 +543,9 @@
|
|
if(!jso) return NULL;
|
|
jso->_delete = &json_object_array_delete;
|
|
jso->_to_json_string = &json_object_array_to_json_string;
|
|
+#if 0 /* for indirect access, ZyXEL, john */
|
|
+ jso->_parameters_to_json_string = &json_object_array_parameters_to_json_string;
|
|
+#endif
|
|
jso->o.c_array = array_list_new(&json_object_array_entry_free);
|
|
return jso;
|
|
}
|
|
@@ -510,3 +583,11 @@
|
|
return (struct json_object*)array_list_get_idx(jso->o.c_array, idx);
|
|
}
|
|
|
|
+#if 1 /* zyxel, john */
|
|
+int json_object_array_delete_idx(struct json_object *jso,
|
|
+ int idx)
|
|
+{
|
|
+ return array_list_delete_idx(jso->o.c_array, idx);
|
|
+}
|
|
+#endif
|
|
+
|
|
diff -Naur json-c-0.9.orig/json_object.h json-c-0.9/json_object.h
|
|
--- json-c-0.9.orig/json_object.h 2009-02-25 10:29:17.000000000 +0800
|
|
+++ json-c-0.9/json_object.h 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -24,12 +24,16 @@
|
|
#undef TRUE
|
|
#define TRUE ((boolean)1)
|
|
|
|
+#define JSON_SUPPORT_DOUBLE 0
|
|
+
|
|
extern const char *json_number_chars;
|
|
extern const char *json_hex_chars;
|
|
|
|
/* forward structure definitions */
|
|
-
|
|
-typedef int boolean;
|
|
+#ifndef boolean
|
|
+typedef int _boolean;
|
|
+#define boolean _boolean
|
|
+#endif
|
|
typedef struct printbuf printbuf;
|
|
typedef struct lh_table lh_table;
|
|
typedef struct array_list array_list;
|
|
@@ -44,9 +48,16 @@
|
|
json_type_boolean,
|
|
json_type_double,
|
|
json_type_int,
|
|
+ json_type_uint8,
|
|
+ json_type_uint16,
|
|
+ json_type_uint32,
|
|
json_type_object,
|
|
json_type_array,
|
|
- json_type_string
|
|
+ json_type_string,
|
|
+ json_type_time,
|
|
+ json_type_base64,
|
|
+ json_type_hex,
|
|
+ json_type_ulong
|
|
} json_type;
|
|
|
|
/* reference counting functions */
|
|
@@ -97,6 +108,13 @@
|
|
*/
|
|
extern const char* json_object_to_json_string(struct json_object *obj);
|
|
|
|
+#if 0 /* ZyXEL, john */
|
|
+/** Stringify object parameters to json format
|
|
+ * @param obj the json_object instance
|
|
+ * @returns a string in JSON format
|
|
+ */
|
|
+extern const char* json_object_parameters_to_json_string(struct json_object *jso);
|
|
+#endif
|
|
|
|
/* object type methods */
|
|
|
|
@@ -224,6 +242,18 @@
|
|
extern struct json_object* json_object_array_get_idx(struct json_object *obj,
|
|
int idx);
|
|
|
|
+#if 1 /* zyxel, john */
|
|
+
|
|
+/** Delete the element at specificed index of the array (a json_object of type json_type_array)
|
|
+ * @param obj the json_object array
|
|
+ * @param idx the index of the deteled element
|
|
+ * @returns 0
|
|
+ */
|
|
+extern int json_object_array_delete_idx(struct json_object *jso,
|
|
+ int idx);
|
|
+#endif
|
|
+
|
|
+
|
|
/* boolean type methods */
|
|
|
|
/** Create a new empty json_object of type json_type_boolean
|
|
diff -Naur json-c-0.9.orig/json_object_private.h json-c-0.9/json_object_private.h
|
|
--- json-c-0.9.orig/json_object_private.h 2009-02-25 10:26:07.000000000 +0800
|
|
+++ json-c-0.9/json_object_private.h 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -19,17 +19,26 @@
|
|
typedef void (json_object_delete_fn)(struct json_object *o);
|
|
typedef int (json_object_to_json_string_fn)(struct json_object *o,
|
|
struct printbuf *pb);
|
|
+#if 0 /* zyxel, john */
|
|
+typedef int (json_object_parameters_to_json_string_fn)(struct json_object *o,
|
|
+ struct printbuf *pb);
|
|
+#endif
|
|
|
|
struct json_object
|
|
{
|
|
enum json_type o_type;
|
|
json_object_delete_fn *_delete;
|
|
json_object_to_json_string_fn *_to_json_string;
|
|
+#if 0 /* zyxel, john */
|
|
+ json_object_parameters_to_json_string_fn *_parameters_to_json_string;
|
|
+#endif
|
|
int _ref_count;
|
|
struct printbuf *_pb;
|
|
union data {
|
|
boolean c_boolean;
|
|
+#if JSON_SUPPORT_DOUBLE
|
|
double c_double;
|
|
+#endif
|
|
int c_int;
|
|
struct lh_table *c_object;
|
|
struct array_list *c_array;
|
|
diff -Naur json-c-0.9.orig/json_util.c json-c-0.9/json_util.c
|
|
--- json-c-0.9.orig/json_util.c 2009-02-25 10:09:09.000000000 +0800
|
|
+++ json-c-0.9/json_util.c 2013-06-03 16:53:25.000000000 +0800
|
|
@@ -116,7 +116,7 @@
|
|
/* because of the above check for ret < 0, we can safely cast and add */
|
|
wpos += (unsigned int)ret;
|
|
}
|
|
-
|
|
+ fsync(fd);
|
|
close(fd);
|
|
return 0;
|
|
}
|
|
diff -Naur json-c-0.9.orig/Makefile.in json-c-0.9/Makefile.in
|
|
--- json-c-0.9.orig/Makefile.in 2009-07-31 10:58:09.000000000 +0800
|
|
+++ json-c-0.9/Makefile.in 2013-03-07 10:05:18.000000000 +0800
|
|
@@ -254,7 +254,7 @@
|
|
test3_SOURCES = test3.c
|
|
test3_LDADD = $(lib_LTLIBRARIES)
|
|
all: config.h
|
|
- $(MAKE) $(AM_MAKEFLAGS) all-am
|
|
+ $(MAKE) $(AM_MAKEFLAGS) all-am install
|
|
|
|
.SUFFIXES:
|
|
.SUFFIXES: .c .lo .o .obj
|
|
@@ -302,7 +302,7 @@
|
|
@rm -f stamp-h1
|
|
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
|
$(srcdir)/config.h.in: $(am__configure_deps)
|
|
- cd $(top_srcdir) && $(AUTOHEADER)
|
|
+ #cd $(top_srcdir) && $(AUTOHEADER)
|
|
rm -f stamp-h1
|
|
touch $@
|
|
|
|
@@ -629,7 +629,7 @@
|
|
uninstall: uninstall-am
|
|
|
|
install-am: all-am
|
|
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
|
+ sudo $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
|
|
|
installcheck: installcheck-am
|
|
install-strip:
|