|
|
|
@ -3159,10 +3159,6 @@ else |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
ac_config_headers="$ac_config_headers config.h:config.in" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -3186,8 +3182,6 @@ ac_config_headers="$ac_config_headers config.h:config.in" |
|
|
|
|
|
|
|
ac_config_files="$ac_config_files Makefile" |
|
|
|
|
|
|
|
ac_config_commands="$ac_config_commands default" |
|
|
|
|
|
|
|
cat >confcache <<\_ACEOF |
|
|
|
# This file is a shell script that caches the results of configure |
|
|
|
# tests run on this system so they can be shared between configure |
|
|
|
@ -3278,7 +3272,43 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix |
|
|
|
# Let make expand exec_prefix. |
|
|
|
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' |
|
|
|
|
|
|
|
DEFS=-DHAVE_CONFIG_H |
|
|
|
# Transform confdefs.h into DEFS. |
|
|
|
# Protect against shell expansion while executing Makefile rules. |
|
|
|
# Protect against Makefile macro expansion. |
|
|
|
# |
|
|
|
# If the first sed substitution is executed (which looks for macros that |
|
|
|
# take arguments), then branch to the quote section. Otherwise, |
|
|
|
# look for a macro that doesn't take arguments. |
|
|
|
ac_script=' |
|
|
|
:mline |
|
|
|
/\\$/{ |
|
|
|
N |
|
|
|
s,\\\n,, |
|
|
|
b mline |
|
|
|
} |
|
|
|
t clear |
|
|
|
:clear |
|
|
|
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g |
|
|
|
t quote |
|
|
|
s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g |
|
|
|
t quote |
|
|
|
b any |
|
|
|
:quote |
|
|
|
s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g |
|
|
|
s/\[/\\&/g |
|
|
|
s/\]/\\&/g |
|
|
|
s/\$/$$/g |
|
|
|
H |
|
|
|
:any |
|
|
|
${ |
|
|
|
g |
|
|
|
s/^\n// |
|
|
|
s/\n/ /g |
|
|
|
p |
|
|
|
} |
|
|
|
' |
|
|
|
DEFS=`sed -n "$ac_script" confdefs.h` |
|
|
|
|
|
|
|
|
|
|
|
ac_libobjs= |
|
|
|
ac_ltlibobjs= |
|
|
|
@ -3712,16 +3742,11 @@ case $ac_config_files in *" |
|
|
|
"*) set x $ac_config_files; shift; ac_config_files=$*;; |
|
|
|
esac |
|
|
|
|
|
|
|
case $ac_config_headers in *" |
|
|
|
"*) set x $ac_config_headers; shift; ac_config_headers=$*;; |
|
|
|
esac |
|
|
|
|
|
|
|
|
|
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
|
|
|
# Files that config.status was made for. |
|
|
|
config_files="$ac_config_files" |
|
|
|
config_headers="$ac_config_headers" |
|
|
|
config_commands="$ac_config_commands" |
|
|
|
|
|
|
|
_ACEOF |
|
|
|
|
|
|
|
@ -3742,18 +3767,10 @@ Usage: $0 [OPTION]... [TAG]... |
|
|
|
--recheck update $as_me by reconfiguring in the same conditions |
|
|
|
--file=FILE[:TEMPLATE] |
|
|
|
instantiate the configuration file FILE |
|
|
|
--header=FILE[:TEMPLATE] |
|
|
|
instantiate the configuration header FILE |
|
|
|
|
|
|
|
Configuration files: |
|
|
|
$config_files |
|
|
|
|
|
|
|
Configuration headers: |
|
|
|
$config_headers |
|
|
|
|
|
|
|
Configuration commands: |
|
|
|
$config_commands |
|
|
|
|
|
|
|
Report bugs to the package provider." |
|
|
|
|
|
|
|
_ACEOF |
|
|
|
@ -3815,18 +3832,7 @@ do |
|
|
|
esac |
|
|
|
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 |
|
|
|
as_fn_append CONFIG_HEADERS " '$ac_optarg'" |
|
|
|
ac_need_defaults=false;; |
|
|
|
--he | --h) |
|
|
|
# Conflict between --help and --header |
|
|
|
as_fn_error $? "ambiguous option: \`$1' |
|
|
|
Try \`$0 --help' for more information.";; |
|
|
|
--help | --hel | -h ) |
|
|
|
--he | --h | --help | --hel | -h ) |
|
|
|
$as_echo "$ac_cs_usage"; exit ;; |
|
|
|
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
|
|
|
| -silent | --silent | --silen | --sile | --sil | --si | --s) |
|
|
|
@ -3882,9 +3888,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
|
|
|
for ac_config_target in $ac_config_targets |
|
|
|
do |
|
|
|
case $ac_config_target in |
|
|
|
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; |
|
|
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
|
|
|
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; |
|
|
|
|
|
|
|
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
|
|
|
esac |
|
|
|
@ -3897,8 +3901,6 @@ done |
|
|
|
# bizarre bug on SunOS 4.1.3. |
|
|
|
if $ac_need_defaults; then |
|
|
|
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files |
|
|
|
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers |
|
|
|
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands |
|
|
|
fi |
|
|
|
|
|
|
|
# Have a temporary directory for convenience. Make it in the build tree |
|
|
|
@ -4086,116 +4088,8 @@ fi |
|
|
|
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
|
|
|
fi # test -n "$CONFIG_FILES" |
|
|
|
|
|
|
|
# Set up the scripts for CONFIG_HEADERS section. |
|
|
|
# No need to generate them if there are no CONFIG_HEADERS. |
|
|
|
# This happens for instance with `./config.status Makefile'. |
|
|
|
if test -n "$CONFIG_HEADERS"; then |
|
|
|
cat >"$ac_tmp/defines.awk" <<\_ACAWK || |
|
|
|
BEGIN { |
|
|
|
_ACEOF |
|
|
|
|
|
|
|
# Transform confdefs.h into an awk script `defines.awk', embedded as |
|
|
|
# here-document in config.status, that substitutes the proper values into |
|
|
|
# config.h.in to produce config.h. |
|
|
|
|
|
|
|
# Create a delimiter string that does not exist in confdefs.h, to ease |
|
|
|
# handling of long lines. |
|
|
|
ac_delim='%!_!# ' |
|
|
|
for ac_last_try in false false :; do |
|
|
|
ac_tt=`sed -n "/$ac_delim/p" confdefs.h` |
|
|
|
if test -z "$ac_tt"; then |
|
|
|
break |
|
|
|
elif $ac_last_try; then |
|
|
|
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
|
|
|
else |
|
|
|
ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
|
|
|
fi |
|
|
|
done |
|
|
|
|
|
|
|
# For the awk script, D is an array of macro values keyed by name, |
|
|
|
# likewise P contains macro parameters if any. Preserve backslash |
|
|
|
# newline sequences. |
|
|
|
|
|
|
|
ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* |
|
|
|
sed -n ' |
|
|
|
s/.\{148\}/&'"$ac_delim"'/g |
|
|
|
t rset |
|
|
|
:rset |
|
|
|
s/^[ ]*#[ ]*define[ ][ ]*/ / |
|
|
|
t def |
|
|
|
d |
|
|
|
:def |
|
|
|
s/\\$// |
|
|
|
t bsnl |
|
|
|
s/["\\]/\\&/g |
|
|
|
s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ |
|
|
|
D["\1"]=" \3"/p |
|
|
|
s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p |
|
|
|
d |
|
|
|
:bsnl |
|
|
|
s/["\\]/\\&/g |
|
|
|
s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ |
|
|
|
D["\1"]=" \3\\\\\\n"\\/p |
|
|
|
t cont |
|
|
|
s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p |
|
|
|
t cont |
|
|
|
d |
|
|
|
:cont |
|
|
|
n |
|
|
|
s/.\{148\}/&'"$ac_delim"'/g |
|
|
|
t clear |
|
|
|
:clear |
|
|
|
s/\\$// |
|
|
|
t bsnlc |
|
|
|
s/["\\]/\\&/g; s/^/"/; s/$/"/p |
|
|
|
d |
|
|
|
:bsnlc |
|
|
|
s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p |
|
|
|
b cont |
|
|
|
' <confdefs.h | sed ' |
|
|
|
s/'"$ac_delim"'/"\\\ |
|
|
|
"/g' >>$CONFIG_STATUS || ac_write_fail=1 |
|
|
|
|
|
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
|
|
|
for (key in D) D_is_set[key] = 1 |
|
|
|
FS = "" |
|
|
|
} |
|
|
|
/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { |
|
|
|
line = \$ 0 |
|
|
|
split(line, arg, " ") |
|
|
|
if (arg[1] == "#") { |
|
|
|
defundef = arg[2] |
|
|
|
mac1 = arg[3] |
|
|
|
} else { |
|
|
|
defundef = substr(arg[1], 2) |
|
|
|
mac1 = arg[2] |
|
|
|
} |
|
|
|
split(mac1, mac2, "(") #) |
|
|
|
macro = mac2[1] |
|
|
|
prefix = substr(line, 1, index(line, defundef) - 1) |
|
|
|
if (D_is_set[macro]) { |
|
|
|
# Preserve the white space surrounding the "#". |
|
|
|
print prefix "define", macro P[macro] D[macro] |
|
|
|
next |
|
|
|
} else { |
|
|
|
# Replace #undef with comments. This is necessary, for example, |
|
|
|
# in the case of _POSIX_SOURCE, which is predefined and required |
|
|
|
# on some systems where configure will not decide to define it. |
|
|
|
if (defundef == "undef") { |
|
|
|
print "/*", prefix defundef, macro, "*/" |
|
|
|
next |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
{ print } |
|
|
|
_ACAWK |
|
|
|
_ACEOF |
|
|
|
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
|
|
|
as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 |
|
|
|
fi # test -n "$CONFIG_HEADERS" |
|
|
|
|
|
|
|
|
|
|
|
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" |
|
|
|
eval set X " :F $CONFIG_FILES " |
|
|
|
shift |
|
|
|
for ac_tag |
|
|
|
do |
|
|
|
@ -4408,41 +4302,11 @@ which seems to be undefined. Please make sure it is defined" >&2;} |
|
|
|
esac \ |
|
|
|
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
|
|
|
;; |
|
|
|
:H) |
|
|
|
# |
|
|
|
# CONFIG_HEADER |
|
|
|
# |
|
|
|
if test x"$ac_file" != x-; then |
|
|
|
{ |
|
|
|
$as_echo "/* $configure_input */" \ |
|
|
|
&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" |
|
|
|
} >"$ac_tmp/config.h" \ |
|
|
|
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
|
|
|
if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then |
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
|
|
|
$as_echo "$as_me: $ac_file is unchanged" >&6;} |
|
|
|
else |
|
|
|
rm -f "$ac_file" |
|
|
|
mv "$ac_tmp/config.h" "$ac_file" \ |
|
|
|
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
|
|
|
fi |
|
|
|
else |
|
|
|
$as_echo "/* $configure_input */" \ |
|
|
|
&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ |
|
|
|
|| as_fn_error $? "could not create -" "$LINENO" 5 |
|
|
|
fi |
|
|
|
;; |
|
|
|
|
|
|
|
:C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 |
|
|
|
$as_echo "$as_me: executing $ac_file commands" >&6;} |
|
|
|
;; |
|
|
|
esac |
|
|
|
|
|
|
|
|
|
|
|
case $ac_file$ac_mode in |
|
|
|
"default":C) case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac ;; |
|
|
|
|
|
|
|
esac |
|
|
|
|
|
|
|
done # for ac_tag |
|
|
|
|
|
|
|
|
|
|
|
|
Mike Frysinger
2 years ago