e4398d330a
Pointed out in PR 35492.
507 lines
18 KiB
Text
507 lines
18 KiB
Text
$NetBSD: patch-ag,v 1.6 2007/01/30 02:45:33 obache Exp $
|
|
|
|
--- configure.orig 2006-03-17 06:26:16.000000000 +0100
|
|
+++ configure
|
|
@@ -954,7 +954,7 @@ esac
|
|
else
|
|
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
|
fi
|
|
- cd "$ac_popdir"
|
|
+ cd $ac_popdir
|
|
done
|
|
fi
|
|
|
|
@@ -1885,7 +1885,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -1943,7 +1944,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2059,7 +2061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2113,7 +2116,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2158,7 +2162,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -2202,7 +2207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3102,12 +3108,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
|
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
|
|
|
-
|
|
-if test "x$ac_path_x_has_been_run" != xyes; then
|
|
- echo "$as_me:$LINENO: checking for X" >&5
|
|
+echo "$as_me:$LINENO: checking for X" >&5
|
|
echo $ECHO_N "checking for X... $ECHO_C" >&6
|
|
|
|
-ac_path_x_has_been_run=yes
|
|
|
|
# Check whether --with-x or --without-x was given.
|
|
if test "${with_x+set}" = set; then
|
|
@@ -3200,7 +3203,7 @@ ac_x_header_dirs='
|
|
/usr/openwin/share/include'
|
|
|
|
if test "$ac_x_includes" = no; then
|
|
- # Guess where to find include files, by looking for a specified header file.
|
|
+ # Guess where to find include files, by looking for Intrinsic.h.
|
|
# First, try using that file with no special directory specified.
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
@@ -3274,7 +3277,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3334,15 +3338,10 @@ else
|
|
# Update the cache value to reflect the command line values.
|
|
ac_cv_have_x="have_x=yes \
|
|
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
|
|
- # It might be that x_includes is empty (headers are found in the
|
|
- # standard search path. Then output the corresponding message
|
|
- ac_out_x_includes=$x_includes
|
|
- test "x$x_includes" = x && ac_out_x_includes="in standard search path"
|
|
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
|
|
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
|
|
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
|
|
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
|
|
fi
|
|
|
|
-fi
|
|
if test "$no_x" = yes; then
|
|
# Not all programs may use this symbol, but it does not hurt to define it.
|
|
|
|
@@ -3390,7 +3389,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3441,7 +3441,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3517,7 +3518,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3572,7 +3574,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3640,7 +3643,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3748,7 +3752,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3812,7 +3817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3880,7 +3886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -3984,7 +3991,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4048,7 +4056,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4145,7 +4154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4209,7 +4219,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4306,7 +4317,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4370,7 +4382,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -4449,7 +4462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -5136,6 +5150,48 @@ done
|
|
|
|
|
|
|
|
+for ac_prog in gawk mawk nawk awk
|
|
+do
|
|
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
+set dummy $ac_prog; ac_word=$2
|
|
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
+if test "${ac_cv_prog_AWK+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ if test -n "$AWK"; then
|
|
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
|
+else
|
|
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
+for as_dir in $PATH
|
|
+do
|
|
+ IFS=$as_save_IFS
|
|
+ test -z "$as_dir" && as_dir=.
|
|
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ ac_cv_prog_AWK="$ac_prog"
|
|
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
+ break 2
|
|
+ fi
|
|
+done
|
|
+done
|
|
+
|
|
+fi
|
|
+fi
|
|
+AWK=$ac_cv_prog_AWK
|
|
+if test -n "$AWK"; then
|
|
+ echo "$as_me:$LINENO: result: $AWK" >&5
|
|
+echo "${ECHO_T}$AWK" >&6
|
|
+else
|
|
+ echo "$as_me:$LINENO: result: no" >&5
|
|
+echo "${ECHO_T}no" >&6
|
|
+fi
|
|
+
|
|
+ test -n "$AWK" && break
|
|
+done
|
|
+
|
|
+
|
|
+
|
|
if test -e main/audio/NOINSTALL ; then
|
|
|
|
STATUS=noinstall
|
|
@@ -5194,7 +5250,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -5364,7 +5421,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -5427,7 +5485,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -5721,7 +5780,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -5874,7 +5934,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6007,7 +6068,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6082,7 +6144,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6160,7 +6223,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6252,7 +6316,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6405,7 +6470,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6483,7 +6549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6636,7 +6703,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6715,7 +6783,7 @@ else
|
|
echo "${ECHO_T}no" >&6
|
|
fi
|
|
|
|
- if test $HAVE_MAGICKXX ; then
|
|
+ if test $HAVE_MAGICKXX = yes ; then
|
|
STATUS="$STATUS, ImageMagick++"
|
|
|
|
DEFHAVE_MAGICKXX="HAVE_MAGICKXX=1"
|
|
@@ -6771,7 +6839,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -6859,7 +6928,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -7002,7 +7072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
|
|
cat conftest.err >&5
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); } &&
|
|
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
|
+ { ac_try='test -z "$ac_c_werror_flag"
|
|
+ || test ! -s conftest.err'
|
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
|
(eval $ac_try) 2>&5
|
|
ac_status=$?
|
|
@@ -8891,6 +8962,11 @@ esac
|
|
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
|
|
esac
|
|
|
|
+ if test x"$ac_file" != x-; then
|
|
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
+echo "$as_me: creating $ac_file" >&6;}
|
|
+ rm -f "$ac_file"
|
|
+ fi
|
|
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
|
# use $as_me), people would be surprised to read:
|
|
# /* config.h. Generated by config.status. */
|
|
@@ -8929,12 +9005,6 @@ echo "$as_me: error: cannot find input f
|
|
fi;;
|
|
esac
|
|
done` || { (exit 1); exit 1; }
|
|
-
|
|
- if test x"$ac_file" != x-; then
|
|
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
|
-echo "$as_me: creating $ac_file" >&6;}
|
|
- rm -f "$ac_file"
|
|
- fi
|
|
_ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF
|
|
sed "$ac_vpsub
|