Search
lxdream.org :: lxdream/configure :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure
changeset 658:f5926310bfbe
prev657:c4143facbfcb
next660:d1b2695347c6
author nkeynes
date Wed Apr 16 12:43:52 2008 +0000 (16 years ago)
permissions -rw-r--r--
last change Start removing X11isms from gtkui into drivers
Overhaul the configure rules for figuring out the video driver
file annotate diff log raw
1.1 --- a/configure Wed Apr 16 10:12:12 2008 +0000
1.2 +++ b/configure Wed Apr 16 12:43:52 2008 +0000
1.3 @@ -1,9 +1,9 @@
1.4 #! /bin/sh
1.5 # Guess values for system-dependent variables and create Makefiles.
1.6 -# Generated by GNU Autoconf 2.61.
1.7 +# Generated by GNU Autoconf 2.62.
1.8 #
1.9 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1.10 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1.11 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1.12 # This configure script is free software; the Free Software Foundation
1.13 # gives unlimited permission to copy, distribute and modify it.
1.14 ## --------------------- ##
1.15 @@ -15,7 +15,7 @@
1.16 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1.17 emulate sh
1.18 NULLCMD=:
1.19 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1.20 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1.21 # is contrary to our usage. Disable this feature.
1.22 alias -g '${1+"$@"}'='"$@"'
1.23 setopt NO_GLOB_SUBST
1.24 @@ -37,17 +37,45 @@
1.25 as_cr_digits='0123456789'
1.26 as_cr_alnum=$as_cr_Letters$as_cr_digits
1.27
1.28 +as_nl='
1.29 +'
1.30 +export as_nl
1.31 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
1.32 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1.33 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
1.34 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
1.35 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1.36 + as_echo='printf %s\n'
1.37 + as_echo_n='printf %s'
1.38 +else
1.39 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
1.40 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
1.41 + as_echo_n='/usr/ucb/echo -n'
1.42 + else
1.43 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
1.44 + as_echo_n_body='eval
1.45 + arg=$1;
1.46 + case $arg in
1.47 + *"$as_nl"*)
1.48 + expr "X$arg" : "X\\(.*\\)$as_nl";
1.49 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
1.50 + esac;
1.51 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
1.52 + '
1.53 + export as_echo_n_body
1.54 + as_echo_n='sh -c $as_echo_n_body as_echo'
1.55 + fi
1.56 + export as_echo_body
1.57 + as_echo='sh -c $as_echo_body as_echo'
1.58 +fi
1.59 +
1.60 # The user is always right.
1.61 if test "${PATH_SEPARATOR+set}" != set; then
1.62 - echo "#! /bin/sh" >conf$$.sh
1.63 - echo "exit 0" >>conf$$.sh
1.64 - chmod +x conf$$.sh
1.65 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
1.66 - PATH_SEPARATOR=';'
1.67 - else
1.68 - PATH_SEPARATOR=:
1.69 - fi
1.70 - rm -f conf$$.sh
1.71 + PATH_SEPARATOR=:
1.72 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
1.73 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
1.74 + PATH_SEPARATOR=';'
1.75 + }
1.76 fi
1.77
1.78 # Support unset when possible.
1.79 @@ -63,8 +91,6 @@
1.80 # there to prevent editors from complaining about space-tab.
1.81 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
1.82 # splitting by setting IFS to empty value.)
1.83 -as_nl='
1.84 -'
1.85 IFS=" "" $as_nl"
1.86
1.87 # Find who we are. Look in the path if we contain no directory separator.
1.88 @@ -87,7 +113,7 @@
1.89 as_myself=$0
1.90 fi
1.91 if test ! -f "$as_myself"; then
1.92 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1.93 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1.94 { (exit 1); exit 1; }
1.95 fi
1.96
1.97 @@ -100,17 +126,10 @@
1.98 PS4='+ '
1.99
1.100 # NLS nuisances.
1.101 -for as_var in \
1.102 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
1.103 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
1.104 - LC_TELEPHONE LC_TIME
1.105 -do
1.106 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
1.107 - eval $as_var=C; export $as_var
1.108 - else
1.109 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1.110 - fi
1.111 -done
1.112 +LC_ALL=C
1.113 +export LC_ALL
1.114 +LANGUAGE=C
1.115 +export LANGUAGE
1.116
1.117 # Required to use basename.
1.118 if expr a : '\(a\)' >/dev/null 2>&1 &&
1.119 @@ -132,7 +151,7 @@
1.120 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1.121 X"$0" : 'X\(//\)$' \| \
1.122 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1.123 -echo X/"$0" |
1.124 +$as_echo X/"$0" |
1.125 sed '/^.*\/\([^/][^/]*\)\/*$/{
1.126 s//\1/
1.127 q
1.128 @@ -158,7 +177,7 @@
1.129 as_have_required=no
1.130 fi
1.131
1.132 - if test $as_have_required = yes && (eval ":
1.133 + if test $as_have_required = yes && (eval ":
1.134 (as_func_return () {
1.135 (exit \$1)
1.136 }
1.137 @@ -240,7 +259,7 @@
1.138 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1.139 emulate sh
1.140 NULLCMD=:
1.141 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1.142 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1.143 # is contrary to our usage. Disable this feature.
1.144 alias -g '${1+"$@"}'='"$@"'
1.145 setopt NO_GLOB_SUBST
1.146 @@ -261,7 +280,7 @@
1.147 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1.148 emulate sh
1.149 NULLCMD=:
1.150 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1.151 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1.152 # is contrary to our usage. Disable this feature.
1.153 alias -g '${1+"$@"}'='"$@"'
1.154 setopt NO_GLOB_SUBST
1.155 @@ -341,10 +360,10 @@
1.156
1.157 if test "x$CONFIG_SHELL" != x; then
1.158 for as_var in BASH_ENV ENV
1.159 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1.160 - done
1.161 - export CONFIG_SHELL
1.162 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1.163 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1.164 + done
1.165 + export CONFIG_SHELL
1.166 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1.167 fi
1.168
1.169
1.170 @@ -413,9 +432,10 @@
1.171
1.172 test \$exitcode = 0") || {
1.173 echo No shell found that supports shell functions.
1.174 - echo Please tell autoconf@gnu.org about your system,
1.175 - echo including any error possibly output before this
1.176 - echo message
1.177 + echo Please tell bug-autoconf@gnu.org about your system,
1.178 + echo including any error possibly output before this message.
1.179 + echo This can help us improve future autoconf versions.
1.180 + echo Configuration will now proceed without shell functions.
1.181 }
1.182
1.183
1.184 @@ -451,7 +471,7 @@
1.185 s/-\n.*//
1.186 ' >$as_me.lineno &&
1.187 chmod +x "$as_me.lineno" ||
1.188 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1.189 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1.190 { (exit 1); exit 1; }; }
1.191
1.192 # Don't try to exec as it changes $[0], causing all sort of problems
1.193 @@ -479,7 +499,6 @@
1.194 *)
1.195 ECHO_N='-n';;
1.196 esac
1.197 -
1.198 if expr a : '\(a\)' >/dev/null 2>&1 &&
1.199 test "X`expr 00001 : '.*\(...\)'`" = X001; then
1.200 as_expr=expr
1.201 @@ -492,19 +511,22 @@
1.202 rm -f conf$$.dir/conf$$.file
1.203 else
1.204 rm -f conf$$.dir
1.205 - mkdir conf$$.dir
1.206 -fi
1.207 -echo >conf$$.file
1.208 -if ln -s conf$$.file conf$$ 2>/dev/null; then
1.209 - as_ln_s='ln -s'
1.210 - # ... but there are two gotchas:
1.211 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1.212 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1.213 - # In both cases, we have to default to `cp -p'.
1.214 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1.215 + mkdir conf$$.dir 2>/dev/null
1.216 +fi
1.217 +if (echo >conf$$.file) 2>/dev/null; then
1.218 + if ln -s conf$$.file conf$$ 2>/dev/null; then
1.219 + as_ln_s='ln -s'
1.220 + # ... but there are two gotchas:
1.221 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1.222 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1.223 + # In both cases, we have to default to `cp -p'.
1.224 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1.225 + as_ln_s='cp -p'
1.226 + elif ln conf$$.file conf$$ 2>/dev/null; then
1.227 + as_ln_s=ln
1.228 + else
1.229 as_ln_s='cp -p'
1.230 -elif ln conf$$.file conf$$ 2>/dev/null; then
1.231 - as_ln_s=ln
1.232 + fi
1.233 else
1.234 as_ln_s='cp -p'
1.235 fi
1.236 @@ -529,10 +551,10 @@
1.237 as_test_x='
1.238 eval sh -c '\''
1.239 if test -d "$1"; then
1.240 - test -d "$1/.";
1.241 + test -d "$1/.";
1.242 else
1.243 case $1 in
1.244 - -*)set "./$1";;
1.245 + -*)set "./$1";;
1.246 esac;
1.247 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
1.248 ???[sx]*):;;*)false;;esac;fi
1.249 @@ -661,13 +683,16 @@
1.250 AUTOMAKE
1.251 AUTOHEADER
1.252 MAKEINFO
1.253 -AMTAR
1.254 install_sh
1.255 STRIP
1.256 INSTALL_STRIP_PROGRAM
1.257 +mkdir_p
1.258 AWK
1.259 SET_MAKE
1.260 am__leading_dot
1.261 +AMTAR
1.262 +am__tar
1.263 +am__untar
1.264 MAINTAINER_MODE_TRUE
1.265 MAINTAINER_MODE_FALSE
1.266 MAINT
1.267 @@ -700,17 +725,21 @@
1.268 host_cpu
1.269 host_vendor
1.270 host_os
1.271 -OSMESA_DRIVER_TRUE
1.272 -OSMESA_DRIVER_FALSE
1.273 +GUI_CARBON_TRUE
1.274 +GUI_CARBON_FALSE
1.275 PKG_CONFIG
1.276 LIBPNG_CFLAGS
1.277 LIBPNG_LIBS
1.278 GTK_CFLAGS
1.279 GTK_LIBS
1.280 -GUI_CARBON_TRUE
1.281 -GUI_CARBON_FALSE
1.282 GUI_GTK_TRUE
1.283 GUI_GTK_FALSE
1.284 +VIDEO_OSMESA_TRUE
1.285 +VIDEO_OSMESA_FALSE
1.286 +VIDEO_GLX_TRUE
1.287 +VIDEO_GLX_FALSE
1.288 +VIDEO_NSGL_TRUE
1.289 +VIDEO_NSGL_FALSE
1.290 BUILD_SH4X86_TRUE
1.291 BUILD_SH4X86_FALSE
1.292 BUILD_X86_64_TRUE
1.293 @@ -761,6 +790,14 @@
1.294 LIBOBJS
1.295 LTLIBOBJS'
1.296 ac_subst_files=''
1.297 +ac_user_opts='
1.298 +enable_option_checking
1.299 +enable_maintainer_mode
1.300 +enable_dependency_tracking
1.301 +enable_trace
1.302 +enable_watch
1.303 +with_osmesa
1.304 +'
1.305 ac_precious_vars='build_alias
1.306 host_alias
1.307 target_alias
1.308 @@ -769,6 +806,8 @@
1.309 LDFLAGS
1.310 LIBS
1.311 CPPFLAGS
1.312 +CCAS
1.313 +CCASFLAGS
1.314 CPP
1.315 PKG_CONFIG
1.316 LIBPNG_CFLAGS
1.317 @@ -786,6 +825,8 @@
1.318 # Initialize some variables set by options.
1.319 ac_init_help=
1.320 ac_init_version=false
1.321 +ac_unrecognized_opts=
1.322 +ac_unrecognized_sep=
1.323 # The variables have the same names as the options, with
1.324 # dashes changed to underlines.
1.325 cache_file=/dev/null
1.326 @@ -884,13 +925,21 @@
1.327 datarootdir=$ac_optarg ;;
1.328
1.329 -disable-* | --disable-*)
1.330 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1.331 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1.332 # Reject names that are not valid shell variable names.
1.333 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.334 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1.335 - { (exit 1); exit 1; }; }
1.336 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1.337 - eval enable_$ac_feature=no ;;
1.338 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1.339 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
1.340 + { (exit 1); exit 1; }; }
1.341 + ac_useropt_orig=$ac_useropt
1.342 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1.343 + case $ac_user_opts in
1.344 + *"
1.345 +"enable_$ac_useropt"
1.346 +"*) ;;
1.347 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
1.348 + ac_unrecognized_sep=', ';;
1.349 + esac
1.350 + eval enable_$ac_useropt=no ;;
1.351
1.352 -docdir | --docdir | --docdi | --doc | --do)
1.353 ac_prev=docdir ;;
1.354 @@ -903,13 +952,21 @@
1.355 dvidir=$ac_optarg ;;
1.356
1.357 -enable-* | --enable-*)
1.358 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1.359 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1.360 # Reject names that are not valid shell variable names.
1.361 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.362 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1.363 - { (exit 1); exit 1; }; }
1.364 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1.365 - eval enable_$ac_feature=\$ac_optarg ;;
1.366 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1.367 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
1.368 + { (exit 1); exit 1; }; }
1.369 + ac_useropt_orig=$ac_useropt
1.370 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1.371 + case $ac_user_opts in
1.372 + *"
1.373 +"enable_$ac_useropt"
1.374 +"*) ;;
1.375 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
1.376 + ac_unrecognized_sep=', ';;
1.377 + esac
1.378 + eval enable_$ac_useropt=\$ac_optarg ;;
1.379
1.380 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
1.381 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
1.382 @@ -1100,22 +1157,38 @@
1.383 ac_init_version=: ;;
1.384
1.385 -with-* | --with-*)
1.386 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1.387 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1.388 # Reject names that are not valid shell variable names.
1.389 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.390 - { echo "$as_me: error: invalid package name: $ac_package" >&2
1.391 - { (exit 1); exit 1; }; }
1.392 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1.393 - eval with_$ac_package=\$ac_optarg ;;
1.394 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1.395 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1.396 + { (exit 1); exit 1; }; }
1.397 + ac_useropt_orig=$ac_useropt
1.398 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1.399 + case $ac_user_opts in
1.400 + *"
1.401 +"with_$ac_useropt"
1.402 +"*) ;;
1.403 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
1.404 + ac_unrecognized_sep=', ';;
1.405 + esac
1.406 + eval with_$ac_useropt=\$ac_optarg ;;
1.407
1.408 -without-* | --without-*)
1.409 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1.410 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1.411 # Reject names that are not valid shell variable names.
1.412 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.413 - { echo "$as_me: error: invalid package name: $ac_package" >&2
1.414 - { (exit 1); exit 1; }; }
1.415 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1.416 - eval with_$ac_package=no ;;
1.417 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1.418 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
1.419 + { (exit 1); exit 1; }; }
1.420 + ac_useropt_orig=$ac_useropt
1.421 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1.422 + case $ac_user_opts in
1.423 + *"
1.424 +"with_$ac_useropt"
1.425 +"*) ;;
1.426 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
1.427 + ac_unrecognized_sep=', ';;
1.428 + esac
1.429 + eval with_$ac_useropt=no ;;
1.430
1.431 --x)
1.432 # Obsolete; use --with-x.
1.433 @@ -1135,7 +1208,7 @@
1.434 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1.435 x_libraries=$ac_optarg ;;
1.436
1.437 - -*) { echo "$as_me: error: unrecognized option: $ac_option
1.438 + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
1.439 Try \`$0 --help' for more information." >&2
1.440 { (exit 1); exit 1; }; }
1.441 ;;
1.442 @@ -1144,16 +1217,16 @@
1.443 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
1.444 # Reject names that are not valid shell variable names.
1.445 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1.446 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1.447 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1.448 { (exit 1); exit 1; }; }
1.449 eval $ac_envvar=\$ac_optarg
1.450 export $ac_envvar ;;
1.451
1.452 *)
1.453 # FIXME: should be removed in autoconf 3.0.
1.454 - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1.455 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1.456 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.457 - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1.458 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1.459 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1.460 ;;
1.461
1.462 @@ -1162,22 +1235,38 @@
1.463
1.464 if test -n "$ac_prev"; then
1.465 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1.466 - { echo "$as_me: error: missing argument to $ac_option" >&2
1.467 - { (exit 1); exit 1; }; }
1.468 -fi
1.469 -
1.470 -# Be sure to have absolute directory names.
1.471 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2
1.472 + { (exit 1); exit 1; }; }
1.473 +fi
1.474 +
1.475 +if test -n "$ac_unrecognized_opts"; then
1.476 + case $enable_option_checking in
1.477 + no) ;;
1.478 + fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
1.479 + { (exit 1); exit 1; }; } ;;
1.480 + *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
1.481 + esac
1.482 +fi
1.483 +
1.484 +# Check all directory arguments for consistency.
1.485 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1.486 datadir sysconfdir sharedstatedir localstatedir includedir \
1.487 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1.488 libdir localedir mandir
1.489 do
1.490 eval ac_val=\$$ac_var
1.491 + # Remove trailing slashes.
1.492 + case $ac_val in
1.493 + */ )
1.494 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
1.495 + eval $ac_var=\$ac_val;;
1.496 + esac
1.497 + # Be sure to have absolute directory names.
1.498 case $ac_val in
1.499 [\\/$]* | ?:[\\/]* ) continue;;
1.500 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1.501 esac
1.502 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1.503 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
1.504 { (exit 1); exit 1; }; }
1.505 done
1.506
1.507 @@ -1192,7 +1281,7 @@
1.508 if test "x$host_alias" != x; then
1.509 if test "x$build_alias" = x; then
1.510 cross_compiling=maybe
1.511 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1.512 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1.513 If a cross compiler is detected then cross compile mode will be used." >&2
1.514 elif test "x$build_alias" != "x$host_alias"; then
1.515 cross_compiling=yes
1.516 @@ -1208,10 +1297,10 @@
1.517 ac_pwd=`pwd` && test -n "$ac_pwd" &&
1.518 ac_ls_di=`ls -di .` &&
1.519 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1.520 - { echo "$as_me: error: Working directory cannot be determined" >&2
1.521 + { $as_echo "$as_me: error: Working directory cannot be determined" >&2
1.522 { (exit 1); exit 1; }; }
1.523 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1.524 - { echo "$as_me: error: pwd does not report name of working directory" >&2
1.525 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
1.526 { (exit 1); exit 1; }; }
1.527
1.528
1.529 @@ -1219,12 +1308,12 @@
1.530 if test -z "$srcdir"; then
1.531 ac_srcdir_defaulted=yes
1.532 # Try the directory containing this script, then the parent directory.
1.533 - ac_confdir=`$as_dirname -- "$0" ||
1.534 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1.535 - X"$0" : 'X\(//\)[^/]' \| \
1.536 - X"$0" : 'X\(//\)$' \| \
1.537 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1.538 -echo X"$0" |
1.539 + ac_confdir=`$as_dirname -- "$as_myself" ||
1.540 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1.541 + X"$as_myself" : 'X\(//\)[^/]' \| \
1.542 + X"$as_myself" : 'X\(//\)$' \| \
1.543 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
1.544 +$as_echo X"$as_myself" |
1.545 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.546 s//\1/
1.547 q
1.548 @@ -1251,12 +1340,12 @@
1.549 fi
1.550 if test ! -r "$srcdir/$ac_unique_file"; then
1.551 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1.552 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1.553 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1.554 { (exit 1); exit 1; }; }
1.555 fi
1.556 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1.557 ac_abs_confdir=`(
1.558 - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
1.559 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
1.560 { (exit 1); exit 1; }; }
1.561 pwd)`
1.562 # When building in place, set srcdir=.
1.563 @@ -1305,9 +1394,9 @@
1.564
1.565 Installation directories:
1.566 --prefix=PREFIX install architecture-independent files in PREFIX
1.567 - [$ac_default_prefix]
1.568 + [$ac_default_prefix]
1.569 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
1.570 - [PREFIX]
1.571 + [PREFIX]
1.572
1.573 By default, \`make install' will install all the files in
1.574 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
1.575 @@ -1317,25 +1406,25 @@
1.576 For better control, use the options below.
1.577
1.578 Fine tuning of the installation directories:
1.579 - --bindir=DIR user executables [EPREFIX/bin]
1.580 - --sbindir=DIR system admin executables [EPREFIX/sbin]
1.581 - --libexecdir=DIR program executables [EPREFIX/libexec]
1.582 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1.583 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1.584 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1.585 - --libdir=DIR object code libraries [EPREFIX/lib]
1.586 - --includedir=DIR C header files [PREFIX/include]
1.587 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
1.588 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1.589 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1.590 - --infodir=DIR info documentation [DATAROOTDIR/info]
1.591 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1.592 - --mandir=DIR man documentation [DATAROOTDIR/man]
1.593 - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
1.594 - --htmldir=DIR html documentation [DOCDIR]
1.595 - --dvidir=DIR dvi documentation [DOCDIR]
1.596 - --pdfdir=DIR pdf documentation [DOCDIR]
1.597 - --psdir=DIR ps documentation [DOCDIR]
1.598 + --bindir=DIR user executables [EPREFIX/bin]
1.599 + --sbindir=DIR system admin executables [EPREFIX/sbin]
1.600 + --libexecdir=DIR program executables [EPREFIX/libexec]
1.601 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1.602 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1.603 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1.604 + --libdir=DIR object code libraries [EPREFIX/lib]
1.605 + --includedir=DIR C header files [PREFIX/include]
1.606 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
1.607 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1.608 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1.609 + --infodir=DIR info documentation [DATAROOTDIR/info]
1.610 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1.611 + --mandir=DIR man documentation [DATAROOTDIR/man]
1.612 + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
1.613 + --htmldir=DIR html documentation [DOCDIR]
1.614 + --dvidir=DIR dvi documentation [DOCDIR]
1.615 + --pdfdir=DIR pdf documentation [DOCDIR]
1.616 + --psdir=DIR ps documentation [DOCDIR]
1.617 _ACEOF
1.618
1.619 cat <<\_ACEOF
1.620 @@ -1356,12 +1445,13 @@
1.621 cat <<\_ACEOF
1.622
1.623 Optional Features:
1.624 + --disable-option-checking ignore unrecognized --enable/--with options
1.625 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1.626 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1.627 - --enable-maintainer-mode enable make rules and dependencies not useful
1.628 - (and sometimes confusing) to the casual installer
1.629 - --disable-dependency-tracking Speeds up one-time builds
1.630 - --enable-dependency-tracking Do not reject slow dependency extractors
1.631 + --enable-maintainer-mode enable make rules and dependencies not useful
1.632 + (and sometimes confusing) to the casual installer
1.633 + --disable-dependency-tracking speeds up one-time build
1.634 + --enable-dependency-tracking do not reject slow dependency extractors
1.635 --enable-trace Enable generation of IO traces (warning: hurts
1.636 performance)
1.637 --enable-watch Enable watchpoints in the debugger (warning: hurts
1.638 @@ -1381,6 +1471,8 @@
1.639 LIBS libraries to pass to the linker, e.g. -l<library>
1.640 CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
1.641 you have headers in a nonstandard directory <include dir>
1.642 + CCAS assembler compiler command (defaults to CC)
1.643 + CCASFLAGS assembler compiler flags (defaults to CFLAGS)
1.644 CPP C preprocessor
1.645 PKG_CONFIG path to pkg-config utility
1.646 LIBPNG_CFLAGS
1.647 @@ -1407,15 +1499,17 @@
1.648 if test "$ac_init_help" = "recursive"; then
1.649 # If there are subdirs, report their specific --help.
1.650 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
1.651 - test -d "$ac_dir" || continue
1.652 + test -d "$ac_dir" ||
1.653 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
1.654 + continue
1.655 ac_builddir=.
1.656
1.657 case "$ac_dir" in
1.658 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1.659 *)
1.660 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
1.661 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
1.662 # A ".." for each directory in $ac_dir_suffix.
1.663 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
1.664 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
1.665 case $ac_top_builddir_sub in
1.666 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
1.667 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
1.668 @@ -1451,7 +1545,7 @@
1.669 echo &&
1.670 $SHELL "$ac_srcdir/configure" --help=recursive
1.671 else
1.672 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1.673 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1.674 fi || ac_status=$?
1.675 cd "$ac_pwd" || { ac_status=$?; break; }
1.676 done
1.677 @@ -1461,10 +1555,10 @@
1.678 if $ac_init_version; then
1.679 cat <<\_ACEOF
1.680 configure
1.681 -generated by GNU Autoconf 2.61
1.682 +generated by GNU Autoconf 2.62
1.683
1.684 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1.685 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1.686 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1.687 This configure script is free software; the Free Software Foundation
1.688 gives unlimited permission to copy, distribute and modify it.
1.689 _ACEOF
1.690 @@ -1475,7 +1569,7 @@
1.691 running configure, to aid debugging if configure makes a mistake.
1.692
1.693 It was created by $as_me, which was
1.694 -generated by GNU Autoconf 2.61. Invocation command line was
1.695 +generated by GNU Autoconf 2.62. Invocation command line was
1.696
1.697 $ $0 $@
1.698
1.699 @@ -1511,7 +1605,7 @@
1.700 do
1.701 IFS=$as_save_IFS
1.702 test -z "$as_dir" && as_dir=.
1.703 - echo "PATH: $as_dir"
1.704 + $as_echo "PATH: $as_dir"
1.705 done
1.706 IFS=$as_save_IFS
1.707
1.708 @@ -1546,7 +1640,7 @@
1.709 | -silent | --silent | --silen | --sile | --sil)
1.710 continue ;;
1.711 *\'*)
1.712 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1.713 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1.714 esac
1.715 case $ac_pass in
1.716 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1.717 @@ -1598,11 +1692,12 @@
1.718 case $ac_val in #(
1.719 *${as_nl}*)
1.720 case $ac_var in #(
1.721 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
1.722 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
1.723 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
1.724 +$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
1.725 esac
1.726 case $ac_var in #(
1.727 _ | IFS | as_nl) ;; #(
1.728 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1.729 *) $as_unset $ac_var ;;
1.730 esac ;;
1.731 esac
1.732 @@ -1632,9 +1727,9 @@
1.733 do
1.734 eval ac_val=\$$ac_var
1.735 case $ac_val in
1.736 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1.737 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1.738 esac
1.739 - echo "$ac_var='\''$ac_val'\''"
1.740 + $as_echo "$ac_var='\''$ac_val'\''"
1.741 done | sort
1.742 echo
1.743
1.744 @@ -1649,9 +1744,9 @@
1.745 do
1.746 eval ac_val=\$$ac_var
1.747 case $ac_val in
1.748 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1.749 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1.750 esac
1.751 - echo "$ac_var='\''$ac_val'\''"
1.752 + $as_echo "$ac_var='\''$ac_val'\''"
1.753 done | sort
1.754 echo
1.755 fi
1.756 @@ -1667,8 +1762,8 @@
1.757 echo
1.758 fi
1.759 test "$ac_signal" != 0 &&
1.760 - echo "$as_me: caught signal $ac_signal"
1.761 - echo "$as_me: exit $exit_status"
1.762 + $as_echo "$as_me: caught signal $ac_signal"
1.763 + $as_echo "$as_me: exit $exit_status"
1.764 } >&5
1.765 rm -f core *.core core.conftest.* &&
1.766 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
1.767 @@ -1710,21 +1805,24 @@
1.768
1.769
1.770 # Let the site file select an alternate cache file if it wants to.
1.771 -# Prefer explicitly selected file to automatically selected ones.
1.772 +# Prefer an explicitly selected file to automatically selected ones.
1.773 +ac_site_file1=NONE
1.774 +ac_site_file2=NONE
1.775 if test -n "$CONFIG_SITE"; then
1.776 - set x "$CONFIG_SITE"
1.777 + ac_site_file1=$CONFIG_SITE
1.778 elif test "x$prefix" != xNONE; then
1.779 - set x "$prefix/share/config.site" "$prefix/etc/config.site"
1.780 -else
1.781 - set x "$ac_default_prefix/share/config.site" \
1.782 - "$ac_default_prefix/etc/config.site"
1.783 -fi
1.784 -shift
1.785 -for ac_site_file
1.786 -do
1.787 + ac_site_file1=$prefix/share/config.site
1.788 + ac_site_file2=$prefix/etc/config.site
1.789 +else
1.790 + ac_site_file1=$ac_default_prefix/share/config.site
1.791 + ac_site_file2=$ac_default_prefix/etc/config.site
1.792 +fi
1.793 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
1.794 +do
1.795 + test "x$ac_site_file" = xNONE && continue
1.796 if test -r "$ac_site_file"; then
1.797 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1.798 -echo "$as_me: loading site script $ac_site_file" >&6;}
1.799 + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1.800 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
1.801 sed 's/^/| /' "$ac_site_file" >&5
1.802 . "$ac_site_file"
1.803 fi
1.804 @@ -1734,16 +1832,16 @@
1.805 # Some versions of bash will fail to source /dev/null (special
1.806 # files actually), so we avoid doing that.
1.807 if test -f "$cache_file"; then
1.808 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
1.809 -echo "$as_me: loading cache $cache_file" >&6;}
1.810 + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
1.811 +$as_echo "$as_me: loading cache $cache_file" >&6;}
1.812 case $cache_file in
1.813 [\\/]* | ?:[\\/]* ) . "$cache_file";;
1.814 *) . "./$cache_file";;
1.815 esac
1.816 fi
1.817 else
1.818 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
1.819 -echo "$as_me: creating cache $cache_file" >&6;}
1.820 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
1.821 +$as_echo "$as_me: creating cache $cache_file" >&6;}
1.822 >$cache_file
1.823 fi
1.824
1.825 @@ -1757,29 +1855,38 @@
1.826 eval ac_new_val=\$ac_env_${ac_var}_value
1.827 case $ac_old_set,$ac_new_set in
1.828 set,)
1.829 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1.830 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1.831 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1.832 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1.833 ac_cache_corrupted=: ;;
1.834 ,set)
1.835 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1.836 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1.837 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1.838 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1.839 ac_cache_corrupted=: ;;
1.840 ,);;
1.841 *)
1.842 if test "x$ac_old_val" != "x$ac_new_val"; then
1.843 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1.844 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1.845 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
1.846 -echo "$as_me: former value: $ac_old_val" >&2;}
1.847 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
1.848 -echo "$as_me: current value: $ac_new_val" >&2;}
1.849 - ac_cache_corrupted=:
1.850 + # differences in whitespace do not lead to failure.
1.851 + ac_old_val_w=`echo x $ac_old_val`
1.852 + ac_new_val_w=`echo x $ac_new_val`
1.853 + if test "$ac_old_val_w" != "$ac_new_val_w"; then
1.854 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1.855 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1.856 + ac_cache_corrupted=:
1.857 + else
1.858 + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1.859 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1.860 + eval $ac_var=\$ac_old_val
1.861 + fi
1.862 + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1.863 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1.864 + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1.865 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1.866 fi;;
1.867 esac
1.868 # Pass precious variables to config.status.
1.869 if test "$ac_new_set" = set; then
1.870 case $ac_new_val in
1.871 - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1.872 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1.873 *) ac_arg=$ac_var=$ac_new_val ;;
1.874 esac
1.875 case " $ac_configure_args " in
1.876 @@ -1789,10 +1896,10 @@
1.877 fi
1.878 done
1.879 if $ac_cache_corrupted; then
1.880 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1.881 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1.882 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1.883 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1.884 + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1.885 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1.886 + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1.887 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1.888 { (exit 1); exit 1; }; }
1.889 fi
1.890
1.891 @@ -1819,7 +1926,7 @@
1.892 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.893
1.894
1.895 -am__api_version="1.7"
1.896 +am__api_version="1.9"
1.897 ac_aux_dir=
1.898 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1.899 if test -f "$ac_dir/install-sh"; then
1.900 @@ -1837,8 +1944,8 @@
1.901 fi
1.902 done
1.903 if test -z "$ac_aux_dir"; then
1.904 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
1.905 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
1.906 + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
1.907 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
1.908 { (exit 1); exit 1; }; }
1.909 fi
1.910
1.911 @@ -1864,11 +1971,12 @@
1.912 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1.913 # OS/2's system install, which has a completely different semantic
1.914 # ./install, which can be erroneously created by make from ./install.sh.
1.915 -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1.916 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
1.917 +# Reject install programs that cannot install multiple files.
1.918 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1.919 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
1.920 if test -z "$INSTALL"; then
1.921 if test "${ac_cv_path_install+set}" = set; then
1.922 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.923 + $as_echo_n "(cached) " >&6
1.924 else
1.925 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.926 for as_dir in $PATH
1.927 @@ -1897,17 +2005,29 @@
1.928 # program-specific install script used by HP pwplus--don't use.
1.929 :
1.930 else
1.931 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
1.932 - break 3
1.933 + rm -rf conftest.one conftest.two conftest.dir
1.934 + echo one > conftest.one
1.935 + echo two > conftest.two
1.936 + mkdir conftest.dir
1.937 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
1.938 + test -s conftest.one && test -s conftest.two &&
1.939 + test -s conftest.dir/conftest.one &&
1.940 + test -s conftest.dir/conftest.two
1.941 + then
1.942 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
1.943 + break 3
1.944 + fi
1.945 fi
1.946 fi
1.947 done
1.948 done
1.949 ;;
1.950 esac
1.951 -done
1.952 -IFS=$as_save_IFS
1.953 -
1.954 +
1.955 +done
1.956 +IFS=$as_save_IFS
1.957 +
1.958 +rm -rf conftest.one conftest.two conftest.dir
1.959
1.960 fi
1.961 if test "${ac_cv_path_install+set}" = set; then
1.962 @@ -1920,8 +2040,8 @@
1.963 INSTALL=$ac_install_sh
1.964 fi
1.965 fi
1.966 -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
1.967 -echo "${ECHO_T}$INSTALL" >&6; }
1.968 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
1.969 +$as_echo "$INSTALL" >&6; }
1.970
1.971 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1.972 # It thinks the first close brace ends the variable substitution.
1.973 @@ -1931,8 +2051,8 @@
1.974
1.975 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1.976
1.977 -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1.978 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
1.979 +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1.980 +$as_echo_n "checking whether build environment is sane... " >&6; }
1.981 # Just in case
1.982 sleep 1
1.983 echo timestamp > conftest.file
1.984 @@ -1955,9 +2075,9 @@
1.985 # if, for instance, CONFIG_SHELL is bash and it inherits a
1.986 # broken ls alias from the environment. This has actually
1.987 # happened. Such a system could not be considered "sane".
1.988 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1.989 + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1.990 alias in your environment" >&5
1.991 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1.992 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1.993 alias in your environment" >&2;}
1.994 { (exit 1); exit 1; }; }
1.995 fi
1.996 @@ -1968,27 +2088,23 @@
1.997 # Ok.
1.998 :
1.999 else
1.1000 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1.1001 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1.1002 Check your system clock" >&5
1.1003 -echo "$as_me: error: newly created file is older than distributed files!
1.1004 +$as_echo "$as_me: error: newly created file is older than distributed files!
1.1005 Check your system clock" >&2;}
1.1006 { (exit 1); exit 1; }; }
1.1007 fi
1.1008 -{ echo "$as_me:$LINENO: result: yes" >&5
1.1009 -echo "${ECHO_T}yes" >&6; }
1.1010 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
1.1011 +$as_echo "yes" >&6; }
1.1012 test "$program_prefix" != NONE &&
1.1013 program_transform_name="s&^&$program_prefix&;$program_transform_name"
1.1014 # Use a double $ so make ignores it.
1.1015 test "$program_suffix" != NONE &&
1.1016 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
1.1017 -# Double any \ or $. echo might interpret backslashes.
1.1018 +# Double any \ or $.
1.1019 # By default was `s,x,x', remove it if useless.
1.1020 -cat <<\_ACEOF >conftest.sed
1.1021 -s/[\\$]/&&/g;s/;s,x,x,$//
1.1022 -_ACEOF
1.1023 -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
1.1024 -rm -f conftest.sed
1.1025 -
1.1026 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
1.1027 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
1.1028
1.1029 # expand $ac_aux_dir to an absolute path
1.1030 am_aux_dir=`cd $ac_aux_dir && pwd`
1.1031 @@ -1999,18 +2115,51 @@
1.1032 am_missing_run="$MISSING --run "
1.1033 else
1.1034 am_missing_run=
1.1035 - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1.1036 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1.1037 + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1.1038 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1.1039 +fi
1.1040 +
1.1041 +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
1.1042 + # We used to keeping the `.' as first argument, in order to
1.1043 + # allow $(mkdir_p) to be used without argument. As in
1.1044 + # $(mkdir_p) $(somedir)
1.1045 + # where $(somedir) is conditionally defined. However this is wrong
1.1046 + # for two reasons:
1.1047 + # 1. if the package is installed by a user who cannot write `.'
1.1048 + # make install will fail,
1.1049 + # 2. the above comment should most certainly read
1.1050 + # $(mkdir_p) $(DESTDIR)$(somedir)
1.1051 + # so it does not work when $(somedir) is undefined and
1.1052 + # $(DESTDIR) is not.
1.1053 + # To support the latter case, we have to write
1.1054 + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
1.1055 + # so the `.' trick is pointless.
1.1056 + mkdir_p='mkdir -p --'
1.1057 +else
1.1058 + # On NextStep and OpenStep, the `mkdir' command does not
1.1059 + # recognize any option. It will interpret all options as
1.1060 + # directories to create, and then abort because `.' already
1.1061 + # exists.
1.1062 + for d in ./-p ./--version;
1.1063 + do
1.1064 + test -d $d && rmdir $d
1.1065 + done
1.1066 + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
1.1067 + if test -f "$ac_aux_dir/mkinstalldirs"; then
1.1068 + mkdir_p='$(mkinstalldirs)'
1.1069 + else
1.1070 + mkdir_p='$(install_sh) -d'
1.1071 + fi
1.1072 fi
1.1073
1.1074 for ac_prog in gawk mawk nawk awk
1.1075 do
1.1076 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1077 set dummy $ac_prog; ac_word=$2
1.1078 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1079 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1080 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1081 +$as_echo_n "checking for $ac_word... " >&6; }
1.1082 if test "${ac_cv_prog_AWK+set}" = set; then
1.1083 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1084 + $as_echo_n "(cached) " >&6
1.1085 else
1.1086 if test -n "$AWK"; then
1.1087 ac_cv_prog_AWK="$AWK" # Let the user override the test.
1.1088 @@ -2023,7 +2172,7 @@
1.1089 for ac_exec_ext in '' $ac_executable_extensions; do
1.1090 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1091 ac_cv_prog_AWK="$ac_prog"
1.1092 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1093 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1094 break 2
1.1095 fi
1.1096 done
1.1097 @@ -2034,22 +2183,23 @@
1.1098 fi
1.1099 AWK=$ac_cv_prog_AWK
1.1100 if test -n "$AWK"; then
1.1101 - { echo "$as_me:$LINENO: result: $AWK" >&5
1.1102 -echo "${ECHO_T}$AWK" >&6; }
1.1103 -else
1.1104 - { echo "$as_me:$LINENO: result: no" >&5
1.1105 -echo "${ECHO_T}no" >&6; }
1.1106 + { $as_echo "$as_me:$LINENO: result: $AWK" >&5
1.1107 +$as_echo "$AWK" >&6; }
1.1108 +else
1.1109 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1110 +$as_echo "no" >&6; }
1.1111 fi
1.1112
1.1113
1.1114 test -n "$AWK" && break
1.1115 done
1.1116
1.1117 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1.1118 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
1.1119 -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1.1120 +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1.1121 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
1.1122 +set x ${MAKE-make}
1.1123 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1.1124 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
1.1125 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1126 + $as_echo_n "(cached) " >&6
1.1127 else
1.1128 cat >conftest.make <<\_ACEOF
1.1129 SHELL = /bin/sh
1.1130 @@ -2066,12 +2216,12 @@
1.1131 rm -f conftest.make
1.1132 fi
1.1133 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
1.1134 - { echo "$as_me:$LINENO: result: yes" >&5
1.1135 -echo "${ECHO_T}yes" >&6; }
1.1136 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.1137 +$as_echo "yes" >&6; }
1.1138 SET_MAKE=
1.1139 else
1.1140 - { echo "$as_me:$LINENO: result: no" >&5
1.1141 -echo "${ECHO_T}no" >&6; }
1.1142 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1143 +$as_echo "no" >&6; }
1.1144 SET_MAKE="MAKE=${MAKE-make}"
1.1145 fi
1.1146
1.1147 @@ -2084,11 +2234,11 @@
1.1148 fi
1.1149 rmdir .tst 2>/dev/null
1.1150
1.1151 - # test to see if srcdir already configured
1.1152 +# test to see if srcdir already configured
1.1153 if test "`cd $srcdir && pwd`" != "`pwd`" &&
1.1154 test -f $srcdir/config.status; then
1.1155 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1.1156 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1.1157 + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1.1158 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1.1159 { (exit 1); exit 1; }; }
1.1160 fi
1.1161
1.1162 @@ -2132,9 +2282,6 @@
1.1163
1.1164 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
1.1165
1.1166 -
1.1167 -AMTAR=${AMTAR-"${am_missing_run}tar"}
1.1168 -
1.1169 install_sh=${install_sh-"$am_aux_dir/install-sh"}
1.1170
1.1171 # Installed binaries are usually stripped using `strip' when the user
1.1172 @@ -2145,10 +2292,10 @@
1.1173 if test -n "$ac_tool_prefix"; then
1.1174 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1.1175 set dummy ${ac_tool_prefix}strip; ac_word=$2
1.1176 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1177 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1178 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1179 +$as_echo_n "checking for $ac_word... " >&6; }
1.1180 if test "${ac_cv_prog_STRIP+set}" = set; then
1.1181 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1182 + $as_echo_n "(cached) " >&6
1.1183 else
1.1184 if test -n "$STRIP"; then
1.1185 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1.1186 @@ -2161,7 +2308,7 @@
1.1187 for ac_exec_ext in '' $ac_executable_extensions; do
1.1188 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1189 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1.1190 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1191 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1192 break 2
1.1193 fi
1.1194 done
1.1195 @@ -2172,11 +2319,11 @@
1.1196 fi
1.1197 STRIP=$ac_cv_prog_STRIP
1.1198 if test -n "$STRIP"; then
1.1199 - { echo "$as_me:$LINENO: result: $STRIP" >&5
1.1200 -echo "${ECHO_T}$STRIP" >&6; }
1.1201 -else
1.1202 - { echo "$as_me:$LINENO: result: no" >&5
1.1203 -echo "${ECHO_T}no" >&6; }
1.1204 + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
1.1205 +$as_echo "$STRIP" >&6; }
1.1206 +else
1.1207 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1208 +$as_echo "no" >&6; }
1.1209 fi
1.1210
1.1211
1.1212 @@ -2185,10 +2332,10 @@
1.1213 ac_ct_STRIP=$STRIP
1.1214 # Extract the first word of "strip", so it can be a program name with args.
1.1215 set dummy strip; ac_word=$2
1.1216 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1217 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1218 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1219 +$as_echo_n "checking for $ac_word... " >&6; }
1.1220 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
1.1221 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1222 + $as_echo_n "(cached) " >&6
1.1223 else
1.1224 if test -n "$ac_ct_STRIP"; then
1.1225 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1.1226 @@ -2201,7 +2348,7 @@
1.1227 for ac_exec_ext in '' $ac_executable_extensions; do
1.1228 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1229 ac_cv_prog_ac_ct_STRIP="strip"
1.1230 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1231 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1232 break 2
1.1233 fi
1.1234 done
1.1235 @@ -2212,11 +2359,11 @@
1.1236 fi
1.1237 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1.1238 if test -n "$ac_ct_STRIP"; then
1.1239 - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1.1240 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
1.1241 -else
1.1242 - { echo "$as_me:$LINENO: result: no" >&5
1.1243 -echo "${ECHO_T}no" >&6; }
1.1244 + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1.1245 +$as_echo "$ac_ct_STRIP" >&6; }
1.1246 +else
1.1247 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1248 +$as_echo "no" >&6; }
1.1249 fi
1.1250
1.1251 if test "x$ac_ct_STRIP" = x; then
1.1252 @@ -2224,10 +2371,10 @@
1.1253 else
1.1254 case $cross_compiling:$ac_tool_warned in
1.1255 yes:)
1.1256 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.1257 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.1258 whose name does not start with the host triplet. If you think this
1.1259 configuration is useful to you, please write to autoconf@gnu.org." >&5
1.1260 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.1261 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.1262 whose name does not start with the host triplet. If you think this
1.1263 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.1264 ac_tool_warned=yes ;;
1.1265 @@ -2243,11 +2390,18 @@
1.1266
1.1267 # We need awk for the "check" target. The system "awk" is bad on
1.1268 # some platforms.
1.1269 -
1.1270 -
1.1271 -
1.1272 -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
1.1273 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
1.1274 +# Always define AMTAR for backward compatibility.
1.1275 +
1.1276 +AMTAR=${AMTAR-"${am_missing_run}tar"}
1.1277 +
1.1278 +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
1.1279 +
1.1280 +
1.1281 +
1.1282 +
1.1283 +
1.1284 +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
1.1285 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
1.1286 # Check whether --enable-maintainer-mode was given.
1.1287 if test "${enable_maintainer_mode+set}" = set; then
1.1288 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
1.1289 @@ -2255,8 +2409,8 @@
1.1290 USE_MAINTAINER_MODE=no
1.1291 fi
1.1292
1.1293 - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
1.1294 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
1.1295 + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
1.1296 +$as_echo "$USE_MAINTAINER_MODE" >&6; }
1.1297
1.1298
1.1299 if test $USE_MAINTAINER_MODE = yes; then
1.1300 @@ -2285,8 +2439,8 @@
1.1301 .PHONY: am__doit
1.1302 END
1.1303 # If we don't find an include directive, just comment out the code.
1.1304 -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
1.1305 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
1.1306 +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
1.1307 +$as_echo_n "checking for style of include used by $am_make... " >&6; }
1.1308 am__include="#"
1.1309 am__quote=
1.1310 _am_result=none
1.1311 @@ -2313,8 +2467,8 @@
1.1312 fi
1.1313
1.1314
1.1315 -{ echo "$as_me:$LINENO: result: $_am_result" >&5
1.1316 -echo "${ECHO_T}$_am_result" >&6; }
1.1317 +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
1.1318 +$as_echo "$_am_result" >&6; }
1.1319 rm -f confinc confmf
1.1320
1.1321 # Check whether --enable-dependency-tracking was given.
1.1322 @@ -2346,10 +2500,10 @@
1.1323 if test -n "$ac_tool_prefix"; then
1.1324 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1.1325 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1.1326 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1327 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1328 -if test "${ac_cv_prog_CC+set}" = set; then
1.1329 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1330 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1331 +$as_echo_n "checking for $ac_word... " >&6; }
1.1332 +if test "${ac_cv_prog_CC+set}" = set; then
1.1333 + $as_echo_n "(cached) " >&6
1.1334 else
1.1335 if test -n "$CC"; then
1.1336 ac_cv_prog_CC="$CC" # Let the user override the test.
1.1337 @@ -2362,22 +2516,22 @@
1.1338 for ac_exec_ext in '' $ac_executable_extensions; do
1.1339 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1340 ac_cv_prog_CC="${ac_tool_prefix}gcc"
1.1341 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1342 - break 2
1.1343 - fi
1.1344 -done
1.1345 -done
1.1346 -IFS=$as_save_IFS
1.1347 -
1.1348 -fi
1.1349 -fi
1.1350 -CC=$ac_cv_prog_CC
1.1351 -if test -n "$CC"; then
1.1352 - { echo "$as_me:$LINENO: result: $CC" >&5
1.1353 -echo "${ECHO_T}$CC" >&6; }
1.1354 -else
1.1355 - { echo "$as_me:$LINENO: result: no" >&5
1.1356 -echo "${ECHO_T}no" >&6; }
1.1357 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1358 + break 2
1.1359 + fi
1.1360 +done
1.1361 +done
1.1362 +IFS=$as_save_IFS
1.1363 +
1.1364 +fi
1.1365 +fi
1.1366 +CC=$ac_cv_prog_CC
1.1367 +if test -n "$CC"; then
1.1368 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.1369 +$as_echo "$CC" >&6; }
1.1370 +else
1.1371 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1372 +$as_echo "no" >&6; }
1.1373 fi
1.1374
1.1375
1.1376 @@ -2386,10 +2540,10 @@
1.1377 ac_ct_CC=$CC
1.1378 # Extract the first word of "gcc", so it can be a program name with args.
1.1379 set dummy gcc; ac_word=$2
1.1380 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1381 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1382 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1383 +$as_echo_n "checking for $ac_word... " >&6; }
1.1384 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1.1385 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1386 + $as_echo_n "(cached) " >&6
1.1387 else
1.1388 if test -n "$ac_ct_CC"; then
1.1389 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1.1390 @@ -2402,7 +2556,7 @@
1.1391 for ac_exec_ext in '' $ac_executable_extensions; do
1.1392 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1393 ac_cv_prog_ac_ct_CC="gcc"
1.1394 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1395 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1396 break 2
1.1397 fi
1.1398 done
1.1399 @@ -2413,11 +2567,11 @@
1.1400 fi
1.1401 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1.1402 if test -n "$ac_ct_CC"; then
1.1403 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.1404 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1.1405 -else
1.1406 - { echo "$as_me:$LINENO: result: no" >&5
1.1407 -echo "${ECHO_T}no" >&6; }
1.1408 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.1409 +$as_echo "$ac_ct_CC" >&6; }
1.1410 +else
1.1411 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1412 +$as_echo "no" >&6; }
1.1413 fi
1.1414
1.1415 if test "x$ac_ct_CC" = x; then
1.1416 @@ -2425,10 +2579,10 @@
1.1417 else
1.1418 case $cross_compiling:$ac_tool_warned in
1.1419 yes:)
1.1420 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.1421 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.1422 whose name does not start with the host triplet. If you think this
1.1423 configuration is useful to you, please write to autoconf@gnu.org." >&5
1.1424 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.1425 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.1426 whose name does not start with the host triplet. If you think this
1.1427 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.1428 ac_tool_warned=yes ;;
1.1429 @@ -2443,10 +2597,10 @@
1.1430 if test -n "$ac_tool_prefix"; then
1.1431 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1.1432 set dummy ${ac_tool_prefix}cc; ac_word=$2
1.1433 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1434 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1435 -if test "${ac_cv_prog_CC+set}" = set; then
1.1436 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1437 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1438 +$as_echo_n "checking for $ac_word... " >&6; }
1.1439 +if test "${ac_cv_prog_CC+set}" = set; then
1.1440 + $as_echo_n "(cached) " >&6
1.1441 else
1.1442 if test -n "$CC"; then
1.1443 ac_cv_prog_CC="$CC" # Let the user override the test.
1.1444 @@ -2459,22 +2613,22 @@
1.1445 for ac_exec_ext in '' $ac_executable_extensions; do
1.1446 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1447 ac_cv_prog_CC="${ac_tool_prefix}cc"
1.1448 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1449 - break 2
1.1450 - fi
1.1451 -done
1.1452 -done
1.1453 -IFS=$as_save_IFS
1.1454 -
1.1455 -fi
1.1456 -fi
1.1457 -CC=$ac_cv_prog_CC
1.1458 -if test -n "$CC"; then
1.1459 - { echo "$as_me:$LINENO: result: $CC" >&5
1.1460 -echo "${ECHO_T}$CC" >&6; }
1.1461 -else
1.1462 - { echo "$as_me:$LINENO: result: no" >&5
1.1463 -echo "${ECHO_T}no" >&6; }
1.1464 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1465 + break 2
1.1466 + fi
1.1467 +done
1.1468 +done
1.1469 +IFS=$as_save_IFS
1.1470 +
1.1471 +fi
1.1472 +fi
1.1473 +CC=$ac_cv_prog_CC
1.1474 +if test -n "$CC"; then
1.1475 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.1476 +$as_echo "$CC" >&6; }
1.1477 +else
1.1478 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1479 +$as_echo "no" >&6; }
1.1480 fi
1.1481
1.1482
1.1483 @@ -2483,10 +2637,10 @@
1.1484 if test -z "$CC"; then
1.1485 # Extract the first word of "cc", so it can be a program name with args.
1.1486 set dummy cc; ac_word=$2
1.1487 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1488 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1489 -if test "${ac_cv_prog_CC+set}" = set; then
1.1490 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1491 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1492 +$as_echo_n "checking for $ac_word... " >&6; }
1.1493 +if test "${ac_cv_prog_CC+set}" = set; then
1.1494 + $as_echo_n "(cached) " >&6
1.1495 else
1.1496 if test -n "$CC"; then
1.1497 ac_cv_prog_CC="$CC" # Let the user override the test.
1.1498 @@ -2504,7 +2658,7 @@
1.1499 continue
1.1500 fi
1.1501 ac_cv_prog_CC="cc"
1.1502 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1503 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1504 break 2
1.1505 fi
1.1506 done
1.1507 @@ -2527,11 +2681,11 @@
1.1508 fi
1.1509 CC=$ac_cv_prog_CC
1.1510 if test -n "$CC"; then
1.1511 - { echo "$as_me:$LINENO: result: $CC" >&5
1.1512 -echo "${ECHO_T}$CC" >&6; }
1.1513 -else
1.1514 - { echo "$as_me:$LINENO: result: no" >&5
1.1515 -echo "${ECHO_T}no" >&6; }
1.1516 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.1517 +$as_echo "$CC" >&6; }
1.1518 +else
1.1519 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1520 +$as_echo "no" >&6; }
1.1521 fi
1.1522
1.1523
1.1524 @@ -2542,10 +2696,10 @@
1.1525 do
1.1526 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.1527 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1528 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1529 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1530 -if test "${ac_cv_prog_CC+set}" = set; then
1.1531 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1532 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1533 +$as_echo_n "checking for $ac_word... " >&6; }
1.1534 +if test "${ac_cv_prog_CC+set}" = set; then
1.1535 + $as_echo_n "(cached) " >&6
1.1536 else
1.1537 if test -n "$CC"; then
1.1538 ac_cv_prog_CC="$CC" # Let the user override the test.
1.1539 @@ -2558,22 +2712,22 @@
1.1540 for ac_exec_ext in '' $ac_executable_extensions; do
1.1541 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1542 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1.1543 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1544 - break 2
1.1545 - fi
1.1546 -done
1.1547 -done
1.1548 -IFS=$as_save_IFS
1.1549 -
1.1550 -fi
1.1551 -fi
1.1552 -CC=$ac_cv_prog_CC
1.1553 -if test -n "$CC"; then
1.1554 - { echo "$as_me:$LINENO: result: $CC" >&5
1.1555 -echo "${ECHO_T}$CC" >&6; }
1.1556 -else
1.1557 - { echo "$as_me:$LINENO: result: no" >&5
1.1558 -echo "${ECHO_T}no" >&6; }
1.1559 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1560 + break 2
1.1561 + fi
1.1562 +done
1.1563 +done
1.1564 +IFS=$as_save_IFS
1.1565 +
1.1566 +fi
1.1567 +fi
1.1568 +CC=$ac_cv_prog_CC
1.1569 +if test -n "$CC"; then
1.1570 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.1571 +$as_echo "$CC" >&6; }
1.1572 +else
1.1573 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1574 +$as_echo "no" >&6; }
1.1575 fi
1.1576
1.1577
1.1578 @@ -2586,10 +2740,10 @@
1.1579 do
1.1580 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1581 set dummy $ac_prog; ac_word=$2
1.1582 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1583 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.1584 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.1585 +$as_echo_n "checking for $ac_word... " >&6; }
1.1586 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1.1587 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1588 + $as_echo_n "(cached) " >&6
1.1589 else
1.1590 if test -n "$ac_ct_CC"; then
1.1591 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1.1592 @@ -2602,7 +2756,7 @@
1.1593 for ac_exec_ext in '' $ac_executable_extensions; do
1.1594 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1595 ac_cv_prog_ac_ct_CC="$ac_prog"
1.1596 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1597 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1598 break 2
1.1599 fi
1.1600 done
1.1601 @@ -2613,11 +2767,11 @@
1.1602 fi
1.1603 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1.1604 if test -n "$ac_ct_CC"; then
1.1605 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.1606 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1.1607 -else
1.1608 - { echo "$as_me:$LINENO: result: no" >&5
1.1609 -echo "${ECHO_T}no" >&6; }
1.1610 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.1611 +$as_echo "$ac_ct_CC" >&6; }
1.1612 +else
1.1613 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.1614 +$as_echo "no" >&6; }
1.1615 fi
1.1616
1.1617
1.1618 @@ -2629,10 +2783,10 @@
1.1619 else
1.1620 case $cross_compiling:$ac_tool_warned in
1.1621 yes:)
1.1622 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.1623 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.1624 whose name does not start with the host triplet. If you think this
1.1625 configuration is useful to you, please write to autoconf@gnu.org." >&5
1.1626 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.1627 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.1628 whose name does not start with the host triplet. If you think this
1.1629 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.1630 ac_tool_warned=yes ;;
1.1631 @@ -2644,44 +2798,48 @@
1.1632 fi
1.1633
1.1634
1.1635 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1.1636 -See \`config.log' for more details." >&5
1.1637 -echo "$as_me: error: no acceptable C compiler found in \$PATH
1.1638 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1.1639 +See \`config.log' for more details." >&5
1.1640 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1.1641 See \`config.log' for more details." >&2;}
1.1642 { (exit 1); exit 1; }; }
1.1643
1.1644 # Provide some information about the compiler.
1.1645 -echo "$as_me:$LINENO: checking for C compiler version" >&5
1.1646 -ac_compiler=`set X $ac_compile; echo $2`
1.1647 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1.1648 +set X $ac_compile
1.1649 +ac_compiler=$2
1.1650 { (ac_try="$ac_compiler --version >&5"
1.1651 case "(($ac_try" in
1.1652 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1653 *) ac_try_echo=$ac_try;;
1.1654 esac
1.1655 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1656 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1657 +$as_echo "$ac_try_echo") >&5
1.1658 (eval "$ac_compiler --version >&5") 2>&5
1.1659 ac_status=$?
1.1660 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1661 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1662 (exit $ac_status); }
1.1663 { (ac_try="$ac_compiler -v >&5"
1.1664 case "(($ac_try" in
1.1665 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1666 *) ac_try_echo=$ac_try;;
1.1667 esac
1.1668 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1669 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1670 +$as_echo "$ac_try_echo") >&5
1.1671 (eval "$ac_compiler -v >&5") 2>&5
1.1672 ac_status=$?
1.1673 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1674 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1675 (exit $ac_status); }
1.1676 { (ac_try="$ac_compiler -V >&5"
1.1677 case "(($ac_try" in
1.1678 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1679 *) ac_try_echo=$ac_try;;
1.1680 esac
1.1681 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1682 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1683 +$as_echo "$ac_try_echo") >&5
1.1684 (eval "$ac_compiler -V >&5") 2>&5
1.1685 ac_status=$?
1.1686 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1687 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1688 (exit $ac_status); }
1.1689
1.1690 cat >conftest.$ac_ext <<_ACEOF
1.1691 @@ -2700,27 +2858,22 @@
1.1692 }
1.1693 _ACEOF
1.1694 ac_clean_files_save=$ac_clean_files
1.1695 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
1.1696 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
1.1697 # Try to create an executable without -o first, disregard a.out.
1.1698 # It will help us diagnose broken compilers, and finding out an intuition
1.1699 # of exeext.
1.1700 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1.1701 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
1.1702 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1.1703 -#
1.1704 -# List of possible output files, starting from the most likely.
1.1705 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
1.1706 -# only as a last resort. b.out is created by i960 compilers.
1.1707 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
1.1708 -#
1.1709 -# The IRIX 6 linker writes into existing files which may not be
1.1710 -# executable, retaining their permissions. Remove them first so a
1.1711 -# subsequent execution test works.
1.1712 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1.1713 +$as_echo_n "checking for C compiler default output file name... " >&6; }
1.1714 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1.1715 +
1.1716 +# The possible output files:
1.1717 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
1.1718 +
1.1719 ac_rmfiles=
1.1720 for ac_file in $ac_files
1.1721 do
1.1722 case $ac_file in
1.1723 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1.1724 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1.1725 * ) ac_rmfiles="$ac_rmfiles $ac_file";;
1.1726 esac
1.1727 done
1.1728 @@ -2731,10 +2884,11 @@
1.1729 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1730 *) ac_try_echo=$ac_try;;
1.1731 esac
1.1732 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1733 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1734 +$as_echo "$ac_try_echo") >&5
1.1735 (eval "$ac_link_default") 2>&5
1.1736 ac_status=$?
1.1737 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1738 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1739 (exit $ac_status); }; then
1.1740 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
1.1741 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
1.1742 @@ -2745,7 +2899,7 @@
1.1743 do
1.1744 test -f "$ac_file" || continue
1.1745 case $ac_file in
1.1746 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
1.1747 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
1.1748 ;;
1.1749 [ab].out )
1.1750 # We found the default executable, but exeext='' is most
1.1751 @@ -2772,15 +2926,15 @@
1.1752 ac_file=''
1.1753 fi
1.1754
1.1755 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
1.1756 -echo "${ECHO_T}$ac_file" >&6; }
1.1757 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
1.1758 +$as_echo "$ac_file" >&6; }
1.1759 if test -z "$ac_file"; then
1.1760 - echo "$as_me: failed program was:" >&5
1.1761 -sed 's/^/| /' conftest.$ac_ext >&5
1.1762 -
1.1763 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
1.1764 -See \`config.log' for more details." >&5
1.1765 -echo "$as_me: error: C compiler cannot create executables
1.1766 + $as_echo "$as_me: failed program was:" >&5
1.1767 +sed 's/^/| /' conftest.$ac_ext >&5
1.1768 +
1.1769 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
1.1770 +See \`config.log' for more details." >&5
1.1771 +$as_echo "$as_me: error: C compiler cannot create executables
1.1772 See \`config.log' for more details." >&2;}
1.1773 { (exit 77); exit 77; }; }
1.1774 fi
1.1775 @@ -2789,8 +2943,8 @@
1.1776
1.1777 # Check that the compiler produces executables we can run. If not, either
1.1778 # the compiler is broken, or we cross compile.
1.1779 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1.1780 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
1.1781 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1.1782 +$as_echo_n "checking whether the C compiler works... " >&6; }
1.1783 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
1.1784 # If not cross compiling, check that we can run a simple program.
1.1785 if test "$cross_compiling" != yes; then
1.1786 @@ -2799,49 +2953,51 @@
1.1787 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1788 *) ac_try_echo=$ac_try;;
1.1789 esac
1.1790 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1791 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1792 +$as_echo "$ac_try_echo") >&5
1.1793 (eval "$ac_try") 2>&5
1.1794 ac_status=$?
1.1795 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1796 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1797 (exit $ac_status); }; }; then
1.1798 cross_compiling=no
1.1799 else
1.1800 if test "$cross_compiling" = maybe; then
1.1801 cross_compiling=yes
1.1802 else
1.1803 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
1.1804 + { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
1.1805 If you meant to cross compile, use \`--host'.
1.1806 See \`config.log' for more details." >&5
1.1807 -echo "$as_me: error: cannot run C compiled programs.
1.1808 +$as_echo "$as_me: error: cannot run C compiled programs.
1.1809 If you meant to cross compile, use \`--host'.
1.1810 See \`config.log' for more details." >&2;}
1.1811 { (exit 1); exit 1; }; }
1.1812 fi
1.1813 fi
1.1814 fi
1.1815 -{ echo "$as_me:$LINENO: result: yes" >&5
1.1816 -echo "${ECHO_T}yes" >&6; }
1.1817 -
1.1818 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
1.1819 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
1.1820 +$as_echo "yes" >&6; }
1.1821 +
1.1822 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
1.1823 ac_clean_files=$ac_clean_files_save
1.1824 # Check that the compiler produces executables we can run. If not, either
1.1825 # the compiler is broken, or we cross compile.
1.1826 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1.1827 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
1.1828 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
1.1829 -echo "${ECHO_T}$cross_compiling" >&6; }
1.1830 -
1.1831 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
1.1832 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
1.1833 -if { (ac_try="$ac_link"
1.1834 -case "(($ac_try" in
1.1835 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1836 - *) ac_try_echo=$ac_try;;
1.1837 -esac
1.1838 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1839 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1.1840 +$as_echo_n "checking whether we are cross compiling... " >&6; }
1.1841 +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
1.1842 +$as_echo "$cross_compiling" >&6; }
1.1843 +
1.1844 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
1.1845 +$as_echo_n "checking for suffix of executables... " >&6; }
1.1846 +if { (ac_try="$ac_link"
1.1847 +case "(($ac_try" in
1.1848 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1849 + *) ac_try_echo=$ac_try;;
1.1850 +esac
1.1851 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1852 +$as_echo "$ac_try_echo") >&5
1.1853 (eval "$ac_link") 2>&5
1.1854 ac_status=$?
1.1855 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1856 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1857 (exit $ac_status); }; then
1.1858 # If both `conftest.exe' and `conftest' are `present' (well, observable)
1.1859 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
1.1860 @@ -2850,31 +3006,31 @@
1.1861 for ac_file in conftest.exe conftest conftest.*; do
1.1862 test -f "$ac_file" || continue
1.1863 case $ac_file in
1.1864 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1.1865 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1.1866 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
1.1867 break;;
1.1868 * ) break;;
1.1869 esac
1.1870 done
1.1871 else
1.1872 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1.1873 -See \`config.log' for more details." >&5
1.1874 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1.1875 + { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1.1876 +See \`config.log' for more details." >&5
1.1877 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1.1878 See \`config.log' for more details." >&2;}
1.1879 { (exit 1); exit 1; }; }
1.1880 fi
1.1881
1.1882 rm -f conftest$ac_cv_exeext
1.1883 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1.1884 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
1.1885 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1.1886 +$as_echo "$ac_cv_exeext" >&6; }
1.1887
1.1888 rm -f conftest.$ac_ext
1.1889 EXEEXT=$ac_cv_exeext
1.1890 ac_exeext=$EXEEXT
1.1891 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
1.1892 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
1.1893 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
1.1894 +$as_echo_n "checking for suffix of object files... " >&6; }
1.1895 if test "${ac_cv_objext+set}" = set; then
1.1896 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1897 + $as_echo_n "(cached) " >&6
1.1898 else
1.1899 cat >conftest.$ac_ext <<_ACEOF
1.1900 /* confdefs.h. */
1.1901 @@ -2897,40 +3053,41 @@
1.1902 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1903 *) ac_try_echo=$ac_try;;
1.1904 esac
1.1905 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1906 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1907 +$as_echo "$ac_try_echo") >&5
1.1908 (eval "$ac_compile") 2>&5
1.1909 ac_status=$?
1.1910 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1911 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1912 (exit $ac_status); }; then
1.1913 for ac_file in conftest.o conftest.obj conftest.*; do
1.1914 test -f "$ac_file" || continue;
1.1915 case $ac_file in
1.1916 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
1.1917 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
1.1918 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
1.1919 break;;
1.1920 esac
1.1921 done
1.1922 else
1.1923 - echo "$as_me: failed program was:" >&5
1.1924 -sed 's/^/| /' conftest.$ac_ext >&5
1.1925 -
1.1926 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1.1927 -See \`config.log' for more details." >&5
1.1928 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
1.1929 + $as_echo "$as_me: failed program was:" >&5
1.1930 +sed 's/^/| /' conftest.$ac_ext >&5
1.1931 +
1.1932 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1.1933 +See \`config.log' for more details." >&5
1.1934 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
1.1935 See \`config.log' for more details." >&2;}
1.1936 { (exit 1); exit 1; }; }
1.1937 fi
1.1938
1.1939 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1.1940 fi
1.1941 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1.1942 -echo "${ECHO_T}$ac_cv_objext" >&6; }
1.1943 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1.1944 +$as_echo "$ac_cv_objext" >&6; }
1.1945 OBJEXT=$ac_cv_objext
1.1946 ac_objext=$OBJEXT
1.1947 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1.1948 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
1.1949 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1.1950 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1.1951 if test "${ac_cv_c_compiler_gnu+set}" = set; then
1.1952 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.1953 + $as_echo_n "(cached) " >&6
1.1954 else
1.1955 cat >conftest.$ac_ext <<_ACEOF
1.1956 /* confdefs.h. */
1.1957 @@ -2956,20 +3113,21 @@
1.1958 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.1959 *) ac_try_echo=$ac_try;;
1.1960 esac
1.1961 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.1962 - (eval "$ac_compile") 2>conftest.er1
1.1963 - ac_status=$?
1.1964 - grep -v '^ *+' conftest.er1 >conftest.err
1.1965 - rm -f conftest.er1
1.1966 - cat conftest.err >&5
1.1967 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1968 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.1969 +$as_echo "$ac_try_echo") >&5
1.1970 + (eval "$ac_compile") 2>conftest.er1
1.1971 + ac_status=$?
1.1972 + grep -v '^ *+' conftest.er1 >conftest.err
1.1973 + rm -f conftest.er1
1.1974 + cat conftest.err >&5
1.1975 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.1976 (exit $ac_status); } && {
1.1977 test -z "$ac_c_werror_flag" ||
1.1978 test ! -s conftest.err
1.1979 } && test -s conftest.$ac_objext; then
1.1980 ac_compiler_gnu=yes
1.1981 else
1.1982 - echo "$as_me: failed program was:" >&5
1.1983 + $as_echo "$as_me: failed program was:" >&5
1.1984 sed 's/^/| /' conftest.$ac_ext >&5
1.1985
1.1986 ac_compiler_gnu=no
1.1987 @@ -2979,15 +3137,19 @@
1.1988 ac_cv_c_compiler_gnu=$ac_compiler_gnu
1.1989
1.1990 fi
1.1991 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1.1992 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
1.1993 -GCC=`test $ac_compiler_gnu = yes && echo yes`
1.1994 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1.1995 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
1.1996 +if test $ac_compiler_gnu = yes; then
1.1997 + GCC=yes
1.1998 +else
1.1999 + GCC=
1.2000 +fi
1.2001 ac_test_CFLAGS=${CFLAGS+set}
1.2002 ac_save_CFLAGS=$CFLAGS
1.2003 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1.2004 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
1.2005 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1.2006 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
1.2007 if test "${ac_cv_prog_cc_g+set}" = set; then
1.2008 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2009 + $as_echo_n "(cached) " >&6
1.2010 else
1.2011 ac_save_c_werror_flag=$ac_c_werror_flag
1.2012 ac_c_werror_flag=yes
1.2013 @@ -3014,20 +3176,21 @@
1.2014 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2015 *) ac_try_echo=$ac_try;;
1.2016 esac
1.2017 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2018 - (eval "$ac_compile") 2>conftest.er1
1.2019 - ac_status=$?
1.2020 - grep -v '^ *+' conftest.er1 >conftest.err
1.2021 - rm -f conftest.er1
1.2022 - cat conftest.err >&5
1.2023 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2024 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2025 +$as_echo "$ac_try_echo") >&5
1.2026 + (eval "$ac_compile") 2>conftest.er1
1.2027 + ac_status=$?
1.2028 + grep -v '^ *+' conftest.er1 >conftest.err
1.2029 + rm -f conftest.er1
1.2030 + cat conftest.err >&5
1.2031 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2032 (exit $ac_status); } && {
1.2033 test -z "$ac_c_werror_flag" ||
1.2034 test ! -s conftest.err
1.2035 } && test -s conftest.$ac_objext; then
1.2036 ac_cv_prog_cc_g=yes
1.2037 else
1.2038 - echo "$as_me: failed program was:" >&5
1.2039 + $as_echo "$as_me: failed program was:" >&5
1.2040 sed 's/^/| /' conftest.$ac_ext >&5
1.2041
1.2042 CFLAGS=""
1.2043 @@ -3052,20 +3215,21 @@
1.2044 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2045 *) ac_try_echo=$ac_try;;
1.2046 esac
1.2047 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2048 - (eval "$ac_compile") 2>conftest.er1
1.2049 - ac_status=$?
1.2050 - grep -v '^ *+' conftest.er1 >conftest.err
1.2051 - rm -f conftest.er1
1.2052 - cat conftest.err >&5
1.2053 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2054 - (exit $ac_status); } && {
1.2055 - test -z "$ac_c_werror_flag" ||
1.2056 - test ! -s conftest.err
1.2057 - } && test -s conftest.$ac_objext; then
1.2058 - :
1.2059 -else
1.2060 - echo "$as_me: failed program was:" >&5
1.2061 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2062 +$as_echo "$ac_try_echo") >&5
1.2063 + (eval "$ac_compile") 2>conftest.er1
1.2064 + ac_status=$?
1.2065 + grep -v '^ *+' conftest.er1 >conftest.err
1.2066 + rm -f conftest.er1
1.2067 + cat conftest.err >&5
1.2068 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2069 + (exit $ac_status); } && {
1.2070 + test -z "$ac_c_werror_flag" ||
1.2071 + test ! -s conftest.err
1.2072 + } && test -s conftest.$ac_objext; then
1.2073 + :
1.2074 +else
1.2075 + $as_echo "$as_me: failed program was:" >&5
1.2076 sed 's/^/| /' conftest.$ac_ext >&5
1.2077
1.2078 ac_c_werror_flag=$ac_save_c_werror_flag
1.2079 @@ -3091,20 +3255,21 @@
1.2080 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2081 *) ac_try_echo=$ac_try;;
1.2082 esac
1.2083 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2084 - (eval "$ac_compile") 2>conftest.er1
1.2085 - ac_status=$?
1.2086 - grep -v '^ *+' conftest.er1 >conftest.err
1.2087 - rm -f conftest.er1
1.2088 - cat conftest.err >&5
1.2089 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2090 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2091 +$as_echo "$ac_try_echo") >&5
1.2092 + (eval "$ac_compile") 2>conftest.er1
1.2093 + ac_status=$?
1.2094 + grep -v '^ *+' conftest.er1 >conftest.err
1.2095 + rm -f conftest.er1
1.2096 + cat conftest.err >&5
1.2097 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2098 (exit $ac_status); } && {
1.2099 test -z "$ac_c_werror_flag" ||
1.2100 test ! -s conftest.err
1.2101 } && test -s conftest.$ac_objext; then
1.2102 ac_cv_prog_cc_g=yes
1.2103 else
1.2104 - echo "$as_me: failed program was:" >&5
1.2105 + $as_echo "$as_me: failed program was:" >&5
1.2106 sed 's/^/| /' conftest.$ac_ext >&5
1.2107
1.2108
1.2109 @@ -3119,8 +3284,8 @@
1.2110 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.2111 ac_c_werror_flag=$ac_save_c_werror_flag
1.2112 fi
1.2113 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1.2114 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
1.2115 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1.2116 +$as_echo "$ac_cv_prog_cc_g" >&6; }
1.2117 if test "$ac_test_CFLAGS" = set; then
1.2118 CFLAGS=$ac_save_CFLAGS
1.2119 elif test $ac_cv_prog_cc_g = yes; then
1.2120 @@ -3136,10 +3301,10 @@
1.2121 CFLAGS=
1.2122 fi
1.2123 fi
1.2124 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1.2125 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
1.2126 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1.2127 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1.2128 if test "${ac_cv_prog_cc_c89+set}" = set; then
1.2129 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2130 + $as_echo_n "(cached) " >&6
1.2131 else
1.2132 ac_cv_prog_cc_c89=no
1.2133 ac_save_CC=$CC
1.2134 @@ -3210,20 +3375,21 @@
1.2135 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2136 *) ac_try_echo=$ac_try;;
1.2137 esac
1.2138 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2139 - (eval "$ac_compile") 2>conftest.er1
1.2140 - ac_status=$?
1.2141 - grep -v '^ *+' conftest.er1 >conftest.err
1.2142 - rm -f conftest.er1
1.2143 - cat conftest.err >&5
1.2144 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2145 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2146 +$as_echo "$ac_try_echo") >&5
1.2147 + (eval "$ac_compile") 2>conftest.er1
1.2148 + ac_status=$?
1.2149 + grep -v '^ *+' conftest.er1 >conftest.err
1.2150 + rm -f conftest.er1
1.2151 + cat conftest.err >&5
1.2152 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2153 (exit $ac_status); } && {
1.2154 test -z "$ac_c_werror_flag" ||
1.2155 test ! -s conftest.err
1.2156 } && test -s conftest.$ac_objext; then
1.2157 ac_cv_prog_cc_c89=$ac_arg
1.2158 else
1.2159 - echo "$as_me: failed program was:" >&5
1.2160 + $as_echo "$as_me: failed program was:" >&5
1.2161 sed 's/^/| /' conftest.$ac_ext >&5
1.2162
1.2163
1.2164 @@ -3239,15 +3405,15 @@
1.2165 # AC_CACHE_VAL
1.2166 case "x$ac_cv_prog_cc_c89" in
1.2167 x)
1.2168 - { echo "$as_me:$LINENO: result: none needed" >&5
1.2169 -echo "${ECHO_T}none needed" >&6; } ;;
1.2170 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
1.2171 +$as_echo "none needed" >&6; } ;;
1.2172 xno)
1.2173 - { echo "$as_me:$LINENO: result: unsupported" >&5
1.2174 -echo "${ECHO_T}unsupported" >&6; } ;;
1.2175 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
1.2176 +$as_echo "unsupported" >&6; } ;;
1.2177 *)
1.2178 CC="$CC $ac_cv_prog_cc_c89"
1.2179 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1.2180 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
1.2181 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1.2182 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
1.2183 esac
1.2184
1.2185
1.2186 @@ -3259,10 +3425,10 @@
1.2187
1.2188 depcc="$CC" am_compiler_list=
1.2189
1.2190 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
1.2191 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
1.2192 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
1.2193 +$as_echo_n "checking dependency style of $depcc... " >&6; }
1.2194 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
1.2195 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2196 + $as_echo_n "(cached) " >&6
1.2197 else
1.2198 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1.2199 # We make a subdir and do the tests there. Otherwise we can end up
1.2200 @@ -3298,7 +3464,9 @@
1.2201 : > sub/conftest.c
1.2202 for i in 1 2 3 4 5 6; do
1.2203 echo '#include "conftst'$i'.h"' >> sub/conftest.c
1.2204 - : > sub/conftst$i.h
1.2205 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
1.2206 + # Solaris 8's {/usr,}/bin/sh.
1.2207 + touch sub/conftst$i.h
1.2208 done
1.2209 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1.2210
1.2211 @@ -3326,9 +3494,14 @@
1.2212 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1.2213 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1.2214 # icc doesn't choke on unknown options, it will just issue warnings
1.2215 - # (even with -Werror). So we grep stderr for any message
1.2216 - # that says an option was ignored.
1.2217 - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
1.2218 + # or remarks (even with -Werror). So we grep stderr for any message
1.2219 + # that says an option was ignored or not supported.
1.2220 + # When given -MP, icc 7.0 and 7.1 complain thusly:
1.2221 + # icc: Command line warning: ignoring option '-M'; no argument required
1.2222 + # The diagnosis changed in icc 8.0:
1.2223 + # icc: Command line remark: option '-MP' not supported
1.2224 + if (grep 'ignoring option' conftest.err ||
1.2225 + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
1.2226 am_cv_CC_dependencies_compiler_type=$depmode
1.2227 break
1.2228 fi
1.2229 @@ -3342,8 +3515,8 @@
1.2230 fi
1.2231
1.2232 fi
1.2233 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
1.2234 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
1.2235 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
1.2236 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
1.2237 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
1.2238
1.2239
1.2240 @@ -3360,12 +3533,14 @@
1.2241
1.2242
1.2243
1.2244 -{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
1.2245 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
1.2246 -if test "${ac_cv_search_strerror+set}" = set; then
1.2247 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2248 -else
1.2249 - ac_func_search_save_LIBS=$LIBS
1.2250 +
1.2251 + { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
1.2252 +$as_echo_n "checking for strerror in -lcposix... " >&6; }
1.2253 +if test "${ac_cv_lib_cposix_strerror+set}" = set; then
1.2254 + $as_echo_n "(cached) " >&6
1.2255 +else
1.2256 + ac_check_lib_save_LIBS=$LIBS
1.2257 +LIBS="-lcposix $LIBS"
1.2258 cat >conftest.$ac_ext <<_ACEOF
1.2259 /* confdefs.h. */
1.2260 _ACEOF
1.2261 @@ -3388,60 +3563,47 @@
1.2262 return 0;
1.2263 }
1.2264 _ACEOF
1.2265 -for ac_lib in '' cposix; do
1.2266 - if test -z "$ac_lib"; then
1.2267 - ac_res="none required"
1.2268 - else
1.2269 - ac_res=-l$ac_lib
1.2270 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"
1.2271 - fi
1.2272 - rm -f conftest.$ac_objext conftest$ac_exeext
1.2273 -if { (ac_try="$ac_link"
1.2274 -case "(($ac_try" in
1.2275 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2276 - *) ac_try_echo=$ac_try;;
1.2277 -esac
1.2278 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2279 - (eval "$ac_link") 2>conftest.er1
1.2280 - ac_status=$?
1.2281 - grep -v '^ *+' conftest.er1 >conftest.err
1.2282 - rm -f conftest.er1
1.2283 - cat conftest.err >&5
1.2284 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2285 - (exit $ac_status); } && {
1.2286 - test -z "$ac_c_werror_flag" ||
1.2287 - test ! -s conftest.err
1.2288 - } && test -s conftest$ac_exeext &&
1.2289 - $as_test_x conftest$ac_exeext; then
1.2290 - ac_cv_search_strerror=$ac_res
1.2291 -else
1.2292 - echo "$as_me: failed program was:" >&5
1.2293 -sed 's/^/| /' conftest.$ac_ext >&5
1.2294 -
1.2295 -
1.2296 -fi
1.2297 -
1.2298 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.2299 - conftest$ac_exeext
1.2300 - if test "${ac_cv_search_strerror+set}" = set; then
1.2301 - break
1.2302 -fi
1.2303 -done
1.2304 -if test "${ac_cv_search_strerror+set}" = set; then
1.2305 - :
1.2306 -else
1.2307 - ac_cv_search_strerror=no
1.2308 -fi
1.2309 -rm conftest.$ac_ext
1.2310 -LIBS=$ac_func_search_save_LIBS
1.2311 -fi
1.2312 -{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
1.2313 -echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
1.2314 -ac_res=$ac_cv_search_strerror
1.2315 -if test "$ac_res" != no; then
1.2316 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
1.2317 -
1.2318 -fi
1.2319 +rm -f conftest.$ac_objext conftest$ac_exeext
1.2320 +if { (ac_try="$ac_link"
1.2321 +case "(($ac_try" in
1.2322 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2323 + *) ac_try_echo=$ac_try;;
1.2324 +esac
1.2325 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2326 +$as_echo "$ac_try_echo") >&5
1.2327 + (eval "$ac_link") 2>conftest.er1
1.2328 + ac_status=$?
1.2329 + grep -v '^ *+' conftest.er1 >conftest.err
1.2330 + rm -f conftest.er1
1.2331 + cat conftest.err >&5
1.2332 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2333 + (exit $ac_status); } && {
1.2334 + test -z "$ac_c_werror_flag" ||
1.2335 + test ! -s conftest.err
1.2336 + } && test -s conftest$ac_exeext && {
1.2337 + test "$cross_compiling" = yes ||
1.2338 + $as_test_x conftest$ac_exeext
1.2339 + }; then
1.2340 + ac_cv_lib_cposix_strerror=yes
1.2341 +else
1.2342 + $as_echo "$as_me: failed program was:" >&5
1.2343 +sed 's/^/| /' conftest.$ac_ext >&5
1.2344 +
1.2345 + ac_cv_lib_cposix_strerror=no
1.2346 +fi
1.2347 +
1.2348 +rm -rf conftest.dSYM
1.2349 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.2350 + conftest$ac_exeext conftest.$ac_ext
1.2351 +LIBS=$ac_check_lib_save_LIBS
1.2352 +fi
1.2353 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
1.2354 +$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
1.2355 +if test $ac_cv_lib_cposix_strerror = yes; then
1.2356 + LIBS="$LIBS -lcposix"
1.2357 +fi
1.2358 +
1.2359 +
1.2360
1.2361 ac_ext=c
1.2362 ac_cpp='$CPP $CPPFLAGS'
1.2363 @@ -3451,10 +3613,10 @@
1.2364 if test -n "$ac_tool_prefix"; then
1.2365 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1.2366 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1.2367 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2368 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.2369 -if test "${ac_cv_prog_CC+set}" = set; then
1.2370 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2371 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2372 +$as_echo_n "checking for $ac_word... " >&6; }
1.2373 +if test "${ac_cv_prog_CC+set}" = set; then
1.2374 + $as_echo_n "(cached) " >&6
1.2375 else
1.2376 if test -n "$CC"; then
1.2377 ac_cv_prog_CC="$CC" # Let the user override the test.
1.2378 @@ -3467,22 +3629,22 @@
1.2379 for ac_exec_ext in '' $ac_executable_extensions; do
1.2380 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2381 ac_cv_prog_CC="${ac_tool_prefix}gcc"
1.2382 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2383 - break 2
1.2384 - fi
1.2385 -done
1.2386 -done
1.2387 -IFS=$as_save_IFS
1.2388 -
1.2389 -fi
1.2390 -fi
1.2391 -CC=$ac_cv_prog_CC
1.2392 -if test -n "$CC"; then
1.2393 - { echo "$as_me:$LINENO: result: $CC" >&5
1.2394 -echo "${ECHO_T}$CC" >&6; }
1.2395 -else
1.2396 - { echo "$as_me:$LINENO: result: no" >&5
1.2397 -echo "${ECHO_T}no" >&6; }
1.2398 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2399 + break 2
1.2400 + fi
1.2401 +done
1.2402 +done
1.2403 +IFS=$as_save_IFS
1.2404 +
1.2405 +fi
1.2406 +fi
1.2407 +CC=$ac_cv_prog_CC
1.2408 +if test -n "$CC"; then
1.2409 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.2410 +$as_echo "$CC" >&6; }
1.2411 +else
1.2412 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.2413 +$as_echo "no" >&6; }
1.2414 fi
1.2415
1.2416
1.2417 @@ -3491,10 +3653,10 @@
1.2418 ac_ct_CC=$CC
1.2419 # Extract the first word of "gcc", so it can be a program name with args.
1.2420 set dummy gcc; ac_word=$2
1.2421 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2422 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.2423 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2424 +$as_echo_n "checking for $ac_word... " >&6; }
1.2425 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1.2426 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2427 + $as_echo_n "(cached) " >&6
1.2428 else
1.2429 if test -n "$ac_ct_CC"; then
1.2430 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1.2431 @@ -3507,7 +3669,7 @@
1.2432 for ac_exec_ext in '' $ac_executable_extensions; do
1.2433 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2434 ac_cv_prog_ac_ct_CC="gcc"
1.2435 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2436 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2437 break 2
1.2438 fi
1.2439 done
1.2440 @@ -3518,11 +3680,11 @@
1.2441 fi
1.2442 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1.2443 if test -n "$ac_ct_CC"; then
1.2444 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.2445 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1.2446 -else
1.2447 - { echo "$as_me:$LINENO: result: no" >&5
1.2448 -echo "${ECHO_T}no" >&6; }
1.2449 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.2450 +$as_echo "$ac_ct_CC" >&6; }
1.2451 +else
1.2452 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.2453 +$as_echo "no" >&6; }
1.2454 fi
1.2455
1.2456 if test "x$ac_ct_CC" = x; then
1.2457 @@ -3530,10 +3692,10 @@
1.2458 else
1.2459 case $cross_compiling:$ac_tool_warned in
1.2460 yes:)
1.2461 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.2462 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.2463 whose name does not start with the host triplet. If you think this
1.2464 configuration is useful to you, please write to autoconf@gnu.org." >&5
1.2465 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.2466 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.2467 whose name does not start with the host triplet. If you think this
1.2468 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.2469 ac_tool_warned=yes ;;
1.2470 @@ -3548,10 +3710,10 @@
1.2471 if test -n "$ac_tool_prefix"; then
1.2472 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1.2473 set dummy ${ac_tool_prefix}cc; ac_word=$2
1.2474 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2475 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.2476 -if test "${ac_cv_prog_CC+set}" = set; then
1.2477 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2478 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2479 +$as_echo_n "checking for $ac_word... " >&6; }
1.2480 +if test "${ac_cv_prog_CC+set}" = set; then
1.2481 + $as_echo_n "(cached) " >&6
1.2482 else
1.2483 if test -n "$CC"; then
1.2484 ac_cv_prog_CC="$CC" # Let the user override the test.
1.2485 @@ -3564,22 +3726,22 @@
1.2486 for ac_exec_ext in '' $ac_executable_extensions; do
1.2487 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2488 ac_cv_prog_CC="${ac_tool_prefix}cc"
1.2489 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2490 - break 2
1.2491 - fi
1.2492 -done
1.2493 -done
1.2494 -IFS=$as_save_IFS
1.2495 -
1.2496 -fi
1.2497 -fi
1.2498 -CC=$ac_cv_prog_CC
1.2499 -if test -n "$CC"; then
1.2500 - { echo "$as_me:$LINENO: result: $CC" >&5
1.2501 -echo "${ECHO_T}$CC" >&6; }
1.2502 -else
1.2503 - { echo "$as_me:$LINENO: result: no" >&5
1.2504 -echo "${ECHO_T}no" >&6; }
1.2505 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2506 + break 2
1.2507 + fi
1.2508 +done
1.2509 +done
1.2510 +IFS=$as_save_IFS
1.2511 +
1.2512 +fi
1.2513 +fi
1.2514 +CC=$ac_cv_prog_CC
1.2515 +if test -n "$CC"; then
1.2516 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.2517 +$as_echo "$CC" >&6; }
1.2518 +else
1.2519 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.2520 +$as_echo "no" >&6; }
1.2521 fi
1.2522
1.2523
1.2524 @@ -3588,10 +3750,10 @@
1.2525 if test -z "$CC"; then
1.2526 # Extract the first word of "cc", so it can be a program name with args.
1.2527 set dummy cc; ac_word=$2
1.2528 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2529 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.2530 -if test "${ac_cv_prog_CC+set}" = set; then
1.2531 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2532 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2533 +$as_echo_n "checking for $ac_word... " >&6; }
1.2534 +if test "${ac_cv_prog_CC+set}" = set; then
1.2535 + $as_echo_n "(cached) " >&6
1.2536 else
1.2537 if test -n "$CC"; then
1.2538 ac_cv_prog_CC="$CC" # Let the user override the test.
1.2539 @@ -3609,7 +3771,7 @@
1.2540 continue
1.2541 fi
1.2542 ac_cv_prog_CC="cc"
1.2543 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2544 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2545 break 2
1.2546 fi
1.2547 done
1.2548 @@ -3632,11 +3794,11 @@
1.2549 fi
1.2550 CC=$ac_cv_prog_CC
1.2551 if test -n "$CC"; then
1.2552 - { echo "$as_me:$LINENO: result: $CC" >&5
1.2553 -echo "${ECHO_T}$CC" >&6; }
1.2554 -else
1.2555 - { echo "$as_me:$LINENO: result: no" >&5
1.2556 -echo "${ECHO_T}no" >&6; }
1.2557 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.2558 +$as_echo "$CC" >&6; }
1.2559 +else
1.2560 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.2561 +$as_echo "no" >&6; }
1.2562 fi
1.2563
1.2564
1.2565 @@ -3647,10 +3809,10 @@
1.2566 do
1.2567 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.2568 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2569 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2570 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.2571 -if test "${ac_cv_prog_CC+set}" = set; then
1.2572 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2573 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2574 +$as_echo_n "checking for $ac_word... " >&6; }
1.2575 +if test "${ac_cv_prog_CC+set}" = set; then
1.2576 + $as_echo_n "(cached) " >&6
1.2577 else
1.2578 if test -n "$CC"; then
1.2579 ac_cv_prog_CC="$CC" # Let the user override the test.
1.2580 @@ -3663,22 +3825,22 @@
1.2581 for ac_exec_ext in '' $ac_executable_extensions; do
1.2582 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2583 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1.2584 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2585 - break 2
1.2586 - fi
1.2587 -done
1.2588 -done
1.2589 -IFS=$as_save_IFS
1.2590 -
1.2591 -fi
1.2592 -fi
1.2593 -CC=$ac_cv_prog_CC
1.2594 -if test -n "$CC"; then
1.2595 - { echo "$as_me:$LINENO: result: $CC" >&5
1.2596 -echo "${ECHO_T}$CC" >&6; }
1.2597 -else
1.2598 - { echo "$as_me:$LINENO: result: no" >&5
1.2599 -echo "${ECHO_T}no" >&6; }
1.2600 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2601 + break 2
1.2602 + fi
1.2603 +done
1.2604 +done
1.2605 +IFS=$as_save_IFS
1.2606 +
1.2607 +fi
1.2608 +fi
1.2609 +CC=$ac_cv_prog_CC
1.2610 +if test -n "$CC"; then
1.2611 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.2612 +$as_echo "$CC" >&6; }
1.2613 +else
1.2614 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.2615 +$as_echo "no" >&6; }
1.2616 fi
1.2617
1.2618
1.2619 @@ -3691,10 +3853,10 @@
1.2620 do
1.2621 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2622 set dummy $ac_prog; ac_word=$2
1.2623 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2624 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.2625 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2626 +$as_echo_n "checking for $ac_word... " >&6; }
1.2627 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1.2628 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2629 + $as_echo_n "(cached) " >&6
1.2630 else
1.2631 if test -n "$ac_ct_CC"; then
1.2632 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1.2633 @@ -3707,7 +3869,7 @@
1.2634 for ac_exec_ext in '' $ac_executable_extensions; do
1.2635 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2636 ac_cv_prog_ac_ct_CC="$ac_prog"
1.2637 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2638 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2639 break 2
1.2640 fi
1.2641 done
1.2642 @@ -3718,11 +3880,11 @@
1.2643 fi
1.2644 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1.2645 if test -n "$ac_ct_CC"; then
1.2646 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.2647 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1.2648 -else
1.2649 - { echo "$as_me:$LINENO: result: no" >&5
1.2650 -echo "${ECHO_T}no" >&6; }
1.2651 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.2652 +$as_echo "$ac_ct_CC" >&6; }
1.2653 +else
1.2654 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.2655 +$as_echo "no" >&6; }
1.2656 fi
1.2657
1.2658
1.2659 @@ -3734,10 +3896,10 @@
1.2660 else
1.2661 case $cross_compiling:$ac_tool_warned in
1.2662 yes:)
1.2663 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.2664 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.2665 whose name does not start with the host triplet. If you think this
1.2666 configuration is useful to you, please write to autoconf@gnu.org." >&5
1.2667 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.2668 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.2669 whose name does not start with the host triplet. If you think this
1.2670 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.2671 ac_tool_warned=yes ;;
1.2672 @@ -3749,50 +3911,54 @@
1.2673 fi
1.2674
1.2675
1.2676 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1.2677 -See \`config.log' for more details." >&5
1.2678 -echo "$as_me: error: no acceptable C compiler found in \$PATH
1.2679 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1.2680 +See \`config.log' for more details." >&5
1.2681 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1.2682 See \`config.log' for more details." >&2;}
1.2683 { (exit 1); exit 1; }; }
1.2684
1.2685 # Provide some information about the compiler.
1.2686 -echo "$as_me:$LINENO: checking for C compiler version" >&5
1.2687 -ac_compiler=`set X $ac_compile; echo $2`
1.2688 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1.2689 +set X $ac_compile
1.2690 +ac_compiler=$2
1.2691 { (ac_try="$ac_compiler --version >&5"
1.2692 case "(($ac_try" in
1.2693 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2694 *) ac_try_echo=$ac_try;;
1.2695 esac
1.2696 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2697 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2698 +$as_echo "$ac_try_echo") >&5
1.2699 (eval "$ac_compiler --version >&5") 2>&5
1.2700 ac_status=$?
1.2701 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2702 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2703 (exit $ac_status); }
1.2704 { (ac_try="$ac_compiler -v >&5"
1.2705 case "(($ac_try" in
1.2706 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2707 *) ac_try_echo=$ac_try;;
1.2708 esac
1.2709 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2710 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2711 +$as_echo "$ac_try_echo") >&5
1.2712 (eval "$ac_compiler -v >&5") 2>&5
1.2713 ac_status=$?
1.2714 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2715 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2716 (exit $ac_status); }
1.2717 { (ac_try="$ac_compiler -V >&5"
1.2718 case "(($ac_try" in
1.2719 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2720 *) ac_try_echo=$ac_try;;
1.2721 esac
1.2722 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2723 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2724 +$as_echo "$ac_try_echo") >&5
1.2725 (eval "$ac_compiler -V >&5") 2>&5
1.2726 ac_status=$?
1.2727 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2728 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2729 (exit $ac_status); }
1.2730
1.2731 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1.2732 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
1.2733 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1.2734 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1.2735 if test "${ac_cv_c_compiler_gnu+set}" = set; then
1.2736 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2737 + $as_echo_n "(cached) " >&6
1.2738 else
1.2739 cat >conftest.$ac_ext <<_ACEOF
1.2740 /* confdefs.h. */
1.2741 @@ -3818,20 +3984,21 @@
1.2742 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2743 *) ac_try_echo=$ac_try;;
1.2744 esac
1.2745 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2746 - (eval "$ac_compile") 2>conftest.er1
1.2747 - ac_status=$?
1.2748 - grep -v '^ *+' conftest.er1 >conftest.err
1.2749 - rm -f conftest.er1
1.2750 - cat conftest.err >&5
1.2751 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2752 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2753 +$as_echo "$ac_try_echo") >&5
1.2754 + (eval "$ac_compile") 2>conftest.er1
1.2755 + ac_status=$?
1.2756 + grep -v '^ *+' conftest.er1 >conftest.err
1.2757 + rm -f conftest.er1
1.2758 + cat conftest.err >&5
1.2759 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2760 (exit $ac_status); } && {
1.2761 test -z "$ac_c_werror_flag" ||
1.2762 test ! -s conftest.err
1.2763 } && test -s conftest.$ac_objext; then
1.2764 ac_compiler_gnu=yes
1.2765 else
1.2766 - echo "$as_me: failed program was:" >&5
1.2767 + $as_echo "$as_me: failed program was:" >&5
1.2768 sed 's/^/| /' conftest.$ac_ext >&5
1.2769
1.2770 ac_compiler_gnu=no
1.2771 @@ -3841,15 +4008,19 @@
1.2772 ac_cv_c_compiler_gnu=$ac_compiler_gnu
1.2773
1.2774 fi
1.2775 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1.2776 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
1.2777 -GCC=`test $ac_compiler_gnu = yes && echo yes`
1.2778 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1.2779 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
1.2780 +if test $ac_compiler_gnu = yes; then
1.2781 + GCC=yes
1.2782 +else
1.2783 + GCC=
1.2784 +fi
1.2785 ac_test_CFLAGS=${CFLAGS+set}
1.2786 ac_save_CFLAGS=$CFLAGS
1.2787 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1.2788 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
1.2789 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1.2790 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
1.2791 if test "${ac_cv_prog_cc_g+set}" = set; then
1.2792 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2793 + $as_echo_n "(cached) " >&6
1.2794 else
1.2795 ac_save_c_werror_flag=$ac_c_werror_flag
1.2796 ac_c_werror_flag=yes
1.2797 @@ -3876,20 +4047,21 @@
1.2798 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2799 *) ac_try_echo=$ac_try;;
1.2800 esac
1.2801 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2802 - (eval "$ac_compile") 2>conftest.er1
1.2803 - ac_status=$?
1.2804 - grep -v '^ *+' conftest.er1 >conftest.err
1.2805 - rm -f conftest.er1
1.2806 - cat conftest.err >&5
1.2807 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2808 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2809 +$as_echo "$ac_try_echo") >&5
1.2810 + (eval "$ac_compile") 2>conftest.er1
1.2811 + ac_status=$?
1.2812 + grep -v '^ *+' conftest.er1 >conftest.err
1.2813 + rm -f conftest.er1
1.2814 + cat conftest.err >&5
1.2815 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2816 (exit $ac_status); } && {
1.2817 test -z "$ac_c_werror_flag" ||
1.2818 test ! -s conftest.err
1.2819 } && test -s conftest.$ac_objext; then
1.2820 ac_cv_prog_cc_g=yes
1.2821 else
1.2822 - echo "$as_me: failed program was:" >&5
1.2823 + $as_echo "$as_me: failed program was:" >&5
1.2824 sed 's/^/| /' conftest.$ac_ext >&5
1.2825
1.2826 CFLAGS=""
1.2827 @@ -3914,20 +4086,21 @@
1.2828 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2829 *) ac_try_echo=$ac_try;;
1.2830 esac
1.2831 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2832 - (eval "$ac_compile") 2>conftest.er1
1.2833 - ac_status=$?
1.2834 - grep -v '^ *+' conftest.er1 >conftest.err
1.2835 - rm -f conftest.er1
1.2836 - cat conftest.err >&5
1.2837 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2838 - (exit $ac_status); } && {
1.2839 - test -z "$ac_c_werror_flag" ||
1.2840 - test ! -s conftest.err
1.2841 - } && test -s conftest.$ac_objext; then
1.2842 - :
1.2843 -else
1.2844 - echo "$as_me: failed program was:" >&5
1.2845 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2846 +$as_echo "$ac_try_echo") >&5
1.2847 + (eval "$ac_compile") 2>conftest.er1
1.2848 + ac_status=$?
1.2849 + grep -v '^ *+' conftest.er1 >conftest.err
1.2850 + rm -f conftest.er1
1.2851 + cat conftest.err >&5
1.2852 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2853 + (exit $ac_status); } && {
1.2854 + test -z "$ac_c_werror_flag" ||
1.2855 + test ! -s conftest.err
1.2856 + } && test -s conftest.$ac_objext; then
1.2857 + :
1.2858 +else
1.2859 + $as_echo "$as_me: failed program was:" >&5
1.2860 sed 's/^/| /' conftest.$ac_ext >&5
1.2861
1.2862 ac_c_werror_flag=$ac_save_c_werror_flag
1.2863 @@ -3953,20 +4126,21 @@
1.2864 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2865 *) ac_try_echo=$ac_try;;
1.2866 esac
1.2867 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2868 - (eval "$ac_compile") 2>conftest.er1
1.2869 - ac_status=$?
1.2870 - grep -v '^ *+' conftest.er1 >conftest.err
1.2871 - rm -f conftest.er1
1.2872 - cat conftest.err >&5
1.2873 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2874 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2875 +$as_echo "$ac_try_echo") >&5
1.2876 + (eval "$ac_compile") 2>conftest.er1
1.2877 + ac_status=$?
1.2878 + grep -v '^ *+' conftest.er1 >conftest.err
1.2879 + rm -f conftest.er1
1.2880 + cat conftest.err >&5
1.2881 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2882 (exit $ac_status); } && {
1.2883 test -z "$ac_c_werror_flag" ||
1.2884 test ! -s conftest.err
1.2885 } && test -s conftest.$ac_objext; then
1.2886 ac_cv_prog_cc_g=yes
1.2887 else
1.2888 - echo "$as_me: failed program was:" >&5
1.2889 + $as_echo "$as_me: failed program was:" >&5
1.2890 sed 's/^/| /' conftest.$ac_ext >&5
1.2891
1.2892
1.2893 @@ -3981,8 +4155,8 @@
1.2894 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.2895 ac_c_werror_flag=$ac_save_c_werror_flag
1.2896 fi
1.2897 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1.2898 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
1.2899 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1.2900 +$as_echo "$ac_cv_prog_cc_g" >&6; }
1.2901 if test "$ac_test_CFLAGS" = set; then
1.2902 CFLAGS=$ac_save_CFLAGS
1.2903 elif test $ac_cv_prog_cc_g = yes; then
1.2904 @@ -3998,10 +4172,10 @@
1.2905 CFLAGS=
1.2906 fi
1.2907 fi
1.2908 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1.2909 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
1.2910 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1.2911 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1.2912 if test "${ac_cv_prog_cc_c89+set}" = set; then
1.2913 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2914 + $as_echo_n "(cached) " >&6
1.2915 else
1.2916 ac_cv_prog_cc_c89=no
1.2917 ac_save_CC=$CC
1.2918 @@ -4072,20 +4246,21 @@
1.2919 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.2920 *) ac_try_echo=$ac_try;;
1.2921 esac
1.2922 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.2923 - (eval "$ac_compile") 2>conftest.er1
1.2924 - ac_status=$?
1.2925 - grep -v '^ *+' conftest.er1 >conftest.err
1.2926 - rm -f conftest.er1
1.2927 - cat conftest.err >&5
1.2928 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2929 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.2930 +$as_echo "$ac_try_echo") >&5
1.2931 + (eval "$ac_compile") 2>conftest.er1
1.2932 + ac_status=$?
1.2933 + grep -v '^ *+' conftest.er1 >conftest.err
1.2934 + rm -f conftest.er1
1.2935 + cat conftest.err >&5
1.2936 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.2937 (exit $ac_status); } && {
1.2938 test -z "$ac_c_werror_flag" ||
1.2939 test ! -s conftest.err
1.2940 } && test -s conftest.$ac_objext; then
1.2941 ac_cv_prog_cc_c89=$ac_arg
1.2942 else
1.2943 - echo "$as_me: failed program was:" >&5
1.2944 + $as_echo "$as_me: failed program was:" >&5
1.2945 sed 's/^/| /' conftest.$ac_ext >&5
1.2946
1.2947
1.2948 @@ -4101,15 +4276,15 @@
1.2949 # AC_CACHE_VAL
1.2950 case "x$ac_cv_prog_cc_c89" in
1.2951 x)
1.2952 - { echo "$as_me:$LINENO: result: none needed" >&5
1.2953 -echo "${ECHO_T}none needed" >&6; } ;;
1.2954 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
1.2955 +$as_echo "none needed" >&6; } ;;
1.2956 xno)
1.2957 - { echo "$as_me:$LINENO: result: unsupported" >&5
1.2958 -echo "${ECHO_T}unsupported" >&6; } ;;
1.2959 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
1.2960 +$as_echo "unsupported" >&6; } ;;
1.2961 *)
1.2962 CC="$CC $ac_cv_prog_cc_c89"
1.2963 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1.2964 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
1.2965 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1.2966 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
1.2967 esac
1.2968
1.2969
1.2970 @@ -4121,10 +4296,10 @@
1.2971
1.2972 depcc="$CC" am_compiler_list=
1.2973
1.2974 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
1.2975 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
1.2976 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
1.2977 +$as_echo_n "checking dependency style of $depcc... " >&6; }
1.2978 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
1.2979 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.2980 + $as_echo_n "(cached) " >&6
1.2981 else
1.2982 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1.2983 # We make a subdir and do the tests there. Otherwise we can end up
1.2984 @@ -4160,7 +4335,9 @@
1.2985 : > sub/conftest.c
1.2986 for i in 1 2 3 4 5 6; do
1.2987 echo '#include "conftst'$i'.h"' >> sub/conftest.c
1.2988 - : > sub/conftst$i.h
1.2989 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
1.2990 + # Solaris 8's {/usr,}/bin/sh.
1.2991 + touch sub/conftst$i.h
1.2992 done
1.2993 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1.2994
1.2995 @@ -4188,9 +4365,14 @@
1.2996 grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1.2997 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1.2998 # icc doesn't choke on unknown options, it will just issue warnings
1.2999 - # (even with -Werror). So we grep stderr for any message
1.3000 - # that says an option was ignored.
1.3001 - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
1.3002 + # or remarks (even with -Werror). So we grep stderr for any message
1.3003 + # that says an option was ignored or not supported.
1.3004 + # When given -MP, icc 7.0 and 7.1 complain thusly:
1.3005 + # icc: Command line warning: ignoring option '-M'; no argument required
1.3006 + # The diagnosis changed in icc 8.0:
1.3007 + # icc: Command line remark: option '-MP' not supported
1.3008 + if (grep 'ignoring option' conftest.err ||
1.3009 + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
1.3010 am_cv_CC_dependencies_compiler_type=$depmode
1.3011 break
1.3012 fi
1.3013 @@ -4204,8 +4386,8 @@
1.3014 fi
1.3015
1.3016 fi
1.3017 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
1.3018 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
1.3019 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
1.3020 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
1.3021 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
1.3022
1.3023
1.3024 @@ -4221,27 +4403,581 @@
1.3025 fi
1.3026
1.3027
1.3028 -
1.3029 -
1.3030 -
1.3031 -{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
1.3032 -echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; }
1.3033 -if test "${am_cv_prog_cc_stdc+set}" = set; then
1.3034 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.3035 -else
1.3036 - am_cv_prog_cc_stdc=no
1.3037 -ac_save_CC="$CC"
1.3038 -# Don't try gcc -ansi; that turns off useful extensions and
1.3039 -# breaks some systems' header files.
1.3040 -# AIX -qlanglvl=ansi
1.3041 -# Ultrix and OSF/1 -std1
1.3042 -# HP-UX 10.20 and later -Ae
1.3043 -# HP-UX older versions -Aa -D_HPUX_SOURCE
1.3044 -# SVR4 -Xc -D__EXTENSIONS__
1.3045 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
1.3046 -do
1.3047 - CC="$ac_save_CC $ac_arg"
1.3048 - cat >conftest.$ac_ext <<_ACEOF
1.3049 +ac_ext=c
1.3050 +ac_cpp='$CPP $CPPFLAGS'
1.3051 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.3052 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.3053 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.3054 +if test -n "$ac_tool_prefix"; then
1.3055 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1.3056 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
1.3057 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.3058 +$as_echo_n "checking for $ac_word... " >&6; }
1.3059 +if test "${ac_cv_prog_CC+set}" = set; then
1.3060 + $as_echo_n "(cached) " >&6
1.3061 +else
1.3062 + if test -n "$CC"; then
1.3063 + ac_cv_prog_CC="$CC" # Let the user override the test.
1.3064 +else
1.3065 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3066 +for as_dir in $PATH
1.3067 +do
1.3068 + IFS=$as_save_IFS
1.3069 + test -z "$as_dir" && as_dir=.
1.3070 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3071 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3072 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
1.3073 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3074 + break 2
1.3075 + fi
1.3076 +done
1.3077 +done
1.3078 +IFS=$as_save_IFS
1.3079 +
1.3080 +fi
1.3081 +fi
1.3082 +CC=$ac_cv_prog_CC
1.3083 +if test -n "$CC"; then
1.3084 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.3085 +$as_echo "$CC" >&6; }
1.3086 +else
1.3087 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.3088 +$as_echo "no" >&6; }
1.3089 +fi
1.3090 +
1.3091 +
1.3092 +fi
1.3093 +if test -z "$ac_cv_prog_CC"; then
1.3094 + ac_ct_CC=$CC
1.3095 + # Extract the first word of "gcc", so it can be a program name with args.
1.3096 +set dummy gcc; ac_word=$2
1.3097 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.3098 +$as_echo_n "checking for $ac_word... " >&6; }
1.3099 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1.3100 + $as_echo_n "(cached) " >&6
1.3101 +else
1.3102 + if test -n "$ac_ct_CC"; then
1.3103 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1.3104 +else
1.3105 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3106 +for as_dir in $PATH
1.3107 +do
1.3108 + IFS=$as_save_IFS
1.3109 + test -z "$as_dir" && as_dir=.
1.3110 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3111 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3112 + ac_cv_prog_ac_ct_CC="gcc"
1.3113 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3114 + break 2
1.3115 + fi
1.3116 +done
1.3117 +done
1.3118 +IFS=$as_save_IFS
1.3119 +
1.3120 +fi
1.3121 +fi
1.3122 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
1.3123 +if test -n "$ac_ct_CC"; then
1.3124 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.3125 +$as_echo "$ac_ct_CC" >&6; }
1.3126 +else
1.3127 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.3128 +$as_echo "no" >&6; }
1.3129 +fi
1.3130 +
1.3131 + if test "x$ac_ct_CC" = x; then
1.3132 + CC=""
1.3133 + else
1.3134 + case $cross_compiling:$ac_tool_warned in
1.3135 +yes:)
1.3136 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.3137 +whose name does not start with the host triplet. If you think this
1.3138 +configuration is useful to you, please write to autoconf@gnu.org." >&5
1.3139 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.3140 +whose name does not start with the host triplet. If you think this
1.3141 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.3142 +ac_tool_warned=yes ;;
1.3143 +esac
1.3144 + CC=$ac_ct_CC
1.3145 + fi
1.3146 +else
1.3147 + CC="$ac_cv_prog_CC"
1.3148 +fi
1.3149 +
1.3150 +if test -z "$CC"; then
1.3151 + if test -n "$ac_tool_prefix"; then
1.3152 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1.3153 +set dummy ${ac_tool_prefix}cc; ac_word=$2
1.3154 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.3155 +$as_echo_n "checking for $ac_word... " >&6; }
1.3156 +if test "${ac_cv_prog_CC+set}" = set; then
1.3157 + $as_echo_n "(cached) " >&6
1.3158 +else
1.3159 + if test -n "$CC"; then
1.3160 + ac_cv_prog_CC="$CC" # Let the user override the test.
1.3161 +else
1.3162 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3163 +for as_dir in $PATH
1.3164 +do
1.3165 + IFS=$as_save_IFS
1.3166 + test -z "$as_dir" && as_dir=.
1.3167 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3168 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3169 + ac_cv_prog_CC="${ac_tool_prefix}cc"
1.3170 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3171 + break 2
1.3172 + fi
1.3173 +done
1.3174 +done
1.3175 +IFS=$as_save_IFS
1.3176 +
1.3177 +fi
1.3178 +fi
1.3179 +CC=$ac_cv_prog_CC
1.3180 +if test -n "$CC"; then
1.3181 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.3182 +$as_echo "$CC" >&6; }
1.3183 +else
1.3184 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.3185 +$as_echo "no" >&6; }
1.3186 +fi
1.3187 +
1.3188 +
1.3189 + fi
1.3190 +fi
1.3191 +if test -z "$CC"; then
1.3192 + # Extract the first word of "cc", so it can be a program name with args.
1.3193 +set dummy cc; ac_word=$2
1.3194 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.3195 +$as_echo_n "checking for $ac_word... " >&6; }
1.3196 +if test "${ac_cv_prog_CC+set}" = set; then
1.3197 + $as_echo_n "(cached) " >&6
1.3198 +else
1.3199 + if test -n "$CC"; then
1.3200 + ac_cv_prog_CC="$CC" # Let the user override the test.
1.3201 +else
1.3202 + ac_prog_rejected=no
1.3203 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3204 +for as_dir in $PATH
1.3205 +do
1.3206 + IFS=$as_save_IFS
1.3207 + test -z "$as_dir" && as_dir=.
1.3208 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3209 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3210 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
1.3211 + ac_prog_rejected=yes
1.3212 + continue
1.3213 + fi
1.3214 + ac_cv_prog_CC="cc"
1.3215 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3216 + break 2
1.3217 + fi
1.3218 +done
1.3219 +done
1.3220 +IFS=$as_save_IFS
1.3221 +
1.3222 +if test $ac_prog_rejected = yes; then
1.3223 + # We found a bogon in the path, so make sure we never use it.
1.3224 + set dummy $ac_cv_prog_CC
1.3225 + shift
1.3226 + if test $# != 0; then
1.3227 + # We chose a different compiler from the bogus one.
1.3228 + # However, it has the same basename, so the bogon will be chosen
1.3229 + # first if we set CC to just the basename; use the full file name.
1.3230 + shift
1.3231 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
1.3232 + fi
1.3233 +fi
1.3234 +fi
1.3235 +fi
1.3236 +CC=$ac_cv_prog_CC
1.3237 +if test -n "$CC"; then
1.3238 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.3239 +$as_echo "$CC" >&6; }
1.3240 +else
1.3241 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.3242 +$as_echo "no" >&6; }
1.3243 +fi
1.3244 +
1.3245 +
1.3246 +fi
1.3247 +if test -z "$CC"; then
1.3248 + if test -n "$ac_tool_prefix"; then
1.3249 + for ac_prog in cl.exe
1.3250 + do
1.3251 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.3252 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.3253 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.3254 +$as_echo_n "checking for $ac_word... " >&6; }
1.3255 +if test "${ac_cv_prog_CC+set}" = set; then
1.3256 + $as_echo_n "(cached) " >&6
1.3257 +else
1.3258 + if test -n "$CC"; then
1.3259 + ac_cv_prog_CC="$CC" # Let the user override the test.
1.3260 +else
1.3261 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3262 +for as_dir in $PATH
1.3263 +do
1.3264 + IFS=$as_save_IFS
1.3265 + test -z "$as_dir" && as_dir=.
1.3266 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3267 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3268 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1.3269 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3270 + break 2
1.3271 + fi
1.3272 +done
1.3273 +done
1.3274 +IFS=$as_save_IFS
1.3275 +
1.3276 +fi
1.3277 +fi
1.3278 +CC=$ac_cv_prog_CC
1.3279 +if test -n "$CC"; then
1.3280 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1.3281 +$as_echo "$CC" >&6; }
1.3282 +else
1.3283 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.3284 +$as_echo "no" >&6; }
1.3285 +fi
1.3286 +
1.3287 +
1.3288 + test -n "$CC" && break
1.3289 + done
1.3290 +fi
1.3291 +if test -z "$CC"; then
1.3292 + ac_ct_CC=$CC
1.3293 + for ac_prog in cl.exe
1.3294 +do
1.3295 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3296 +set dummy $ac_prog; ac_word=$2
1.3297 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.3298 +$as_echo_n "checking for $ac_word... " >&6; }
1.3299 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1.3300 + $as_echo_n "(cached) " >&6
1.3301 +else
1.3302 + if test -n "$ac_ct_CC"; then
1.3303 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1.3304 +else
1.3305 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3306 +for as_dir in $PATH
1.3307 +do
1.3308 + IFS=$as_save_IFS
1.3309 + test -z "$as_dir" && as_dir=.
1.3310 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3311 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3312 + ac_cv_prog_ac_ct_CC="$ac_prog"
1.3313 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3314 + break 2
1.3315 + fi
1.3316 +done
1.3317 +done
1.3318 +IFS=$as_save_IFS
1.3319 +
1.3320 +fi
1.3321 +fi
1.3322 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
1.3323 +if test -n "$ac_ct_CC"; then
1.3324 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1.3325 +$as_echo "$ac_ct_CC" >&6; }
1.3326 +else
1.3327 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.3328 +$as_echo "no" >&6; }
1.3329 +fi
1.3330 +
1.3331 +
1.3332 + test -n "$ac_ct_CC" && break
1.3333 +done
1.3334 +
1.3335 + if test "x$ac_ct_CC" = x; then
1.3336 + CC=""
1.3337 + else
1.3338 + case $cross_compiling:$ac_tool_warned in
1.3339 +yes:)
1.3340 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.3341 +whose name does not start with the host triplet. If you think this
1.3342 +configuration is useful to you, please write to autoconf@gnu.org." >&5
1.3343 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.3344 +whose name does not start with the host triplet. If you think this
1.3345 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.3346 +ac_tool_warned=yes ;;
1.3347 +esac
1.3348 + CC=$ac_ct_CC
1.3349 + fi
1.3350 +fi
1.3351 +
1.3352 +fi
1.3353 +
1.3354 +
1.3355 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1.3356 +See \`config.log' for more details." >&5
1.3357 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1.3358 +See \`config.log' for more details." >&2;}
1.3359 + { (exit 1); exit 1; }; }
1.3360 +
1.3361 +# Provide some information about the compiler.
1.3362 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1.3363 +set X $ac_compile
1.3364 +ac_compiler=$2
1.3365 +{ (ac_try="$ac_compiler --version >&5"
1.3366 +case "(($ac_try" in
1.3367 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3368 + *) ac_try_echo=$ac_try;;
1.3369 +esac
1.3370 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3371 +$as_echo "$ac_try_echo") >&5
1.3372 + (eval "$ac_compiler --version >&5") 2>&5
1.3373 + ac_status=$?
1.3374 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3375 + (exit $ac_status); }
1.3376 +{ (ac_try="$ac_compiler -v >&5"
1.3377 +case "(($ac_try" in
1.3378 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3379 + *) ac_try_echo=$ac_try;;
1.3380 +esac
1.3381 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3382 +$as_echo "$ac_try_echo") >&5
1.3383 + (eval "$ac_compiler -v >&5") 2>&5
1.3384 + ac_status=$?
1.3385 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3386 + (exit $ac_status); }
1.3387 +{ (ac_try="$ac_compiler -V >&5"
1.3388 +case "(($ac_try" in
1.3389 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3390 + *) ac_try_echo=$ac_try;;
1.3391 +esac
1.3392 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3393 +$as_echo "$ac_try_echo") >&5
1.3394 + (eval "$ac_compiler -V >&5") 2>&5
1.3395 + ac_status=$?
1.3396 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3397 + (exit $ac_status); }
1.3398 +
1.3399 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1.3400 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1.3401 +if test "${ac_cv_c_compiler_gnu+set}" = set; then
1.3402 + $as_echo_n "(cached) " >&6
1.3403 +else
1.3404 + cat >conftest.$ac_ext <<_ACEOF
1.3405 +/* confdefs.h. */
1.3406 +_ACEOF
1.3407 +cat confdefs.h >>conftest.$ac_ext
1.3408 +cat >>conftest.$ac_ext <<_ACEOF
1.3409 +/* end confdefs.h. */
1.3410 +
1.3411 +int
1.3412 +main ()
1.3413 +{
1.3414 +#ifndef __GNUC__
1.3415 + choke me
1.3416 +#endif
1.3417 +
1.3418 + ;
1.3419 + return 0;
1.3420 +}
1.3421 +_ACEOF
1.3422 +rm -f conftest.$ac_objext
1.3423 +if { (ac_try="$ac_compile"
1.3424 +case "(($ac_try" in
1.3425 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3426 + *) ac_try_echo=$ac_try;;
1.3427 +esac
1.3428 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3429 +$as_echo "$ac_try_echo") >&5
1.3430 + (eval "$ac_compile") 2>conftest.er1
1.3431 + ac_status=$?
1.3432 + grep -v '^ *+' conftest.er1 >conftest.err
1.3433 + rm -f conftest.er1
1.3434 + cat conftest.err >&5
1.3435 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3436 + (exit $ac_status); } && {
1.3437 + test -z "$ac_c_werror_flag" ||
1.3438 + test ! -s conftest.err
1.3439 + } && test -s conftest.$ac_objext; then
1.3440 + ac_compiler_gnu=yes
1.3441 +else
1.3442 + $as_echo "$as_me: failed program was:" >&5
1.3443 +sed 's/^/| /' conftest.$ac_ext >&5
1.3444 +
1.3445 + ac_compiler_gnu=no
1.3446 +fi
1.3447 +
1.3448 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.3449 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
1.3450 +
1.3451 +fi
1.3452 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
1.3453 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
1.3454 +if test $ac_compiler_gnu = yes; then
1.3455 + GCC=yes
1.3456 +else
1.3457 + GCC=
1.3458 +fi
1.3459 +ac_test_CFLAGS=${CFLAGS+set}
1.3460 +ac_save_CFLAGS=$CFLAGS
1.3461 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
1.3462 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
1.3463 +if test "${ac_cv_prog_cc_g+set}" = set; then
1.3464 + $as_echo_n "(cached) " >&6
1.3465 +else
1.3466 + ac_save_c_werror_flag=$ac_c_werror_flag
1.3467 + ac_c_werror_flag=yes
1.3468 + ac_cv_prog_cc_g=no
1.3469 + CFLAGS="-g"
1.3470 + cat >conftest.$ac_ext <<_ACEOF
1.3471 +/* confdefs.h. */
1.3472 +_ACEOF
1.3473 +cat confdefs.h >>conftest.$ac_ext
1.3474 +cat >>conftest.$ac_ext <<_ACEOF
1.3475 +/* end confdefs.h. */
1.3476 +
1.3477 +int
1.3478 +main ()
1.3479 +{
1.3480 +
1.3481 + ;
1.3482 + return 0;
1.3483 +}
1.3484 +_ACEOF
1.3485 +rm -f conftest.$ac_objext
1.3486 +if { (ac_try="$ac_compile"
1.3487 +case "(($ac_try" in
1.3488 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3489 + *) ac_try_echo=$ac_try;;
1.3490 +esac
1.3491 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3492 +$as_echo "$ac_try_echo") >&5
1.3493 + (eval "$ac_compile") 2>conftest.er1
1.3494 + ac_status=$?
1.3495 + grep -v '^ *+' conftest.er1 >conftest.err
1.3496 + rm -f conftest.er1
1.3497 + cat conftest.err >&5
1.3498 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3499 + (exit $ac_status); } && {
1.3500 + test -z "$ac_c_werror_flag" ||
1.3501 + test ! -s conftest.err
1.3502 + } && test -s conftest.$ac_objext; then
1.3503 + ac_cv_prog_cc_g=yes
1.3504 +else
1.3505 + $as_echo "$as_me: failed program was:" >&5
1.3506 +sed 's/^/| /' conftest.$ac_ext >&5
1.3507 +
1.3508 + CFLAGS=""
1.3509 + cat >conftest.$ac_ext <<_ACEOF
1.3510 +/* confdefs.h. */
1.3511 +_ACEOF
1.3512 +cat confdefs.h >>conftest.$ac_ext
1.3513 +cat >>conftest.$ac_ext <<_ACEOF
1.3514 +/* end confdefs.h. */
1.3515 +
1.3516 +int
1.3517 +main ()
1.3518 +{
1.3519 +
1.3520 + ;
1.3521 + return 0;
1.3522 +}
1.3523 +_ACEOF
1.3524 +rm -f conftest.$ac_objext
1.3525 +if { (ac_try="$ac_compile"
1.3526 +case "(($ac_try" in
1.3527 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3528 + *) ac_try_echo=$ac_try;;
1.3529 +esac
1.3530 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3531 +$as_echo "$ac_try_echo") >&5
1.3532 + (eval "$ac_compile") 2>conftest.er1
1.3533 + ac_status=$?
1.3534 + grep -v '^ *+' conftest.er1 >conftest.err
1.3535 + rm -f conftest.er1
1.3536 + cat conftest.err >&5
1.3537 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3538 + (exit $ac_status); } && {
1.3539 + test -z "$ac_c_werror_flag" ||
1.3540 + test ! -s conftest.err
1.3541 + } && test -s conftest.$ac_objext; then
1.3542 + :
1.3543 +else
1.3544 + $as_echo "$as_me: failed program was:" >&5
1.3545 +sed 's/^/| /' conftest.$ac_ext >&5
1.3546 +
1.3547 + ac_c_werror_flag=$ac_save_c_werror_flag
1.3548 + CFLAGS="-g"
1.3549 + cat >conftest.$ac_ext <<_ACEOF
1.3550 +/* confdefs.h. */
1.3551 +_ACEOF
1.3552 +cat confdefs.h >>conftest.$ac_ext
1.3553 +cat >>conftest.$ac_ext <<_ACEOF
1.3554 +/* end confdefs.h. */
1.3555 +
1.3556 +int
1.3557 +main ()
1.3558 +{
1.3559 +
1.3560 + ;
1.3561 + return 0;
1.3562 +}
1.3563 +_ACEOF
1.3564 +rm -f conftest.$ac_objext
1.3565 +if { (ac_try="$ac_compile"
1.3566 +case "(($ac_try" in
1.3567 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3568 + *) ac_try_echo=$ac_try;;
1.3569 +esac
1.3570 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3571 +$as_echo "$ac_try_echo") >&5
1.3572 + (eval "$ac_compile") 2>conftest.er1
1.3573 + ac_status=$?
1.3574 + grep -v '^ *+' conftest.er1 >conftest.err
1.3575 + rm -f conftest.er1
1.3576 + cat conftest.err >&5
1.3577 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3578 + (exit $ac_status); } && {
1.3579 + test -z "$ac_c_werror_flag" ||
1.3580 + test ! -s conftest.err
1.3581 + } && test -s conftest.$ac_objext; then
1.3582 + ac_cv_prog_cc_g=yes
1.3583 +else
1.3584 + $as_echo "$as_me: failed program was:" >&5
1.3585 +sed 's/^/| /' conftest.$ac_ext >&5
1.3586 +
1.3587 +
1.3588 +fi
1.3589 +
1.3590 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.3591 +fi
1.3592 +
1.3593 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.3594 +fi
1.3595 +
1.3596 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.3597 + ac_c_werror_flag=$ac_save_c_werror_flag
1.3598 +fi
1.3599 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
1.3600 +$as_echo "$ac_cv_prog_cc_g" >&6; }
1.3601 +if test "$ac_test_CFLAGS" = set; then
1.3602 + CFLAGS=$ac_save_CFLAGS
1.3603 +elif test $ac_cv_prog_cc_g = yes; then
1.3604 + if test "$GCC" = yes; then
1.3605 + CFLAGS="-g -O2"
1.3606 + else
1.3607 + CFLAGS="-g"
1.3608 + fi
1.3609 +else
1.3610 + if test "$GCC" = yes; then
1.3611 + CFLAGS="-O2"
1.3612 + else
1.3613 + CFLAGS=
1.3614 + fi
1.3615 +fi
1.3616 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
1.3617 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1.3618 +if test "${ac_cv_prog_cc_c89+set}" = set; then
1.3619 + $as_echo_n "(cached) " >&6
1.3620 +else
1.3621 + ac_cv_prog_cc_c89=no
1.3622 +ac_save_CC=$CC
1.3623 +cat >conftest.$ac_ext <<_ACEOF
1.3624 /* confdefs.h. */
1.3625 _ACEOF
1.3626 cat confdefs.h >>conftest.$ac_ext
1.3627 @@ -4269,71 +5005,85 @@
1.3628 va_end (v);
1.3629 return s;
1.3630 }
1.3631 +
1.3632 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
1.3633 + function prototypes and stuff, but not '\xHH' hex character constants.
1.3634 + These don't provoke an error unfortunately, instead are silently treated
1.3635 + as 'x'. The following induces an error, until -std is added to get
1.3636 + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
1.3637 + array size at least. It's necessary to write '\x00'==0 to get something
1.3638 + that's true only with -std. */
1.3639 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
1.3640 +
1.3641 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
1.3642 + inside strings and character constants. */
1.3643 +#define FOO(x) 'x'
1.3644 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
1.3645 +
1.3646 int test (int i, double x);
1.3647 struct s1 {int (*f) (int a);};
1.3648 struct s2 {int (*f) (double a);};
1.3649 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
1.3650 int argc;
1.3651 char **argv;
1.3652 -
1.3653 -int
1.3654 -main ()
1.3655 -{
1.3656 -
1.3657 +int
1.3658 +main ()
1.3659 +{
1.3660 return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
1.3661 -
1.3662 - ;
1.3663 - return 0;
1.3664 -}
1.3665 -_ACEOF
1.3666 -rm -f conftest.$ac_objext
1.3667 -if { (ac_try="$ac_compile"
1.3668 -case "(($ac_try" in
1.3669 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3670 - *) ac_try_echo=$ac_try;;
1.3671 -esac
1.3672 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.3673 - (eval "$ac_compile") 2>conftest.er1
1.3674 - ac_status=$?
1.3675 - grep -v '^ *+' conftest.er1 >conftest.err
1.3676 - rm -f conftest.er1
1.3677 - cat conftest.err >&5
1.3678 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3679 - (exit $ac_status); } && {
1.3680 - test -z "$ac_c_werror_flag" ||
1.3681 - test ! -s conftest.err
1.3682 - } && test -s conftest.$ac_objext; then
1.3683 - am_cv_prog_cc_stdc="$ac_arg"; break
1.3684 -else
1.3685 - echo "$as_me: failed program was:" >&5
1.3686 -sed 's/^/| /' conftest.$ac_ext >&5
1.3687 -
1.3688 -
1.3689 -fi
1.3690 -
1.3691 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.3692 -done
1.3693 -CC="$ac_save_CC"
1.3694 -
1.3695 -fi
1.3696 -
1.3697 -if test -z "$am_cv_prog_cc_stdc"; then
1.3698 - { echo "$as_me:$LINENO: result: none needed" >&5
1.3699 -echo "${ECHO_T}none needed" >&6; }
1.3700 -else
1.3701 - { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
1.3702 -echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; }
1.3703 -fi
1.3704 -case "x$am_cv_prog_cc_stdc" in
1.3705 - x|xno) ;;
1.3706 - *) CC="$CC $am_cv_prog_cc_stdc" ;;
1.3707 -esac
1.3708 -
1.3709 -# By default we simply use the C compiler to build assembly code.
1.3710 -
1.3711 -: ${CCAS='$(CC)'}
1.3712 -# Set ASFLAGS if not already set.
1.3713 -: ${CCASFLAGS='$(CFLAGS)'}
1.3714 + ;
1.3715 + return 0;
1.3716 +}
1.3717 +_ACEOF
1.3718 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
1.3719 + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
1.3720 +do
1.3721 + CC="$ac_save_CC $ac_arg"
1.3722 + rm -f conftest.$ac_objext
1.3723 +if { (ac_try="$ac_compile"
1.3724 +case "(($ac_try" in
1.3725 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3726 + *) ac_try_echo=$ac_try;;
1.3727 +esac
1.3728 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3729 +$as_echo "$ac_try_echo") >&5
1.3730 + (eval "$ac_compile") 2>conftest.er1
1.3731 + ac_status=$?
1.3732 + grep -v '^ *+' conftest.er1 >conftest.err
1.3733 + rm -f conftest.er1
1.3734 + cat conftest.err >&5
1.3735 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3736 + (exit $ac_status); } && {
1.3737 + test -z "$ac_c_werror_flag" ||
1.3738 + test ! -s conftest.err
1.3739 + } && test -s conftest.$ac_objext; then
1.3740 + ac_cv_prog_cc_c89=$ac_arg
1.3741 +else
1.3742 + $as_echo "$as_me: failed program was:" >&5
1.3743 +sed 's/^/| /' conftest.$ac_ext >&5
1.3744 +
1.3745 +
1.3746 +fi
1.3747 +
1.3748 +rm -f core conftest.err conftest.$ac_objext
1.3749 + test "x$ac_cv_prog_cc_c89" != "xno" && break
1.3750 +done
1.3751 +rm -f conftest.$ac_ext
1.3752 +CC=$ac_save_CC
1.3753 +
1.3754 +fi
1.3755 +# AC_CACHE_VAL
1.3756 +case "x$ac_cv_prog_cc_c89" in
1.3757 + x)
1.3758 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
1.3759 +$as_echo "none needed" >&6; } ;;
1.3760 + xno)
1.3761 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
1.3762 +$as_echo "unsupported" >&6; } ;;
1.3763 + *)
1.3764 + CC="$CC $ac_cv_prog_cc_c89"
1.3765 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
1.3766 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
1.3767 +esac
1.3768
1.3769
1.3770 ac_ext=c
1.3771 @@ -4341,15 +5091,140 @@
1.3772 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.3773 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.3774 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.3775 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
1.3776 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
1.3777 +
1.3778 +depcc="$CC" am_compiler_list=
1.3779 +
1.3780 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
1.3781 +$as_echo_n "checking dependency style of $depcc... " >&6; }
1.3782 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
1.3783 + $as_echo_n "(cached) " >&6
1.3784 +else
1.3785 + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1.3786 + # We make a subdir and do the tests there. Otherwise we can end up
1.3787 + # making bogus files that we don't know about and never remove. For
1.3788 + # instance it was reported that on HP-UX the gcc test will end up
1.3789 + # making a dummy file named `D' -- because `-MD' means `put the output
1.3790 + # in D'.
1.3791 + mkdir conftest.dir
1.3792 + # Copy depcomp to subdir because otherwise we won't find it if we're
1.3793 + # using a relative directory.
1.3794 + cp "$am_depcomp" conftest.dir
1.3795 + cd conftest.dir
1.3796 + # We will build objects and dependencies in a subdirectory because
1.3797 + # it helps to detect inapplicable dependency modes. For instance
1.3798 + # both Tru64's cc and ICC support -MD to output dependencies as a
1.3799 + # side effect of compilation, but ICC will put the dependencies in
1.3800 + # the current directory while Tru64 will put them in the object
1.3801 + # directory.
1.3802 + mkdir sub
1.3803 +
1.3804 + am_cv_CC_dependencies_compiler_type=none
1.3805 + if test "$am_compiler_list" = ""; then
1.3806 + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
1.3807 + fi
1.3808 + for depmode in $am_compiler_list; do
1.3809 + # Setup a source with many dependencies, because some compilers
1.3810 + # like to wrap large dependency lists on column 80 (with \), and
1.3811 + # we should not choose a depcomp mode which is confused by this.
1.3812 + #
1.3813 + # We need to recreate these files for each test, as the compiler may
1.3814 + # overwrite some of them when testing with obscure command lines.
1.3815 + # This happens at least with the AIX C compiler.
1.3816 + : > sub/conftest.c
1.3817 + for i in 1 2 3 4 5 6; do
1.3818 + echo '#include "conftst'$i'.h"' >> sub/conftest.c
1.3819 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
1.3820 + # Solaris 8's {/usr,}/bin/sh.
1.3821 + touch sub/conftst$i.h
1.3822 + done
1.3823 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1.3824 +
1.3825 + case $depmode in
1.3826 + nosideeffect)
1.3827 + # after this tag, mechanisms are not by side-effect, so they'll
1.3828 + # only be used when explicitly requested
1.3829 + if test "x$enable_dependency_tracking" = xyes; then
1.3830 + continue
1.3831 + else
1.3832 + break
1.3833 + fi
1.3834 + ;;
1.3835 + none) break ;;
1.3836 + esac
1.3837 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
1.3838 + # mode. It turns out that the SunPro C++ compiler does not properly
1.3839 + # handle `-M -o', and we need to detect this.
1.3840 + if depmode=$depmode \
1.3841 + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
1.3842 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
1.3843 + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
1.3844 + >/dev/null 2>conftest.err &&
1.3845 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
1.3846 + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1.3847 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1.3848 + # icc doesn't choke on unknown options, it will just issue warnings
1.3849 + # or remarks (even with -Werror). So we grep stderr for any message
1.3850 + # that says an option was ignored or not supported.
1.3851 + # When given -MP, icc 7.0 and 7.1 complain thusly:
1.3852 + # icc: Command line warning: ignoring option '-M'; no argument required
1.3853 + # The diagnosis changed in icc 8.0:
1.3854 + # icc: Command line remark: option '-MP' not supported
1.3855 + if (grep 'ignoring option' conftest.err ||
1.3856 + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
1.3857 + am_cv_CC_dependencies_compiler_type=$depmode
1.3858 + break
1.3859 + fi
1.3860 + fi
1.3861 + done
1.3862 +
1.3863 + cd ..
1.3864 + rm -rf conftest.dir
1.3865 +else
1.3866 + am_cv_CC_dependencies_compiler_type=none
1.3867 +fi
1.3868 +
1.3869 +fi
1.3870 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
1.3871 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
1.3872 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
1.3873 +
1.3874 +
1.3875 +
1.3876 +if
1.3877 + test "x$enable_dependency_tracking" != xno \
1.3878 + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
1.3879 + am__fastdepCC_TRUE=
1.3880 + am__fastdepCC_FALSE='#'
1.3881 +else
1.3882 + am__fastdepCC_TRUE='#'
1.3883 + am__fastdepCC_FALSE=
1.3884 +fi
1.3885 +
1.3886 +
1.3887 +
1.3888 +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
1.3889 +
1.3890 +# By default we simply use the C compiler to build assembly code.
1.3891 +
1.3892 +test "${CCAS+set}" = set || CCAS=$CC
1.3893 +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
1.3894 +
1.3895 +
1.3896 +
1.3897 +ac_ext=c
1.3898 +ac_cpp='$CPP $CPPFLAGS'
1.3899 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.3900 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.3901 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.3902 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
1.3903 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
1.3904 # On Suns, sometimes $CPP names a directory.
1.3905 if test -n "$CPP" && test -d "$CPP"; then
1.3906 CPP=
1.3907 fi
1.3908 if test -z "$CPP"; then
1.3909 if test "${ac_cv_prog_CPP+set}" = set; then
1.3910 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.3911 + $as_echo_n "(cached) " >&6
1.3912 else
1.3913 # Double quotes because CPP needs to be expanded
1.3914 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
1.3915 @@ -4381,20 +5256,21 @@
1.3916 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3917 *) ac_try_echo=$ac_try;;
1.3918 esac
1.3919 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.3920 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3921 +$as_echo "$ac_try_echo") >&5
1.3922 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.3923 ac_status=$?
1.3924 grep -v '^ *+' conftest.er1 >conftest.err
1.3925 rm -f conftest.er1
1.3926 cat conftest.err >&5
1.3927 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3928 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3929 (exit $ac_status); } >/dev/null && {
1.3930 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.3931 test ! -s conftest.err
1.3932 }; then
1.3933 :
1.3934 else
1.3935 - echo "$as_me: failed program was:" >&5
1.3936 + $as_echo "$as_me: failed program was:" >&5
1.3937 sed 's/^/| /' conftest.$ac_ext >&5
1.3938
1.3939 # Broken: fails on valid input.
1.3940 @@ -4418,13 +5294,14 @@
1.3941 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3942 *) ac_try_echo=$ac_try;;
1.3943 esac
1.3944 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.3945 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3946 +$as_echo "$ac_try_echo") >&5
1.3947 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.3948 ac_status=$?
1.3949 grep -v '^ *+' conftest.er1 >conftest.err
1.3950 rm -f conftest.er1
1.3951 cat conftest.err >&5
1.3952 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3953 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3954 (exit $ac_status); } >/dev/null && {
1.3955 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.3956 test ! -s conftest.err
1.3957 @@ -4432,7 +5309,7 @@
1.3958 # Broken: success on invalid input.
1.3959 continue
1.3960 else
1.3961 - echo "$as_me: failed program was:" >&5
1.3962 + $as_echo "$as_me: failed program was:" >&5
1.3963 sed 's/^/| /' conftest.$ac_ext >&5
1.3964
1.3965 # Passes both tests.
1.3966 @@ -4457,8 +5334,8 @@
1.3967 else
1.3968 ac_cv_prog_CPP=$CPP
1.3969 fi
1.3970 -{ echo "$as_me:$LINENO: result: $CPP" >&5
1.3971 -echo "${ECHO_T}$CPP" >&6; }
1.3972 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
1.3973 +$as_echo "$CPP" >&6; }
1.3974 ac_preproc_ok=false
1.3975 for ac_c_preproc_warn_flag in '' yes
1.3976 do
1.3977 @@ -4486,20 +5363,21 @@
1.3978 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.3979 *) ac_try_echo=$ac_try;;
1.3980 esac
1.3981 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.3982 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.3983 +$as_echo "$ac_try_echo") >&5
1.3984 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.3985 ac_status=$?
1.3986 grep -v '^ *+' conftest.er1 >conftest.err
1.3987 rm -f conftest.er1
1.3988 cat conftest.err >&5
1.3989 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3990 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.3991 (exit $ac_status); } >/dev/null && {
1.3992 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.3993 test ! -s conftest.err
1.3994 }; then
1.3995 :
1.3996 else
1.3997 - echo "$as_me: failed program was:" >&5
1.3998 + $as_echo "$as_me: failed program was:" >&5
1.3999 sed 's/^/| /' conftest.$ac_ext >&5
1.4000
1.4001 # Broken: fails on valid input.
1.4002 @@ -4523,13 +5401,14 @@
1.4003 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4004 *) ac_try_echo=$ac_try;;
1.4005 esac
1.4006 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4007 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4008 +$as_echo "$ac_try_echo") >&5
1.4009 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.4010 ac_status=$?
1.4011 grep -v '^ *+' conftest.er1 >conftest.err
1.4012 rm -f conftest.er1
1.4013 cat conftest.err >&5
1.4014 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4015 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4016 (exit $ac_status); } >/dev/null && {
1.4017 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.4018 test ! -s conftest.err
1.4019 @@ -4537,7 +5416,7 @@
1.4020 # Broken: success on invalid input.
1.4021 continue
1.4022 else
1.4023 - echo "$as_me: failed program was:" >&5
1.4024 + $as_echo "$as_me: failed program was:" >&5
1.4025 sed 's/^/| /' conftest.$ac_ext >&5
1.4026
1.4027 # Passes both tests.
1.4028 @@ -4553,9 +5432,9 @@
1.4029 if $ac_preproc_ok; then
1.4030 :
1.4031 else
1.4032 - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
1.4033 -See \`config.log' for more details." >&5
1.4034 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
1.4035 + { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
1.4036 +See \`config.log' for more details." >&5
1.4037 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
1.4038 See \`config.log' for more details." >&2;}
1.4039 { (exit 1); exit 1; }; }
1.4040 fi
1.4041 @@ -4567,42 +5446,37 @@
1.4042 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.4043
1.4044
1.4045 -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
1.4046 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
1.4047 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
1.4048 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1.4049 if test "${ac_cv_path_GREP+set}" = set; then
1.4050 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4051 -else
1.4052 - # Extract the first word of "grep ggrep" to use in msg output
1.4053 -if test -z "$GREP"; then
1.4054 -set dummy grep ggrep; ac_prog_name=$2
1.4055 -if test "${ac_cv_path_GREP+set}" = set; then
1.4056 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4057 -else
1.4058 + $as_echo_n "(cached) " >&6
1.4059 +else
1.4060 + if test -z "$GREP"; then
1.4061 ac_path_GREP_found=false
1.4062 -# Loop through the user's path and test for each of PROGNAME-LIST
1.4063 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.4064 + # Loop through the user's path and test for each of PROGNAME-LIST
1.4065 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.4066 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
1.4067 do
1.4068 IFS=$as_save_IFS
1.4069 test -z "$as_dir" && as_dir=.
1.4070 for ac_prog in grep ggrep; do
1.4071 - for ac_exec_ext in '' $ac_executable_extensions; do
1.4072 - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
1.4073 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
1.4074 - # Check for GNU ac_path_GREP and select it if it is found.
1.4075 + for ac_exec_ext in '' $ac_executable_extensions; do
1.4076 + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
1.4077 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
1.4078 +# Check for GNU ac_path_GREP and select it if it is found.
1.4079 # Check for GNU $ac_path_GREP
1.4080 case `"$ac_path_GREP" --version 2>&1` in
1.4081 *GNU*)
1.4082 ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
1.4083 *)
1.4084 ac_count=0
1.4085 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
1.4086 + $as_echo_n 0123456789 >"conftest.in"
1.4087 while :
1.4088 do
1.4089 cat "conftest.in" "conftest.in" >"conftest.tmp"
1.4090 mv "conftest.tmp" "conftest.in"
1.4091 cp "conftest.in" "conftest.nl"
1.4092 - echo 'GREP' >> "conftest.nl"
1.4093 + $as_echo 'GREP' >> "conftest.nl"
1.4094 "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
1.4095 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
1.4096 ac_count=`expr $ac_count + 1`
1.4097 @@ -4617,74 +5491,60 @@
1.4098 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
1.4099 esac
1.4100
1.4101 -
1.4102 - $ac_path_GREP_found && break 3
1.4103 - done
1.4104 -done
1.4105 -
1.4106 -done
1.4107 -IFS=$as_save_IFS
1.4108 -
1.4109 -
1.4110 -fi
1.4111 -
1.4112 -GREP="$ac_cv_path_GREP"
1.4113 -if test -z "$GREP"; then
1.4114 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
1.4115 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
1.4116 - { (exit 1); exit 1; }; }
1.4117 -fi
1.4118 -
1.4119 + $ac_path_GREP_found && break 3
1.4120 + done
1.4121 + done
1.4122 +done
1.4123 +IFS=$as_save_IFS
1.4124 + if test -z "$ac_cv_path_GREP"; then
1.4125 + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
1.4126 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
1.4127 + { (exit 1); exit 1; }; }
1.4128 + fi
1.4129 else
1.4130 ac_cv_path_GREP=$GREP
1.4131 fi
1.4132
1.4133 -
1.4134 -fi
1.4135 -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
1.4136 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
1.4137 +fi
1.4138 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
1.4139 +$as_echo "$ac_cv_path_GREP" >&6; }
1.4140 GREP="$ac_cv_path_GREP"
1.4141
1.4142
1.4143 -{ echo "$as_me:$LINENO: checking for egrep" >&5
1.4144 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
1.4145 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
1.4146 +$as_echo_n "checking for egrep... " >&6; }
1.4147 if test "${ac_cv_path_EGREP+set}" = set; then
1.4148 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4149 + $as_echo_n "(cached) " >&6
1.4150 else
1.4151 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1.4152 then ac_cv_path_EGREP="$GREP -E"
1.4153 else
1.4154 - # Extract the first word of "egrep" to use in msg output
1.4155 -if test -z "$EGREP"; then
1.4156 -set dummy egrep; ac_prog_name=$2
1.4157 -if test "${ac_cv_path_EGREP+set}" = set; then
1.4158 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4159 -else
1.4160 + if test -z "$EGREP"; then
1.4161 ac_path_EGREP_found=false
1.4162 -# Loop through the user's path and test for each of PROGNAME-LIST
1.4163 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.4164 + # Loop through the user's path and test for each of PROGNAME-LIST
1.4165 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.4166 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
1.4167 do
1.4168 IFS=$as_save_IFS
1.4169 test -z "$as_dir" && as_dir=.
1.4170 for ac_prog in egrep; do
1.4171 - for ac_exec_ext in '' $ac_executable_extensions; do
1.4172 - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
1.4173 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
1.4174 - # Check for GNU ac_path_EGREP and select it if it is found.
1.4175 + for ac_exec_ext in '' $ac_executable_extensions; do
1.4176 + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
1.4177 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
1.4178 +# Check for GNU ac_path_EGREP and select it if it is found.
1.4179 # Check for GNU $ac_path_EGREP
1.4180 case `"$ac_path_EGREP" --version 2>&1` in
1.4181 *GNU*)
1.4182 ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
1.4183 *)
1.4184 ac_count=0
1.4185 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
1.4186 + $as_echo_n 0123456789 >"conftest.in"
1.4187 while :
1.4188 do
1.4189 cat "conftest.in" "conftest.in" >"conftest.tmp"
1.4190 mv "conftest.tmp" "conftest.in"
1.4191 cp "conftest.in" "conftest.nl"
1.4192 - echo 'EGREP' >> "conftest.nl"
1.4193 + $as_echo 'EGREP' >> "conftest.nl"
1.4194 "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
1.4195 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
1.4196 ac_count=`expr $ac_count + 1`
1.4197 @@ -4699,40 +5559,31 @@
1.4198 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
1.4199 esac
1.4200
1.4201 -
1.4202 - $ac_path_EGREP_found && break 3
1.4203 - done
1.4204 -done
1.4205 -
1.4206 -done
1.4207 -IFS=$as_save_IFS
1.4208 -
1.4209 -
1.4210 -fi
1.4211 -
1.4212 -EGREP="$ac_cv_path_EGREP"
1.4213 -if test -z "$EGREP"; then
1.4214 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
1.4215 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
1.4216 - { (exit 1); exit 1; }; }
1.4217 -fi
1.4218 -
1.4219 + $ac_path_EGREP_found && break 3
1.4220 + done
1.4221 + done
1.4222 +done
1.4223 +IFS=$as_save_IFS
1.4224 + if test -z "$ac_cv_path_EGREP"; then
1.4225 + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
1.4226 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
1.4227 + { (exit 1); exit 1; }; }
1.4228 + fi
1.4229 else
1.4230 ac_cv_path_EGREP=$EGREP
1.4231 fi
1.4232
1.4233 -
1.4234 fi
1.4235 fi
1.4236 -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
1.4237 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
1.4238 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
1.4239 +$as_echo "$ac_cv_path_EGREP" >&6; }
1.4240 EGREP="$ac_cv_path_EGREP"
1.4241
1.4242
1.4243 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
1.4244 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
1.4245 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
1.4246 +$as_echo_n "checking for ANSI C header files... " >&6; }
1.4247 if test "${ac_cv_header_stdc+set}" = set; then
1.4248 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4249 + $as_echo_n "(cached) " >&6
1.4250 else
1.4251 cat >conftest.$ac_ext <<_ACEOF
1.4252 /* confdefs.h. */
1.4253 @@ -4759,20 +5610,21 @@
1.4254 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4255 *) ac_try_echo=$ac_try;;
1.4256 esac
1.4257 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4258 - (eval "$ac_compile") 2>conftest.er1
1.4259 - ac_status=$?
1.4260 - grep -v '^ *+' conftest.er1 >conftest.err
1.4261 - rm -f conftest.er1
1.4262 - cat conftest.err >&5
1.4263 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4264 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4265 +$as_echo "$ac_try_echo") >&5
1.4266 + (eval "$ac_compile") 2>conftest.er1
1.4267 + ac_status=$?
1.4268 + grep -v '^ *+' conftest.er1 >conftest.err
1.4269 + rm -f conftest.er1
1.4270 + cat conftest.err >&5
1.4271 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4272 (exit $ac_status); } && {
1.4273 test -z "$ac_c_werror_flag" ||
1.4274 test ! -s conftest.err
1.4275 } && test -s conftest.$ac_objext; then
1.4276 ac_cv_header_stdc=yes
1.4277 else
1.4278 - echo "$as_me: failed program was:" >&5
1.4279 + $as_echo "$as_me: failed program was:" >&5
1.4280 sed 's/^/| /' conftest.$ac_ext >&5
1.4281
1.4282 ac_cv_header_stdc=no
1.4283 @@ -4864,37 +5716,40 @@
1.4284 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4285 *) ac_try_echo=$ac_try;;
1.4286 esac
1.4287 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4288 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4289 +$as_echo "$ac_try_echo") >&5
1.4290 (eval "$ac_link") 2>&5
1.4291 ac_status=$?
1.4292 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4293 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4294 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1.4295 { (case "(($ac_try" in
1.4296 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4297 *) ac_try_echo=$ac_try;;
1.4298 esac
1.4299 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4300 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4301 +$as_echo "$ac_try_echo") >&5
1.4302 (eval "$ac_try") 2>&5
1.4303 ac_status=$?
1.4304 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4305 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4306 (exit $ac_status); }; }; then
1.4307 :
1.4308 else
1.4309 - echo "$as_me: program exited with status $ac_status" >&5
1.4310 -echo "$as_me: failed program was:" >&5
1.4311 + $as_echo "$as_me: program exited with status $ac_status" >&5
1.4312 +$as_echo "$as_me: failed program was:" >&5
1.4313 sed 's/^/| /' conftest.$ac_ext >&5
1.4314
1.4315 ( exit $ac_status )
1.4316 ac_cv_header_stdc=no
1.4317 fi
1.4318 +rm -rf conftest.dSYM
1.4319 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
1.4320 fi
1.4321
1.4322
1.4323 fi
1.4324 fi
1.4325 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
1.4326 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
1.4327 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
1.4328 +$as_echo "$ac_cv_header_stdc" >&6; }
1.4329 if test $ac_cv_header_stdc = yes; then
1.4330
1.4331 cat >>confdefs.h <<\_ACEOF
1.4332 @@ -4905,34 +5760,34 @@
1.4333
1.4334 # Make sure we can run config.sub.
1.4335 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
1.4336 - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
1.4337 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
1.4338 - { (exit 1); exit 1; }; }
1.4339 -
1.4340 -{ echo "$as_me:$LINENO: checking build system type" >&5
1.4341 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
1.4342 + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
1.4343 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
1.4344 + { (exit 1); exit 1; }; }
1.4345 +
1.4346 +{ $as_echo "$as_me:$LINENO: checking build system type" >&5
1.4347 +$as_echo_n "checking build system type... " >&6; }
1.4348 if test "${ac_cv_build+set}" = set; then
1.4349 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4350 + $as_echo_n "(cached) " >&6
1.4351 else
1.4352 ac_build_alias=$build_alias
1.4353 test "x$ac_build_alias" = x &&
1.4354 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
1.4355 test "x$ac_build_alias" = x &&
1.4356 - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
1.4357 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
1.4358 + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
1.4359 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
1.4360 { (exit 1); exit 1; }; }
1.4361 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
1.4362 - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
1.4363 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
1.4364 - { (exit 1); exit 1; }; }
1.4365 -
1.4366 -fi
1.4367 -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
1.4368 -echo "${ECHO_T}$ac_cv_build" >&6; }
1.4369 + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
1.4370 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
1.4371 + { (exit 1); exit 1; }; }
1.4372 +
1.4373 +fi
1.4374 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
1.4375 +$as_echo "$ac_cv_build" >&6; }
1.4376 case $ac_cv_build in
1.4377 *-*-*) ;;
1.4378 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
1.4379 -echo "$as_me: error: invalid value of canonical build" >&2;}
1.4380 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
1.4381 +$as_echo "$as_me: error: invalid value of canonical build" >&2;}
1.4382 { (exit 1); exit 1; }; };;
1.4383 esac
1.4384 build=$ac_cv_build
1.4385 @@ -4949,27 +5804,27 @@
1.4386 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
1.4387
1.4388
1.4389 -{ echo "$as_me:$LINENO: checking host system type" >&5
1.4390 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
1.4391 +{ $as_echo "$as_me:$LINENO: checking host system type" >&5
1.4392 +$as_echo_n "checking host system type... " >&6; }
1.4393 if test "${ac_cv_host+set}" = set; then
1.4394 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4395 + $as_echo_n "(cached) " >&6
1.4396 else
1.4397 if test "x$host_alias" = x; then
1.4398 ac_cv_host=$ac_cv_build
1.4399 else
1.4400 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
1.4401 - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
1.4402 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
1.4403 - { (exit 1); exit 1; }; }
1.4404 -fi
1.4405 -
1.4406 -fi
1.4407 -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
1.4408 -echo "${ECHO_T}$ac_cv_host" >&6; }
1.4409 + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
1.4410 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
1.4411 + { (exit 1); exit 1; }; }
1.4412 +fi
1.4413 +
1.4414 +fi
1.4415 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
1.4416 +$as_echo "$ac_cv_host" >&6; }
1.4417 case $ac_cv_host in
1.4418 *-*-*) ;;
1.4419 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
1.4420 -echo "$as_me: error: invalid value of canonical host" >&2;}
1.4421 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
1.4422 +$as_echo "$as_me: error: invalid value of canonical host" >&2;}
1.4423 { (exit 1); exit 1; }; };;
1.4424 esac
1.4425 host=$ac_cv_host
1.4426 @@ -5017,6 +5872,7 @@
1.4427 fi
1.4428
1.4429
1.4430 +
1.4431 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
1.4432
1.4433
1.4434 @@ -5030,11 +5886,11 @@
1.4435 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
1.4436 inttypes.h stdint.h unistd.h
1.4437 do
1.4438 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.4439 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
1.4440 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
1.4441 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.4442 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
1.4443 +$as_echo_n "checking for $ac_header... " >&6; }
1.4444 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
1.4445 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4446 + $as_echo_n "(cached) " >&6
1.4447 else
1.4448 cat >conftest.$ac_ext <<_ACEOF
1.4449 /* confdefs.h. */
1.4450 @@ -5052,20 +5908,21 @@
1.4451 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4452 *) ac_try_echo=$ac_try;;
1.4453 esac
1.4454 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4455 - (eval "$ac_compile") 2>conftest.er1
1.4456 - ac_status=$?
1.4457 - grep -v '^ *+' conftest.er1 >conftest.err
1.4458 - rm -f conftest.er1
1.4459 - cat conftest.err >&5
1.4460 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4461 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4462 +$as_echo "$ac_try_echo") >&5
1.4463 + (eval "$ac_compile") 2>conftest.er1
1.4464 + ac_status=$?
1.4465 + grep -v '^ *+' conftest.er1 >conftest.err
1.4466 + rm -f conftest.er1
1.4467 + cat conftest.err >&5
1.4468 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4469 (exit $ac_status); } && {
1.4470 test -z "$ac_c_werror_flag" ||
1.4471 test ! -s conftest.err
1.4472 } && test -s conftest.$ac_objext; then
1.4473 eval "$as_ac_Header=yes"
1.4474 else
1.4475 - echo "$as_me: failed program was:" >&5
1.4476 + $as_echo "$as_me: failed program was:" >&5
1.4477 sed 's/^/| /' conftest.$ac_ext >&5
1.4478
1.4479 eval "$as_ac_Header=no"
1.4480 @@ -5073,110 +5930,33 @@
1.4481
1.4482 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.4483 fi
1.4484 -ac_res=`eval echo '${'$as_ac_Header'}'`
1.4485 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1.4486 -echo "${ECHO_T}$ac_res" >&6; }
1.4487 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
1.4488 +ac_res=`eval 'as_val=${'$as_ac_Header'}
1.4489 + $as_echo "$as_val"'`
1.4490 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1.4491 +$as_echo "$ac_res" >&6; }
1.4492 +if test `eval 'as_val=${'$as_ac_Header'}
1.4493 + $as_echo "$as_val"'` = yes; then
1.4494 cat >>confdefs.h <<_ACEOF
1.4495 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.4496 -_ACEOF
1.4497 -
1.4498 -fi
1.4499 -
1.4500 -done
1.4501 -
1.4502 -
1.4503 -if test "x$with_osmesa" != xno; then
1.4504 -
1.4505 -
1.4506 -{ echo "$as_me:$LINENO: checking for OSMesaCreateContext in -lOSMesa" >&5
1.4507 -echo $ECHO_N "checking for OSMesaCreateContext in -lOSMesa... $ECHO_C" >&6; }
1.4508 -if test "${ac_cv_lib_OSMesa_OSMesaCreateContext+set}" = set; then
1.4509 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4510 -else
1.4511 - ac_check_lib_save_LIBS=$LIBS
1.4512 -LIBS="-lOSMesa $LIBS"
1.4513 -cat >conftest.$ac_ext <<_ACEOF
1.4514 -/* confdefs.h. */
1.4515 -_ACEOF
1.4516 -cat confdefs.h >>conftest.$ac_ext
1.4517 -cat >>conftest.$ac_ext <<_ACEOF
1.4518 -/* end confdefs.h. */
1.4519 -
1.4520 -/* Override any GCC internal prototype to avoid an error.
1.4521 - Use char because int might match the return type of a GCC
1.4522 - builtin and then its argument prototype would still apply. */
1.4523 -#ifdef __cplusplus
1.4524 -extern "C"
1.4525 -#endif
1.4526 -char OSMesaCreateContext ();
1.4527 -int
1.4528 -main ()
1.4529 -{
1.4530 -return OSMesaCreateContext ();
1.4531 - ;
1.4532 - return 0;
1.4533 -}
1.4534 -_ACEOF
1.4535 -rm -f conftest.$ac_objext conftest$ac_exeext
1.4536 -if { (ac_try="$ac_link"
1.4537 -case "(($ac_try" in
1.4538 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4539 - *) ac_try_echo=$ac_try;;
1.4540 -esac
1.4541 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4542 - (eval "$ac_link") 2>conftest.er1
1.4543 - ac_status=$?
1.4544 - grep -v '^ *+' conftest.er1 >conftest.err
1.4545 - rm -f conftest.er1
1.4546 - cat conftest.err >&5
1.4547 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4548 - (exit $ac_status); } && {
1.4549 - test -z "$ac_c_werror_flag" ||
1.4550 - test ! -s conftest.err
1.4551 - } && test -s conftest$ac_exeext &&
1.4552 - $as_test_x conftest$ac_exeext; then
1.4553 - ac_cv_lib_OSMesa_OSMesaCreateContext=yes
1.4554 -else
1.4555 - echo "$as_me: failed program was:" >&5
1.4556 -sed 's/^/| /' conftest.$ac_ext >&5
1.4557 -
1.4558 - ac_cv_lib_OSMesa_OSMesaCreateContext=no
1.4559 -fi
1.4560 -
1.4561 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.4562 - conftest$ac_exeext conftest.$ac_ext
1.4563 -LIBS=$ac_check_lib_save_LIBS
1.4564 -fi
1.4565 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&5
1.4566 -echo "${ECHO_T}$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; }
1.4567 -if test $ac_cv_lib_OSMesa_OSMesaCreateContext = yes; then
1.4568 - cat >>confdefs.h <<_ACEOF
1.4569 -#define HAVE_LIBOSMESA 1
1.4570 -_ACEOF
1.4571 -
1.4572 - LIBS="-lOSMesa $LIBS"
1.4573 -
1.4574 -else
1.4575 - { { echo "$as_me:$LINENO: error: --with-osmesa was given, but OSMesa library could not be found
1.4576 -See \`config.log' for more details." >&5
1.4577 -echo "$as_me: error: --with-osmesa was given, but OSMesa library could not be found
1.4578 -See \`config.log' for more details." >&2;}
1.4579 - { (exit 1); exit 1; }; }
1.4580 -fi
1.4581 -
1.4582 - if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
1.4583 - { echo "$as_me:$LINENO: checking for GL/osmesa.h" >&5
1.4584 -echo $ECHO_N "checking for GL/osmesa.h... $ECHO_C" >&6; }
1.4585 -if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
1.4586 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4587 -fi
1.4588 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&5
1.4589 -echo "${ECHO_T}$ac_cv_header_GL_osmesa_h" >&6; }
1.4590 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.4591 +_ACEOF
1.4592 +
1.4593 +fi
1.4594 +
1.4595 +done
1.4596 +
1.4597 +
1.4598 +if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then
1.4599 + { $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&5
1.4600 +$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }
1.4601 +if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then
1.4602 + $as_echo_n "(cached) " >&6
1.4603 +fi
1.4604 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&5
1.4605 +$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }
1.4606 else
1.4607 # Is the header compilable?
1.4608 -{ echo "$as_me:$LINENO: checking GL/osmesa.h usability" >&5
1.4609 -echo $ECHO_N "checking GL/osmesa.h usability... $ECHO_C" >&6; }
1.4610 +{ $as_echo "$as_me:$LINENO: checking Cocoa/Cocoa.h usability" >&5
1.4611 +$as_echo_n "checking Cocoa/Cocoa.h usability... " >&6; }
1.4612 cat >conftest.$ac_ext <<_ACEOF
1.4613 /* confdefs.h. */
1.4614 _ACEOF
1.4615 @@ -5184,270 +5964,123 @@
1.4616 cat >>conftest.$ac_ext <<_ACEOF
1.4617 /* end confdefs.h. */
1.4618 $ac_includes_default
1.4619 -#include <GL/osmesa.h>
1.4620 -_ACEOF
1.4621 -rm -f conftest.$ac_objext
1.4622 -if { (ac_try="$ac_compile"
1.4623 -case "(($ac_try" in
1.4624 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4625 - *) ac_try_echo=$ac_try;;
1.4626 -esac
1.4627 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4628 - (eval "$ac_compile") 2>conftest.er1
1.4629 - ac_status=$?
1.4630 - grep -v '^ *+' conftest.er1 >conftest.err
1.4631 - rm -f conftest.er1
1.4632 - cat conftest.err >&5
1.4633 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4634 +#include <Cocoa/Cocoa.h>
1.4635 +_ACEOF
1.4636 +rm -f conftest.$ac_objext
1.4637 +if { (ac_try="$ac_compile"
1.4638 +case "(($ac_try" in
1.4639 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4640 + *) ac_try_echo=$ac_try;;
1.4641 +esac
1.4642 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4643 +$as_echo "$ac_try_echo") >&5
1.4644 + (eval "$ac_compile") 2>conftest.er1
1.4645 + ac_status=$?
1.4646 + grep -v '^ *+' conftest.er1 >conftest.err
1.4647 + rm -f conftest.er1
1.4648 + cat conftest.err >&5
1.4649 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4650 (exit $ac_status); } && {
1.4651 test -z "$ac_c_werror_flag" ||
1.4652 test ! -s conftest.err
1.4653 } && test -s conftest.$ac_objext; then
1.4654 ac_header_compiler=yes
1.4655 else
1.4656 - echo "$as_me: failed program was:" >&5
1.4657 + $as_echo "$as_me: failed program was:" >&5
1.4658 sed 's/^/| /' conftest.$ac_ext >&5
1.4659
1.4660 ac_header_compiler=no
1.4661 fi
1.4662
1.4663 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.4664 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.4665 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.4666 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.4667 +$as_echo "$ac_header_compiler" >&6; }
1.4668
1.4669 # Is the header present?
1.4670 -{ echo "$as_me:$LINENO: checking GL/osmesa.h presence" >&5
1.4671 -echo $ECHO_N "checking GL/osmesa.h presence... $ECHO_C" >&6; }
1.4672 -cat >conftest.$ac_ext <<_ACEOF
1.4673 -/* confdefs.h. */
1.4674 -_ACEOF
1.4675 -cat confdefs.h >>conftest.$ac_ext
1.4676 -cat >>conftest.$ac_ext <<_ACEOF
1.4677 -/* end confdefs.h. */
1.4678 -#include <GL/osmesa.h>
1.4679 +{ $as_echo "$as_me:$LINENO: checking Cocoa/Cocoa.h presence" >&5
1.4680 +$as_echo_n "checking Cocoa/Cocoa.h presence... " >&6; }
1.4681 +cat >conftest.$ac_ext <<_ACEOF
1.4682 +/* confdefs.h. */
1.4683 +_ACEOF
1.4684 +cat confdefs.h >>conftest.$ac_ext
1.4685 +cat >>conftest.$ac_ext <<_ACEOF
1.4686 +/* end confdefs.h. */
1.4687 +#include <Cocoa/Cocoa.h>
1.4688 _ACEOF
1.4689 if { (ac_try="$ac_cpp conftest.$ac_ext"
1.4690 case "(($ac_try" in
1.4691 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4692 *) ac_try_echo=$ac_try;;
1.4693 esac
1.4694 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4695 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.4696 +$as_echo "$ac_try_echo") >&5
1.4697 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.4698 ac_status=$?
1.4699 grep -v '^ *+' conftest.er1 >conftest.err
1.4700 rm -f conftest.er1
1.4701 cat conftest.err >&5
1.4702 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4703 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4704 (exit $ac_status); } >/dev/null && {
1.4705 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.4706 test ! -s conftest.err
1.4707 }; then
1.4708 ac_header_preproc=yes
1.4709 else
1.4710 - echo "$as_me: failed program was:" >&5
1.4711 + $as_echo "$as_me: failed program was:" >&5
1.4712 sed 's/^/| /' conftest.$ac_ext >&5
1.4713
1.4714 ac_header_preproc=no
1.4715 fi
1.4716
1.4717 rm -f conftest.err conftest.$ac_ext
1.4718 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.4719 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.4720 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.4721 +$as_echo "$ac_header_preproc" >&6; }
1.4722
1.4723 # So? What about this header?
1.4724 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.4725 yes:no: )
1.4726 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.4727 -echo "$as_me: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.4728 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&5
1.4729 -echo "$as_me: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&2;}
1.4730 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.4731 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.4732 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&5
1.4733 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&2;}
1.4734 ac_header_preproc=yes
1.4735 ;;
1.4736 no:yes:* )
1.4737 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: present but cannot be compiled" >&5
1.4738 -echo "$as_me: WARNING: GL/osmesa.h: present but cannot be compiled" >&2;}
1.4739 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&5
1.4740 -echo "$as_me: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&2;}
1.4741 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: see the Autoconf documentation" >&5
1.4742 -echo "$as_me: WARNING: GL/osmesa.h: see the Autoconf documentation" >&2;}
1.4743 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&5
1.4744 -echo "$as_me: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.4745 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&5
1.4746 -echo "$as_me: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&2;}
1.4747 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&5
1.4748 -echo "$as_me: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&2;}
1.4749 -
1.4750 - ;;
1.4751 -esac
1.4752 -{ echo "$as_me:$LINENO: checking for GL/osmesa.h" >&5
1.4753 -echo $ECHO_N "checking for GL/osmesa.h... $ECHO_C" >&6; }
1.4754 -if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
1.4755 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4756 -else
1.4757 - ac_cv_header_GL_osmesa_h=$ac_header_preproc
1.4758 -fi
1.4759 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&5
1.4760 -echo "${ECHO_T}$ac_cv_header_GL_osmesa_h" >&6; }
1.4761 -
1.4762 -fi
1.4763 -if test $ac_cv_header_GL_osmesa_h = yes; then
1.4764 - :
1.4765 -else
1.4766 - { { echo "$as_me:$LINENO: error: --with-osmesa was given, but osmesa.h could not be found
1.4767 -See \`config.log' for more details." >&5
1.4768 -echo "$as_me: error: --with-osmesa was given, but osmesa.h could not be found
1.4769 -See \`config.log' for more details." >&2;}
1.4770 - { (exit 1); exit 1; }; }
1.4771 -fi
1.4772 -
1.4773 -
1.4774 -
1.4775 -fi
1.4776 -
1.4777 -
1.4778 -
1.4779 -if test "x$with_osmesa" != xno; then
1.4780 - OSMESA_DRIVER_TRUE=
1.4781 - OSMESA_DRIVER_FALSE='#'
1.4782 -else
1.4783 - OSMESA_DRIVER_TRUE='#'
1.4784 - OSMESA_DRIVER_FALSE=
1.4785 -fi
1.4786 -
1.4787 -
1.4788 -if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
1.4789 - { echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
1.4790 -echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
1.4791 -if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
1.4792 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4793 -fi
1.4794 -{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
1.4795 -echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
1.4796 -else
1.4797 - # Is the header compilable?
1.4798 -{ echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
1.4799 -echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6; }
1.4800 -cat >conftest.$ac_ext <<_ACEOF
1.4801 -/* confdefs.h. */
1.4802 -_ACEOF
1.4803 -cat confdefs.h >>conftest.$ac_ext
1.4804 -cat >>conftest.$ac_ext <<_ACEOF
1.4805 -/* end confdefs.h. */
1.4806 -$ac_includes_default
1.4807 -#include <Carbon/Carbon.h>
1.4808 -_ACEOF
1.4809 -rm -f conftest.$ac_objext
1.4810 -if { (ac_try="$ac_compile"
1.4811 -case "(($ac_try" in
1.4812 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4813 - *) ac_try_echo=$ac_try;;
1.4814 -esac
1.4815 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4816 - (eval "$ac_compile") 2>conftest.er1
1.4817 - ac_status=$?
1.4818 - grep -v '^ *+' conftest.er1 >conftest.err
1.4819 - rm -f conftest.er1
1.4820 - cat conftest.err >&5
1.4821 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4822 - (exit $ac_status); } && {
1.4823 - test -z "$ac_c_werror_flag" ||
1.4824 - test ! -s conftest.err
1.4825 - } && test -s conftest.$ac_objext; then
1.4826 - ac_header_compiler=yes
1.4827 -else
1.4828 - echo "$as_me: failed program was:" >&5
1.4829 -sed 's/^/| /' conftest.$ac_ext >&5
1.4830 -
1.4831 - ac_header_compiler=no
1.4832 -fi
1.4833 -
1.4834 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.4835 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.4836 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.4837 -
1.4838 -# Is the header present?
1.4839 -{ echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
1.4840 -echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6; }
1.4841 -cat >conftest.$ac_ext <<_ACEOF
1.4842 -/* confdefs.h. */
1.4843 -_ACEOF
1.4844 -cat confdefs.h >>conftest.$ac_ext
1.4845 -cat >>conftest.$ac_ext <<_ACEOF
1.4846 -/* end confdefs.h. */
1.4847 -#include <Carbon/Carbon.h>
1.4848 -_ACEOF
1.4849 -if { (ac_try="$ac_cpp conftest.$ac_ext"
1.4850 -case "(($ac_try" in
1.4851 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.4852 - *) ac_try_echo=$ac_try;;
1.4853 -esac
1.4854 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.4855 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.4856 - ac_status=$?
1.4857 - grep -v '^ *+' conftest.er1 >conftest.err
1.4858 - rm -f conftest.er1
1.4859 - cat conftest.err >&5
1.4860 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.4861 - (exit $ac_status); } >/dev/null && {
1.4862 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.4863 - test ! -s conftest.err
1.4864 - }; then
1.4865 - ac_header_preproc=yes
1.4866 -else
1.4867 - echo "$as_me: failed program was:" >&5
1.4868 -sed 's/^/| /' conftest.$ac_ext >&5
1.4869 -
1.4870 - ac_header_preproc=no
1.4871 -fi
1.4872 -
1.4873 -rm -f conftest.err conftest.$ac_ext
1.4874 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.4875 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.4876 -
1.4877 -# So? What about this header?
1.4878 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.4879 - yes:no: )
1.4880 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.4881 -echo "$as_me: WARNING: Carbon/Carbon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.4882 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&5
1.4883 -echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the compiler's result" >&2;}
1.4884 - ac_header_preproc=yes
1.4885 - ;;
1.4886 - no:yes:* )
1.4887 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&5
1.4888 -echo "$as_me: WARNING: Carbon/Carbon.h: present but cannot be compiled" >&2;}
1.4889 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&5
1.4890 -echo "$as_me: WARNING: Carbon/Carbon.h: check for missing prerequisite headers?" >&2;}
1.4891 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&5
1.4892 -echo "$as_me: WARNING: Carbon/Carbon.h: see the Autoconf documentation" >&2;}
1.4893 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&5
1.4894 -echo "$as_me: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.4895 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&5
1.4896 -echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
1.4897 - { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
1.4898 -echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;}
1.4899 -
1.4900 - ;;
1.4901 -esac
1.4902 -{ echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
1.4903 -echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
1.4904 -if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
1.4905 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4906 -else
1.4907 - ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
1.4908 -fi
1.4909 -{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
1.4910 -echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
1.4911 -
1.4912 -fi
1.4913 -if test $ac_cv_header_Carbon_Carbon_h = yes; then
1.4914 -
1.4915 - HAVE_CARBON='yes'
1.4916 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&5
1.4917 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&2;}
1.4918 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&5
1.4919 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&2;}
1.4920 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&5
1.4921 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&2;}
1.4922 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&5
1.4923 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.4924 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&5
1.4925 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&2;}
1.4926 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&5
1.4927 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&2;}
1.4928 +
1.4929 + ;;
1.4930 +esac
1.4931 +{ $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&5
1.4932 +$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }
1.4933 +if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then
1.4934 + $as_echo_n "(cached) " >&6
1.4935 +else
1.4936 + ac_cv_header_Cocoa_Cocoa_h=$ac_header_preproc
1.4937 +fi
1.4938 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&5
1.4939 +$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }
1.4940 +
1.4941 +fi
1.4942 +if test $ac_cv_header_Cocoa_Cocoa_h = yes; then
1.4943 +
1.4944 + HAVE_COCOA='yes'
1.4945 APPLE_BUILD='yes'
1.4946 - LIBS="$LIBS -framework OpenGL -framework AGL -framework Carbon -L/usr/X11R6/lib -lGL"
1.4947 -
1.4948 -cat >>confdefs.h <<\_ACEOF
1.4949 -#define HAVE_CARBON 1
1.4950 + LIBS="$LIBS -framework AppKit"
1.4951 + LIBS="$LIBS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -framework OpenGL"
1.4952 +
1.4953 +cat >>confdefs.h <<\_ACEOF
1.4954 +#define HAVE_COCOA 1
1.4955 _ACEOF
1.4956
1.4957
1.4958 @@ -5461,15 +6094,25 @@
1.4959
1.4960
1.4961
1.4962 +if test "$HAVE_COCOA" = 'yes'; then
1.4963 + GUI_CARBON_TRUE=
1.4964 + GUI_CARBON_FALSE='#'
1.4965 +else
1.4966 + GUI_CARBON_TRUE='#'
1.4967 + GUI_CARBON_FALSE=
1.4968 +fi
1.4969 +
1.4970 +
1.4971 +
1.4972
1.4973 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
1.4974 if test -n "$ac_tool_prefix"; then
1.4975 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
1.4976 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
1.4977 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.4978 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.4979 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.4980 +$as_echo_n "checking for $ac_word... " >&6; }
1.4981 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
1.4982 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.4983 + $as_echo_n "(cached) " >&6
1.4984 else
1.4985 case $PKG_CONFIG in
1.4986 [\\/]* | ?:[\\/]*)
1.4987 @@ -5484,7 +6127,7 @@
1.4988 for ac_exec_ext in '' $ac_executable_extensions; do
1.4989 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.4990 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1.4991 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.4992 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.4993 break 2
1.4994 fi
1.4995 done
1.4996 @@ -5496,11 +6139,11 @@
1.4997 fi
1.4998 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
1.4999 if test -n "$PKG_CONFIG"; then
1.5000 - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
1.5001 -echo "${ECHO_T}$PKG_CONFIG" >&6; }
1.5002 -else
1.5003 - { echo "$as_me:$LINENO: result: no" >&5
1.5004 -echo "${ECHO_T}no" >&6; }
1.5005 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
1.5006 +$as_echo "$PKG_CONFIG" >&6; }
1.5007 +else
1.5008 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.5009 +$as_echo "no" >&6; }
1.5010 fi
1.5011
1.5012
1.5013 @@ -5509,10 +6152,10 @@
1.5014 ac_pt_PKG_CONFIG=$PKG_CONFIG
1.5015 # Extract the first word of "pkg-config", so it can be a program name with args.
1.5016 set dummy pkg-config; ac_word=$2
1.5017 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.5018 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.5019 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.5020 +$as_echo_n "checking for $ac_word... " >&6; }
1.5021 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
1.5022 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5023 + $as_echo_n "(cached) " >&6
1.5024 else
1.5025 case $ac_pt_PKG_CONFIG in
1.5026 [\\/]* | ?:[\\/]*)
1.5027 @@ -5527,7 +6170,7 @@
1.5028 for ac_exec_ext in '' $ac_executable_extensions; do
1.5029 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.5030 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1.5031 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5032 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5033 break 2
1.5034 fi
1.5035 done
1.5036 @@ -5539,11 +6182,11 @@
1.5037 fi
1.5038 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
1.5039 if test -n "$ac_pt_PKG_CONFIG"; then
1.5040 - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
1.5041 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
1.5042 -else
1.5043 - { echo "$as_me:$LINENO: result: no" >&5
1.5044 -echo "${ECHO_T}no" >&6; }
1.5045 + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
1.5046 +$as_echo "$ac_pt_PKG_CONFIG" >&6; }
1.5047 +else
1.5048 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.5049 +$as_echo "no" >&6; }
1.5050 fi
1.5051
1.5052 if test "x$ac_pt_PKG_CONFIG" = x; then
1.5053 @@ -5551,10 +6194,10 @@
1.5054 else
1.5055 case $cross_compiling:$ac_tool_warned in
1.5056 yes:)
1.5057 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.5058 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1.5059 whose name does not start with the host triplet. If you think this
1.5060 configuration is useful to you, please write to autoconf@gnu.org." >&5
1.5061 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.5062 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1.5063 whose name does not start with the host triplet. If you think this
1.5064 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1.5065 ac_tool_warned=yes ;;
1.5066 @@ -5568,32 +6211,32 @@
1.5067 fi
1.5068 if test -n "$PKG_CONFIG"; then
1.5069 _pkg_min_version=0.9.0
1.5070 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
1.5071 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
1.5072 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
1.5073 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
1.5074 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
1.5075 - { echo "$as_me:$LINENO: result: yes" >&5
1.5076 -echo "${ECHO_T}yes" >&6; }
1.5077 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.5078 +$as_echo "yes" >&6; }
1.5079 else
1.5080 - { echo "$as_me:$LINENO: result: no" >&5
1.5081 -echo "${ECHO_T}no" >&6; }
1.5082 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.5083 +$as_echo "no" >&6; }
1.5084 PKG_CONFIG=""
1.5085 fi
1.5086
1.5087 fi
1.5088
1.5089 pkg_failed=no
1.5090 -{ echo "$as_me:$LINENO: checking for LIBPNG" >&5
1.5091 -echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; }
1.5092 +{ $as_echo "$as_me:$LINENO: checking for LIBPNG" >&5
1.5093 +$as_echo_n "checking for LIBPNG... " >&6; }
1.5094
1.5095 if test -n "$PKG_CONFIG"; then
1.5096 if test -n "$LIBPNG_CFLAGS"; then
1.5097 pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
1.5098 else
1.5099 if test -n "$PKG_CONFIG" && \
1.5100 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&5
1.5101 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&5
1.5102 ($PKG_CONFIG --exists --print-errors "libpng ") 2>&5
1.5103 ac_status=$?
1.5104 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5105 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5106 (exit $ac_status); }; then
1.5107 pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng " 2>/dev/null`
1.5108 else
1.5109 @@ -5608,10 +6251,10 @@
1.5110 pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
1.5111 else
1.5112 if test -n "$PKG_CONFIG" && \
1.5113 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&5
1.5114 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&5
1.5115 ($PKG_CONFIG --exists --print-errors "libpng ") 2>&5
1.5116 ac_status=$?
1.5117 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5118 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5119 (exit $ac_status); }; then
1.5120 pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng " 2>/dev/null`
1.5121 else
1.5122 @@ -5639,7 +6282,7 @@
1.5123 # Put the nasty error message in config.log where it belongs
1.5124 echo "$LIBPNG_PKG_ERRORS" >&5
1.5125
1.5126 - { { echo "$as_me:$LINENO: error: Package requirements (libpng ) were not met:
1.5127 + { { $as_echo "$as_me:$LINENO: error: Package requirements (libpng ) were not met:
1.5128
1.5129 $LIBPNG_PKG_ERRORS
1.5130
1.5131 @@ -5650,7 +6293,7 @@
1.5132 and LIBPNG_LIBS to avoid the need to call pkg-config.
1.5133 See the pkg-config man page for more details.
1.5134 " >&5
1.5135 -echo "$as_me: error: Package requirements (libpng ) were not met:
1.5136 +$as_echo "$as_me: error: Package requirements (libpng ) were not met:
1.5137
1.5138 $LIBPNG_PKG_ERRORS
1.5139
1.5140 @@ -5663,7 +6306,7 @@
1.5141 " >&2;}
1.5142 { (exit 1); exit 1; }; }
1.5143 elif test $pkg_failed = untried; then
1.5144 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
1.5145 + { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
1.5146 is in your PATH or set the PKG_CONFIG environment variable to the full
1.5147 path to pkg-config.
1.5148
1.5149 @@ -5671,9 +6314,9 @@
1.5150 and LIBPNG_LIBS to avoid the need to call pkg-config.
1.5151 See the pkg-config man page for more details.
1.5152
1.5153 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
1.5154 -See \`config.log' for more details." >&5
1.5155 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
1.5156 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1.5157 +See \`config.log' for more details." >&5
1.5158 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
1.5159 is in your PATH or set the PKG_CONFIG environment variable to the full
1.5160 path to pkg-config.
1.5161
1.5162 @@ -5681,22 +6324,22 @@
1.5163 and LIBPNG_LIBS to avoid the need to call pkg-config.
1.5164 See the pkg-config man page for more details.
1.5165
1.5166 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
1.5167 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1.5168 See \`config.log' for more details." >&2;}
1.5169 { (exit 1); exit 1; }; }
1.5170 else
1.5171 LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS
1.5172 LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS
1.5173 - { echo "$as_me:$LINENO: result: yes" >&5
1.5174 -echo "${ECHO_T}yes" >&6; }
1.5175 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.5176 +$as_echo "yes" >&6; }
1.5177 :
1.5178 fi
1.5179
1.5180
1.5181 -{ echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
1.5182 -echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6; }
1.5183 +{ $as_echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
1.5184 +$as_echo_n "checking for uncompress in -lz... " >&6; }
1.5185 if test "${ac_cv_lib_z_uncompress+set}" = set; then
1.5186 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5187 + $as_echo_n "(cached) " >&6
1.5188 else
1.5189 ac_check_lib_save_LIBS=$LIBS
1.5190 LIBS="-lz $LIBS"
1.5191 @@ -5728,32 +6371,36 @@
1.5192 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5193 *) ac_try_echo=$ac_try;;
1.5194 esac
1.5195 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5196 - (eval "$ac_link") 2>conftest.er1
1.5197 - ac_status=$?
1.5198 - grep -v '^ *+' conftest.er1 >conftest.err
1.5199 - rm -f conftest.er1
1.5200 - cat conftest.err >&5
1.5201 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5202 - (exit $ac_status); } && {
1.5203 - test -z "$ac_c_werror_flag" ||
1.5204 - test ! -s conftest.err
1.5205 - } && test -s conftest$ac_exeext &&
1.5206 - $as_test_x conftest$ac_exeext; then
1.5207 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.5208 +$as_echo "$ac_try_echo") >&5
1.5209 + (eval "$ac_link") 2>conftest.er1
1.5210 + ac_status=$?
1.5211 + grep -v '^ *+' conftest.er1 >conftest.err
1.5212 + rm -f conftest.er1
1.5213 + cat conftest.err >&5
1.5214 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5215 + (exit $ac_status); } && {
1.5216 + test -z "$ac_c_werror_flag" ||
1.5217 + test ! -s conftest.err
1.5218 + } && test -s conftest$ac_exeext && {
1.5219 + test "$cross_compiling" = yes ||
1.5220 + $as_test_x conftest$ac_exeext
1.5221 + }; then
1.5222 ac_cv_lib_z_uncompress=yes
1.5223 else
1.5224 - echo "$as_me: failed program was:" >&5
1.5225 + $as_echo "$as_me: failed program was:" >&5
1.5226 sed 's/^/| /' conftest.$ac_ext >&5
1.5227
1.5228 ac_cv_lib_z_uncompress=no
1.5229 fi
1.5230
1.5231 +rm -rf conftest.dSYM
1.5232 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.5233 conftest$ac_exeext conftest.$ac_ext
1.5234 LIBS=$ac_check_lib_save_LIBS
1.5235 fi
1.5236 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
1.5237 -echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6; }
1.5238 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
1.5239 +$as_echo "$ac_cv_lib_z_uncompress" >&6; }
1.5240 if test $ac_cv_lib_z_uncompress = yes; then
1.5241 cat >>confdefs.h <<_ACEOF
1.5242 #define HAVE_LIBZ 1
1.5243 @@ -5768,502 +6415,21 @@
1.5244 fi
1.5245
1.5246
1.5247 -if test "$APPLE_BUILD" != 'yes'; then
1.5248 -if test "x$with_osmesa" == "xno"; then
1.5249 -
1.5250 -{ echo "$as_me:$LINENO: checking for glXQueryVersion in -lGL" >&5
1.5251 -echo $ECHO_N "checking for glXQueryVersion in -lGL... $ECHO_C" >&6; }
1.5252 -if test "${ac_cv_lib_GL_glXQueryVersion+set}" = set; then
1.5253 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5254 -else
1.5255 - ac_check_lib_save_LIBS=$LIBS
1.5256 -LIBS="-lGL $LIBS"
1.5257 -cat >conftest.$ac_ext <<_ACEOF
1.5258 -/* confdefs.h. */
1.5259 -_ACEOF
1.5260 -cat confdefs.h >>conftest.$ac_ext
1.5261 -cat >>conftest.$ac_ext <<_ACEOF
1.5262 -/* end confdefs.h. */
1.5263 -
1.5264 -/* Override any GCC internal prototype to avoid an error.
1.5265 - Use char because int might match the return type of a GCC
1.5266 - builtin and then its argument prototype would still apply. */
1.5267 -#ifdef __cplusplus
1.5268 -extern "C"
1.5269 -#endif
1.5270 -char glXQueryVersion ();
1.5271 -int
1.5272 -main ()
1.5273 -{
1.5274 -return glXQueryVersion ();
1.5275 - ;
1.5276 - return 0;
1.5277 -}
1.5278 -_ACEOF
1.5279 -rm -f conftest.$ac_objext conftest$ac_exeext
1.5280 -if { (ac_try="$ac_link"
1.5281 -case "(($ac_try" in
1.5282 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5283 - *) ac_try_echo=$ac_try;;
1.5284 -esac
1.5285 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5286 - (eval "$ac_link") 2>conftest.er1
1.5287 - ac_status=$?
1.5288 - grep -v '^ *+' conftest.er1 >conftest.err
1.5289 - rm -f conftest.er1
1.5290 - cat conftest.err >&5
1.5291 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5292 - (exit $ac_status); } && {
1.5293 - test -z "$ac_c_werror_flag" ||
1.5294 - test ! -s conftest.err
1.5295 - } && test -s conftest$ac_exeext &&
1.5296 - $as_test_x conftest$ac_exeext; then
1.5297 - ac_cv_lib_GL_glXQueryVersion=yes
1.5298 -else
1.5299 - echo "$as_me: failed program was:" >&5
1.5300 -sed 's/^/| /' conftest.$ac_ext >&5
1.5301 -
1.5302 - ac_cv_lib_GL_glXQueryVersion=no
1.5303 -fi
1.5304 -
1.5305 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.5306 - conftest$ac_exeext conftest.$ac_ext
1.5307 -LIBS=$ac_check_lib_save_LIBS
1.5308 -fi
1.5309 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXQueryVersion" >&5
1.5310 -echo "${ECHO_T}$ac_cv_lib_GL_glXQueryVersion" >&6; }
1.5311 -if test $ac_cv_lib_GL_glXQueryVersion = yes; then
1.5312 - cat >>confdefs.h <<_ACEOF
1.5313 -#define HAVE_LIBGL 1
1.5314 -_ACEOF
1.5315 -
1.5316 - LIBS="-lGL $LIBS"
1.5317 -
1.5318 -else
1.5319 -
1.5320 - echo "The OpenGL library (libGL.so) could not be found, but is required."
1.5321 - exit 1
1.5322 -fi
1.5323 -
1.5324 -if test "${ac_cv_header_GL_gl_h+set}" = set; then
1.5325 - { echo "$as_me:$LINENO: checking for GL/gl.h" >&5
1.5326 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
1.5327 -if test "${ac_cv_header_GL_gl_h+set}" = set; then
1.5328 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5329 -fi
1.5330 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
1.5331 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
1.5332 -else
1.5333 - # Is the header compilable?
1.5334 -{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
1.5335 -echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; }
1.5336 -cat >conftest.$ac_ext <<_ACEOF
1.5337 -/* confdefs.h. */
1.5338 -_ACEOF
1.5339 -cat confdefs.h >>conftest.$ac_ext
1.5340 -cat >>conftest.$ac_ext <<_ACEOF
1.5341 -/* end confdefs.h. */
1.5342 -$ac_includes_default
1.5343 -#include <GL/gl.h>
1.5344 -_ACEOF
1.5345 -rm -f conftest.$ac_objext
1.5346 -if { (ac_try="$ac_compile"
1.5347 -case "(($ac_try" in
1.5348 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5349 - *) ac_try_echo=$ac_try;;
1.5350 -esac
1.5351 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5352 - (eval "$ac_compile") 2>conftest.er1
1.5353 - ac_status=$?
1.5354 - grep -v '^ *+' conftest.er1 >conftest.err
1.5355 - rm -f conftest.er1
1.5356 - cat conftest.err >&5
1.5357 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5358 - (exit $ac_status); } && {
1.5359 - test -z "$ac_c_werror_flag" ||
1.5360 - test ! -s conftest.err
1.5361 - } && test -s conftest.$ac_objext; then
1.5362 - ac_header_compiler=yes
1.5363 -else
1.5364 - echo "$as_me: failed program was:" >&5
1.5365 -sed 's/^/| /' conftest.$ac_ext >&5
1.5366 -
1.5367 - ac_header_compiler=no
1.5368 -fi
1.5369 -
1.5370 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.5371 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.5372 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.5373 -
1.5374 -# Is the header present?
1.5375 -{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
1.5376 -echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; }
1.5377 -cat >conftest.$ac_ext <<_ACEOF
1.5378 -/* confdefs.h. */
1.5379 -_ACEOF
1.5380 -cat confdefs.h >>conftest.$ac_ext
1.5381 -cat >>conftest.$ac_ext <<_ACEOF
1.5382 -/* end confdefs.h. */
1.5383 -#include <GL/gl.h>
1.5384 -_ACEOF
1.5385 -if { (ac_try="$ac_cpp conftest.$ac_ext"
1.5386 -case "(($ac_try" in
1.5387 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5388 - *) ac_try_echo=$ac_try;;
1.5389 -esac
1.5390 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5391 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.5392 - ac_status=$?
1.5393 - grep -v '^ *+' conftest.er1 >conftest.err
1.5394 - rm -f conftest.er1
1.5395 - cat conftest.err >&5
1.5396 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5397 - (exit $ac_status); } >/dev/null && {
1.5398 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.5399 - test ! -s conftest.err
1.5400 - }; then
1.5401 - ac_header_preproc=yes
1.5402 -else
1.5403 - echo "$as_me: failed program was:" >&5
1.5404 -sed 's/^/| /' conftest.$ac_ext >&5
1.5405 -
1.5406 - ac_header_preproc=no
1.5407 -fi
1.5408 -
1.5409 -rm -f conftest.err conftest.$ac_ext
1.5410 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.5411 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.5412 -
1.5413 -# So? What about this header?
1.5414 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.5415 - yes:no: )
1.5416 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.5417 -echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.5418 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
1.5419 -echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
1.5420 - ac_header_preproc=yes
1.5421 - ;;
1.5422 - no:yes:* )
1.5423 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
1.5424 -echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
1.5425 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
1.5426 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
1.5427 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5
1.5428 -echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
1.5429 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5
1.5430 -echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.5431 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
1.5432 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
1.5433 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
1.5434 -echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
1.5435 -
1.5436 - ;;
1.5437 -esac
1.5438 -{ echo "$as_me:$LINENO: checking for GL/gl.h" >&5
1.5439 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
1.5440 -if test "${ac_cv_header_GL_gl_h+set}" = set; then
1.5441 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5442 -else
1.5443 - ac_cv_header_GL_gl_h=$ac_header_preproc
1.5444 -fi
1.5445 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
1.5446 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
1.5447 -
1.5448 -fi
1.5449 -if test $ac_cv_header_GL_gl_h = yes; then
1.5450 - :
1.5451 -else
1.5452 -
1.5453 - echo "The OpenGL header files (eg GL/gl.h) could not be found, but are required."
1.5454 - exit 1
1.5455 -fi
1.5456 -
1.5457 -
1.5458 -fi
1.5459 -fi
1.5460 -
1.5461 -{ echo "$as_me:$LINENO: checking for glGenFramebuffersEXT" >&5
1.5462 -echo $ECHO_N "checking for glGenFramebuffersEXT... $ECHO_C" >&6; }
1.5463 -if test "${ac_cv_func_glGenFramebuffersEXT+set}" = set; then
1.5464 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5465 -else
1.5466 - cat >conftest.$ac_ext <<_ACEOF
1.5467 -/* confdefs.h. */
1.5468 -_ACEOF
1.5469 -cat confdefs.h >>conftest.$ac_ext
1.5470 -cat >>conftest.$ac_ext <<_ACEOF
1.5471 -/* end confdefs.h. */
1.5472 -/* Define glGenFramebuffersEXT to an innocuous variant, in case <limits.h> declares glGenFramebuffersEXT.
1.5473 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.5474 -#define glGenFramebuffersEXT innocuous_glGenFramebuffersEXT
1.5475 -
1.5476 -/* System header to define __stub macros and hopefully few prototypes,
1.5477 - which can conflict with char glGenFramebuffersEXT (); below.
1.5478 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.5479 - <limits.h> exists even on freestanding compilers. */
1.5480 -
1.5481 -#ifdef __STDC__
1.5482 -# include <limits.h>
1.5483 -#else
1.5484 -# include <assert.h>
1.5485 -#endif
1.5486 -
1.5487 -#undef glGenFramebuffersEXT
1.5488 -
1.5489 -/* Override any GCC internal prototype to avoid an error.
1.5490 - Use char because int might match the return type of a GCC
1.5491 - builtin and then its argument prototype would still apply. */
1.5492 -#ifdef __cplusplus
1.5493 -extern "C"
1.5494 -#endif
1.5495 -char glGenFramebuffersEXT ();
1.5496 -/* The GNU C library defines this for functions which it implements
1.5497 - to always fail with ENOSYS. Some functions are actually named
1.5498 - something starting with __ and the normal name is an alias. */
1.5499 -#if defined __stub_glGenFramebuffersEXT || defined __stub___glGenFramebuffersEXT
1.5500 -choke me
1.5501 -#endif
1.5502 -
1.5503 -int
1.5504 -main ()
1.5505 -{
1.5506 -return glGenFramebuffersEXT ();
1.5507 - ;
1.5508 - return 0;
1.5509 -}
1.5510 -_ACEOF
1.5511 -rm -f conftest.$ac_objext conftest$ac_exeext
1.5512 -if { (ac_try="$ac_link"
1.5513 -case "(($ac_try" in
1.5514 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5515 - *) ac_try_echo=$ac_try;;
1.5516 -esac
1.5517 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5518 - (eval "$ac_link") 2>conftest.er1
1.5519 - ac_status=$?
1.5520 - grep -v '^ *+' conftest.er1 >conftest.err
1.5521 - rm -f conftest.er1
1.5522 - cat conftest.err >&5
1.5523 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5524 - (exit $ac_status); } && {
1.5525 - test -z "$ac_c_werror_flag" ||
1.5526 - test ! -s conftest.err
1.5527 - } && test -s conftest$ac_exeext &&
1.5528 - $as_test_x conftest$ac_exeext; then
1.5529 - ac_cv_func_glGenFramebuffersEXT=yes
1.5530 -else
1.5531 - echo "$as_me: failed program was:" >&5
1.5532 -sed 's/^/| /' conftest.$ac_ext >&5
1.5533 -
1.5534 - ac_cv_func_glGenFramebuffersEXT=no
1.5535 -fi
1.5536 -
1.5537 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.5538 - conftest$ac_exeext conftest.$ac_ext
1.5539 -fi
1.5540 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glGenFramebuffersEXT" >&5
1.5541 -echo "${ECHO_T}$ac_cv_func_glGenFramebuffersEXT" >&6; }
1.5542 -if test $ac_cv_func_glGenFramebuffersEXT = yes; then
1.5543 -
1.5544 -cat >>confdefs.h <<\_ACEOF
1.5545 -#define HAVE_OPENGL_FBO 1
1.5546 -_ACEOF
1.5547 -
1.5548 -fi
1.5549 -
1.5550 -{ echo "$as_me:$LINENO: checking for glCreateShader" >&5
1.5551 -echo $ECHO_N "checking for glCreateShader... $ECHO_C" >&6; }
1.5552 -if test "${ac_cv_func_glCreateShader+set}" = set; then
1.5553 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5554 -else
1.5555 - cat >conftest.$ac_ext <<_ACEOF
1.5556 -/* confdefs.h. */
1.5557 -_ACEOF
1.5558 -cat confdefs.h >>conftest.$ac_ext
1.5559 -cat >>conftest.$ac_ext <<_ACEOF
1.5560 -/* end confdefs.h. */
1.5561 -/* Define glCreateShader to an innocuous variant, in case <limits.h> declares glCreateShader.
1.5562 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.5563 -#define glCreateShader innocuous_glCreateShader
1.5564 -
1.5565 -/* System header to define __stub macros and hopefully few prototypes,
1.5566 - which can conflict with char glCreateShader (); below.
1.5567 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.5568 - <limits.h> exists even on freestanding compilers. */
1.5569 -
1.5570 -#ifdef __STDC__
1.5571 -# include <limits.h>
1.5572 -#else
1.5573 -# include <assert.h>
1.5574 -#endif
1.5575 -
1.5576 -#undef glCreateShader
1.5577 -
1.5578 -/* Override any GCC internal prototype to avoid an error.
1.5579 - Use char because int might match the return type of a GCC
1.5580 - builtin and then its argument prototype would still apply. */
1.5581 -#ifdef __cplusplus
1.5582 -extern "C"
1.5583 -#endif
1.5584 -char glCreateShader ();
1.5585 -/* The GNU C library defines this for functions which it implements
1.5586 - to always fail with ENOSYS. Some functions are actually named
1.5587 - something starting with __ and the normal name is an alias. */
1.5588 -#if defined __stub_glCreateShader || defined __stub___glCreateShader
1.5589 -choke me
1.5590 -#endif
1.5591 -
1.5592 -int
1.5593 -main ()
1.5594 -{
1.5595 -return glCreateShader ();
1.5596 - ;
1.5597 - return 0;
1.5598 -}
1.5599 -_ACEOF
1.5600 -rm -f conftest.$ac_objext conftest$ac_exeext
1.5601 -if { (ac_try="$ac_link"
1.5602 -case "(($ac_try" in
1.5603 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5604 - *) ac_try_echo=$ac_try;;
1.5605 -esac
1.5606 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5607 - (eval "$ac_link") 2>conftest.er1
1.5608 - ac_status=$?
1.5609 - grep -v '^ *+' conftest.er1 >conftest.err
1.5610 - rm -f conftest.er1
1.5611 - cat conftest.err >&5
1.5612 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5613 - (exit $ac_status); } && {
1.5614 - test -z "$ac_c_werror_flag" ||
1.5615 - test ! -s conftest.err
1.5616 - } && test -s conftest$ac_exeext &&
1.5617 - $as_test_x conftest$ac_exeext; then
1.5618 - ac_cv_func_glCreateShader=yes
1.5619 -else
1.5620 - echo "$as_me: failed program was:" >&5
1.5621 -sed 's/^/| /' conftest.$ac_ext >&5
1.5622 -
1.5623 - ac_cv_func_glCreateShader=no
1.5624 -fi
1.5625 -
1.5626 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.5627 - conftest$ac_exeext conftest.$ac_ext
1.5628 -fi
1.5629 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShader" >&5
1.5630 -echo "${ECHO_T}$ac_cv_func_glCreateShader" >&6; }
1.5631 -if test $ac_cv_func_glCreateShader = yes; then
1.5632 -
1.5633 -cat >>confdefs.h <<\_ACEOF
1.5634 -#define HAVE_OPENGL_SHADER 1
1.5635 -_ACEOF
1.5636 -
1.5637 -fi
1.5638 -
1.5639 -{ echo "$as_me:$LINENO: checking for glCreateShaderObjectARB" >&5
1.5640 -echo $ECHO_N "checking for glCreateShaderObjectARB... $ECHO_C" >&6; }
1.5641 -if test "${ac_cv_func_glCreateShaderObjectARB+set}" = set; then
1.5642 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.5643 -else
1.5644 - cat >conftest.$ac_ext <<_ACEOF
1.5645 -/* confdefs.h. */
1.5646 -_ACEOF
1.5647 -cat confdefs.h >>conftest.$ac_ext
1.5648 -cat >>conftest.$ac_ext <<_ACEOF
1.5649 -/* end confdefs.h. */
1.5650 -/* Define glCreateShaderObjectARB to an innocuous variant, in case <limits.h> declares glCreateShaderObjectARB.
1.5651 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.5652 -#define glCreateShaderObjectARB innocuous_glCreateShaderObjectARB
1.5653 -
1.5654 -/* System header to define __stub macros and hopefully few prototypes,
1.5655 - which can conflict with char glCreateShaderObjectARB (); below.
1.5656 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.5657 - <limits.h> exists even on freestanding compilers. */
1.5658 -
1.5659 -#ifdef __STDC__
1.5660 -# include <limits.h>
1.5661 -#else
1.5662 -# include <assert.h>
1.5663 -#endif
1.5664 -
1.5665 -#undef glCreateShaderObjectARB
1.5666 -
1.5667 -/* Override any GCC internal prototype to avoid an error.
1.5668 - Use char because int might match the return type of a GCC
1.5669 - builtin and then its argument prototype would still apply. */
1.5670 -#ifdef __cplusplus
1.5671 -extern "C"
1.5672 -#endif
1.5673 -char glCreateShaderObjectARB ();
1.5674 -/* The GNU C library defines this for functions which it implements
1.5675 - to always fail with ENOSYS. Some functions are actually named
1.5676 - something starting with __ and the normal name is an alias. */
1.5677 -#if defined __stub_glCreateShaderObjectARB || defined __stub___glCreateShaderObjectARB
1.5678 -choke me
1.5679 -#endif
1.5680 -
1.5681 -int
1.5682 -main ()
1.5683 -{
1.5684 -return glCreateShaderObjectARB ();
1.5685 - ;
1.5686 - return 0;
1.5687 -}
1.5688 -_ACEOF
1.5689 -rm -f conftest.$ac_objext conftest$ac_exeext
1.5690 -if { (ac_try="$ac_link"
1.5691 -case "(($ac_try" in
1.5692 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5693 - *) ac_try_echo=$ac_try;;
1.5694 -esac
1.5695 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.5696 - (eval "$ac_link") 2>conftest.er1
1.5697 - ac_status=$?
1.5698 - grep -v '^ *+' conftest.er1 >conftest.err
1.5699 - rm -f conftest.er1
1.5700 - cat conftest.err >&5
1.5701 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5702 - (exit $ac_status); } && {
1.5703 - test -z "$ac_c_werror_flag" ||
1.5704 - test ! -s conftest.err
1.5705 - } && test -s conftest$ac_exeext &&
1.5706 - $as_test_x conftest$ac_exeext; then
1.5707 - ac_cv_func_glCreateShaderObjectARB=yes
1.5708 -else
1.5709 - echo "$as_me: failed program was:" >&5
1.5710 -sed 's/^/| /' conftest.$ac_ext >&5
1.5711 -
1.5712 - ac_cv_func_glCreateShaderObjectARB=no
1.5713 -fi
1.5714 -
1.5715 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.5716 - conftest$ac_exeext conftest.$ac_ext
1.5717 -fi
1.5718 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShaderObjectARB" >&5
1.5719 -echo "${ECHO_T}$ac_cv_func_glCreateShaderObjectARB" >&6; }
1.5720 -if test $ac_cv_func_glCreateShaderObjectARB = yes; then
1.5721 -
1.5722 -cat >>confdefs.h <<\_ACEOF
1.5723 -#define HAVE_OPENGL_SHADER_ARB 1
1.5724 -_ACEOF
1.5725 -
1.5726 -fi
1.5727 -
1.5728
1.5729
1.5730 pkg_failed=no
1.5731 -{ echo "$as_me:$LINENO: checking for GTK" >&5
1.5732 -echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
1.5733 +{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
1.5734 +$as_echo_n "checking for GTK... " >&6; }
1.5735
1.5736 if test -n "$PKG_CONFIG"; then
1.5737 if test -n "$GTK_CFLAGS"; then
1.5738 pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
1.5739 else
1.5740 if test -n "$PKG_CONFIG" && \
1.5741 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
1.5742 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
1.5743 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
1.5744 ac_status=$?
1.5745 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5746 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5747 (exit $ac_status); }; then
1.5748 pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
1.5749 else
1.5750 @@ -6278,10 +6444,10 @@
1.5751 pkg_cv_GTK_LIBS="$GTK_LIBS"
1.5752 else
1.5753 if test -n "$PKG_CONFIG" && \
1.5754 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
1.5755 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
1.5756 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
1.5757 ac_status=$?
1.5758 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5759 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5760 (exit $ac_status); }; then
1.5761 pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
1.5762 else
1.5763 @@ -6309,7 +6475,7 @@
1.5764 # Put the nasty error message in config.log where it belongs
1.5765 echo "$GTK_PKG_ERRORS" >&5
1.5766
1.5767 - { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:
1.5768 + { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:
1.5769
1.5770 $GTK_PKG_ERRORS
1.5771
1.5772 @@ -6320,7 +6486,7 @@
1.5773 and GTK_LIBS to avoid the need to call pkg-config.
1.5774 See the pkg-config man page for more details.
1.5775 " >&5
1.5776 -echo "$as_me: error: Package requirements (gtk+-2.0) were not met:
1.5777 +$as_echo "$as_me: error: Package requirements (gtk+-2.0) were not met:
1.5778
1.5779 $GTK_PKG_ERRORS
1.5780
1.5781 @@ -6333,7 +6499,7 @@
1.5782 " >&2;}
1.5783 { (exit 1); exit 1; }; }
1.5784 elif test $pkg_failed = untried; then
1.5785 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
1.5786 + { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
1.5787 is in your PATH or set the PKG_CONFIG environment variable to the full
1.5788 path to pkg-config.
1.5789
1.5790 @@ -6341,9 +6507,9 @@
1.5791 and GTK_LIBS to avoid the need to call pkg-config.
1.5792 See the pkg-config man page for more details.
1.5793
1.5794 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
1.5795 -See \`config.log' for more details." >&5
1.5796 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
1.5797 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1.5798 +See \`config.log' for more details." >&5
1.5799 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
1.5800 is in your PATH or set the PKG_CONFIG environment variable to the full
1.5801 path to pkg-config.
1.5802
1.5803 @@ -6351,14 +6517,14 @@
1.5804 and GTK_LIBS to avoid the need to call pkg-config.
1.5805 See the pkg-config man page for more details.
1.5806
1.5807 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
1.5808 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1.5809 See \`config.log' for more details." >&2;}
1.5810 { (exit 1); exit 1; }; }
1.5811 else
1.5812 GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
1.5813 GTK_LIBS=$pkg_cv_GTK_LIBS
1.5814 - { echo "$as_me:$LINENO: result: yes" >&5
1.5815 -echo "${ECHO_T}yes" >&6; }
1.5816 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.5817 +$as_echo "yes" >&6; }
1.5818
1.5819 HAVE_GTK='yes'
1.5820
1.5821 @@ -6370,17 +6536,6 @@
1.5822 fi
1.5823
1.5824
1.5825 -
1.5826 -if test "$HAVE_CARBON" = 'yes'; then
1.5827 - GUI_CARBON_TRUE=
1.5828 - GUI_CARBON_FALSE='#'
1.5829 -else
1.5830 - GUI_CARBON_TRUE='#'
1.5831 - GUI_CARBON_FALSE=
1.5832 -fi
1.5833 -
1.5834 -
1.5835 -
1.5836 if test "$HAVE_GTK" = 'yes'; then
1.5837 GUI_GTK_TRUE=
1.5838 GUI_GTK_FALSE='#'
1.5839 @@ -6390,6 +6545,1171 @@
1.5840 fi
1.5841
1.5842
1.5843 +LIBS="$LIBS $GTK_LIBS"
1.5844 +{ $as_echo "$as_me:$LINENO: checking for gdk_x11_display_get_xdisplay" >&5
1.5845 +$as_echo_n "checking for gdk_x11_display_get_xdisplay... " >&6; }
1.5846 +if test "${ac_cv_func_gdk_x11_display_get_xdisplay+set}" = set; then
1.5847 + $as_echo_n "(cached) " >&6
1.5848 +else
1.5849 + cat >conftest.$ac_ext <<_ACEOF
1.5850 +/* confdefs.h. */
1.5851 +_ACEOF
1.5852 +cat confdefs.h >>conftest.$ac_ext
1.5853 +cat >>conftest.$ac_ext <<_ACEOF
1.5854 +/* end confdefs.h. */
1.5855 +/* Define gdk_x11_display_get_xdisplay to an innocuous variant, in case <limits.h> declares gdk_x11_display_get_xdisplay.
1.5856 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.5857 +#define gdk_x11_display_get_xdisplay innocuous_gdk_x11_display_get_xdisplay
1.5858 +
1.5859 +/* System header to define __stub macros and hopefully few prototypes,
1.5860 + which can conflict with char gdk_x11_display_get_xdisplay (); below.
1.5861 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.5862 + <limits.h> exists even on freestanding compilers. */
1.5863 +
1.5864 +#ifdef __STDC__
1.5865 +# include <limits.h>
1.5866 +#else
1.5867 +# include <assert.h>
1.5868 +#endif
1.5869 +
1.5870 +#undef gdk_x11_display_get_xdisplay
1.5871 +
1.5872 +/* Override any GCC internal prototype to avoid an error.
1.5873 + Use char because int might match the return type of a GCC
1.5874 + builtin and then its argument prototype would still apply. */
1.5875 +#ifdef __cplusplus
1.5876 +extern "C"
1.5877 +#endif
1.5878 +char gdk_x11_display_get_xdisplay ();
1.5879 +/* The GNU C library defines this for functions which it implements
1.5880 + to always fail with ENOSYS. Some functions are actually named
1.5881 + something starting with __ and the normal name is an alias. */
1.5882 +#if defined __stub_gdk_x11_display_get_xdisplay || defined __stub___gdk_x11_display_get_xdisplay
1.5883 +choke me
1.5884 +#endif
1.5885 +
1.5886 +int
1.5887 +main ()
1.5888 +{
1.5889 +return gdk_x11_display_get_xdisplay ();
1.5890 + ;
1.5891 + return 0;
1.5892 +}
1.5893 +_ACEOF
1.5894 +rm -f conftest.$ac_objext conftest$ac_exeext
1.5895 +if { (ac_try="$ac_link"
1.5896 +case "(($ac_try" in
1.5897 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5898 + *) ac_try_echo=$ac_try;;
1.5899 +esac
1.5900 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.5901 +$as_echo "$ac_try_echo") >&5
1.5902 + (eval "$ac_link") 2>conftest.er1
1.5903 + ac_status=$?
1.5904 + grep -v '^ *+' conftest.er1 >conftest.err
1.5905 + rm -f conftest.er1
1.5906 + cat conftest.err >&5
1.5907 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.5908 + (exit $ac_status); } && {
1.5909 + test -z "$ac_c_werror_flag" ||
1.5910 + test ! -s conftest.err
1.5911 + } && test -s conftest$ac_exeext && {
1.5912 + test "$cross_compiling" = yes ||
1.5913 + $as_test_x conftest$ac_exeext
1.5914 + }; then
1.5915 + ac_cv_func_gdk_x11_display_get_xdisplay=yes
1.5916 +else
1.5917 + $as_echo "$as_me: failed program was:" >&5
1.5918 +sed 's/^/| /' conftest.$ac_ext >&5
1.5919 +
1.5920 + ac_cv_func_gdk_x11_display_get_xdisplay=no
1.5921 +fi
1.5922 +
1.5923 +rm -rf conftest.dSYM
1.5924 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.5925 + conftest$ac_exeext conftest.$ac_ext
1.5926 +fi
1.5927 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gdk_x11_display_get_xdisplay" >&5
1.5928 +$as_echo "$ac_cv_func_gdk_x11_display_get_xdisplay" >&6; }
1.5929 +if test $ac_cv_func_gdk_x11_display_get_xdisplay = yes; then
1.5930 +
1.5931 + HAVE_GTK_X11='yes'
1.5932 +
1.5933 +cat >>confdefs.h <<\_ACEOF
1.5934 +#define HAVE_GTK_X11 1
1.5935 +_ACEOF
1.5936 +
1.5937 +fi
1.5938 +
1.5939 +{ $as_echo "$as_me:$LINENO: checking for gdk_quartz_window_get_nsview" >&5
1.5940 +$as_echo_n "checking for gdk_quartz_window_get_nsview... " >&6; }
1.5941 +if test "${ac_cv_func_gdk_quartz_window_get_nsview+set}" = set; then
1.5942 + $as_echo_n "(cached) " >&6
1.5943 +else
1.5944 + cat >conftest.$ac_ext <<_ACEOF
1.5945 +/* confdefs.h. */
1.5946 +_ACEOF
1.5947 +cat confdefs.h >>conftest.$ac_ext
1.5948 +cat >>conftest.$ac_ext <<_ACEOF
1.5949 +/* end confdefs.h. */
1.5950 +/* Define gdk_quartz_window_get_nsview to an innocuous variant, in case <limits.h> declares gdk_quartz_window_get_nsview.
1.5951 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.5952 +#define gdk_quartz_window_get_nsview innocuous_gdk_quartz_window_get_nsview
1.5953 +
1.5954 +/* System header to define __stub macros and hopefully few prototypes,
1.5955 + which can conflict with char gdk_quartz_window_get_nsview (); below.
1.5956 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.5957 + <limits.h> exists even on freestanding compilers. */
1.5958 +
1.5959 +#ifdef __STDC__
1.5960 +# include <limits.h>
1.5961 +#else
1.5962 +# include <assert.h>
1.5963 +#endif
1.5964 +
1.5965 +#undef gdk_quartz_window_get_nsview
1.5966 +
1.5967 +/* Override any GCC internal prototype to avoid an error.
1.5968 + Use char because int might match the return type of a GCC
1.5969 + builtin and then its argument prototype would still apply. */
1.5970 +#ifdef __cplusplus
1.5971 +extern "C"
1.5972 +#endif
1.5973 +char gdk_quartz_window_get_nsview ();
1.5974 +/* The GNU C library defines this for functions which it implements
1.5975 + to always fail with ENOSYS. Some functions are actually named
1.5976 + something starting with __ and the normal name is an alias. */
1.5977 +#if defined __stub_gdk_quartz_window_get_nsview || defined __stub___gdk_quartz_window_get_nsview
1.5978 +choke me
1.5979 +#endif
1.5980 +
1.5981 +int
1.5982 +main ()
1.5983 +{
1.5984 +return gdk_quartz_window_get_nsview ();
1.5985 + ;
1.5986 + return 0;
1.5987 +}
1.5988 +_ACEOF
1.5989 +rm -f conftest.$ac_objext conftest$ac_exeext
1.5990 +if { (ac_try="$ac_link"
1.5991 +case "(($ac_try" in
1.5992 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.5993 + *) ac_try_echo=$ac_try;;
1.5994 +esac
1.5995 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.5996 +$as_echo "$ac_try_echo") >&5
1.5997 + (eval "$ac_link") 2>conftest.er1
1.5998 + ac_status=$?
1.5999 + grep -v '^ *+' conftest.er1 >conftest.err
1.6000 + rm -f conftest.er1
1.6001 + cat conftest.err >&5
1.6002 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6003 + (exit $ac_status); } && {
1.6004 + test -z "$ac_c_werror_flag" ||
1.6005 + test ! -s conftest.err
1.6006 + } && test -s conftest$ac_exeext && {
1.6007 + test "$cross_compiling" = yes ||
1.6008 + $as_test_x conftest$ac_exeext
1.6009 + }; then
1.6010 + ac_cv_func_gdk_quartz_window_get_nsview=yes
1.6011 +else
1.6012 + $as_echo "$as_me: failed program was:" >&5
1.6013 +sed 's/^/| /' conftest.$ac_ext >&5
1.6014 +
1.6015 + ac_cv_func_gdk_quartz_window_get_nsview=no
1.6016 +fi
1.6017 +
1.6018 +rm -rf conftest.dSYM
1.6019 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6020 + conftest$ac_exeext conftest.$ac_ext
1.6021 +fi
1.6022 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gdk_quartz_window_get_nsview" >&5
1.6023 +$as_echo "$ac_cv_func_gdk_quartz_window_get_nsview" >&6; }
1.6024 +if test $ac_cv_func_gdk_quartz_window_get_nsview = yes; then
1.6025 +
1.6026 + HAVE_GTK_OSX='yes'
1.6027 +
1.6028 +cat >>confdefs.h <<\_ACEOF
1.6029 +#define HAVE_GTK_OSX 1
1.6030 +_ACEOF
1.6031 +
1.6032 +fi
1.6033 +
1.6034 +
1.6035 +if test "x$with_osmesa" != xno; then
1.6036 +
1.6037 +
1.6038 +
1.6039 +{ $as_echo "$as_me:$LINENO: checking for OSMesaCreateContext in -lOSMesa" >&5
1.6040 +$as_echo_n "checking for OSMesaCreateContext in -lOSMesa... " >&6; }
1.6041 +if test "${ac_cv_lib_OSMesa_OSMesaCreateContext+set}" = set; then
1.6042 + $as_echo_n "(cached) " >&6
1.6043 +else
1.6044 + ac_check_lib_save_LIBS=$LIBS
1.6045 +LIBS="-lOSMesa $LIBS"
1.6046 +cat >conftest.$ac_ext <<_ACEOF
1.6047 +/* confdefs.h. */
1.6048 +_ACEOF
1.6049 +cat confdefs.h >>conftest.$ac_ext
1.6050 +cat >>conftest.$ac_ext <<_ACEOF
1.6051 +/* end confdefs.h. */
1.6052 +
1.6053 +/* Override any GCC internal prototype to avoid an error.
1.6054 + Use char because int might match the return type of a GCC
1.6055 + builtin and then its argument prototype would still apply. */
1.6056 +#ifdef __cplusplus
1.6057 +extern "C"
1.6058 +#endif
1.6059 +char OSMesaCreateContext ();
1.6060 +int
1.6061 +main ()
1.6062 +{
1.6063 +return OSMesaCreateContext ();
1.6064 + ;
1.6065 + return 0;
1.6066 +}
1.6067 +_ACEOF
1.6068 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6069 +if { (ac_try="$ac_link"
1.6070 +case "(($ac_try" in
1.6071 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6072 + *) ac_try_echo=$ac_try;;
1.6073 +esac
1.6074 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6075 +$as_echo "$ac_try_echo") >&5
1.6076 + (eval "$ac_link") 2>conftest.er1
1.6077 + ac_status=$?
1.6078 + grep -v '^ *+' conftest.er1 >conftest.err
1.6079 + rm -f conftest.er1
1.6080 + cat conftest.err >&5
1.6081 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6082 + (exit $ac_status); } && {
1.6083 + test -z "$ac_c_werror_flag" ||
1.6084 + test ! -s conftest.err
1.6085 + } && test -s conftest$ac_exeext && {
1.6086 + test "$cross_compiling" = yes ||
1.6087 + $as_test_x conftest$ac_exeext
1.6088 + }; then
1.6089 + ac_cv_lib_OSMesa_OSMesaCreateContext=yes
1.6090 +else
1.6091 + $as_echo "$as_me: failed program was:" >&5
1.6092 +sed 's/^/| /' conftest.$ac_ext >&5
1.6093 +
1.6094 + ac_cv_lib_OSMesa_OSMesaCreateContext=no
1.6095 +fi
1.6096 +
1.6097 +rm -rf conftest.dSYM
1.6098 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6099 + conftest$ac_exeext conftest.$ac_ext
1.6100 +LIBS=$ac_check_lib_save_LIBS
1.6101 +fi
1.6102 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&5
1.6103 +$as_echo "$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; }
1.6104 +if test $ac_cv_lib_OSMesa_OSMesaCreateContext = yes; then
1.6105 + cat >>confdefs.h <<_ACEOF
1.6106 +#define HAVE_LIBOSMESA 1
1.6107 +_ACEOF
1.6108 +
1.6109 + LIBS="-lOSMesa $LIBS"
1.6110 +
1.6111 +else
1.6112 + { { $as_echo "$as_me:$LINENO: error: --with-osmesa was given, but OSMesa library could not be found
1.6113 +See \`config.log' for more details." >&5
1.6114 +$as_echo "$as_me: error: --with-osmesa was given, but OSMesa library could not be found
1.6115 +See \`config.log' for more details." >&2;}
1.6116 + { (exit 1); exit 1; }; }
1.6117 +fi
1.6118 +
1.6119 + if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
1.6120 + { $as_echo "$as_me:$LINENO: checking for GL/osmesa.h" >&5
1.6121 +$as_echo_n "checking for GL/osmesa.h... " >&6; }
1.6122 +if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
1.6123 + $as_echo_n "(cached) " >&6
1.6124 +fi
1.6125 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&5
1.6126 +$as_echo "$ac_cv_header_GL_osmesa_h" >&6; }
1.6127 +else
1.6128 + # Is the header compilable?
1.6129 +{ $as_echo "$as_me:$LINENO: checking GL/osmesa.h usability" >&5
1.6130 +$as_echo_n "checking GL/osmesa.h usability... " >&6; }
1.6131 +cat >conftest.$ac_ext <<_ACEOF
1.6132 +/* confdefs.h. */
1.6133 +_ACEOF
1.6134 +cat confdefs.h >>conftest.$ac_ext
1.6135 +cat >>conftest.$ac_ext <<_ACEOF
1.6136 +/* end confdefs.h. */
1.6137 +$ac_includes_default
1.6138 +#include <GL/osmesa.h>
1.6139 +_ACEOF
1.6140 +rm -f conftest.$ac_objext
1.6141 +if { (ac_try="$ac_compile"
1.6142 +case "(($ac_try" in
1.6143 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6144 + *) ac_try_echo=$ac_try;;
1.6145 +esac
1.6146 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6147 +$as_echo "$ac_try_echo") >&5
1.6148 + (eval "$ac_compile") 2>conftest.er1
1.6149 + ac_status=$?
1.6150 + grep -v '^ *+' conftest.er1 >conftest.err
1.6151 + rm -f conftest.er1
1.6152 + cat conftest.err >&5
1.6153 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6154 + (exit $ac_status); } && {
1.6155 + test -z "$ac_c_werror_flag" ||
1.6156 + test ! -s conftest.err
1.6157 + } && test -s conftest.$ac_objext; then
1.6158 + ac_header_compiler=yes
1.6159 +else
1.6160 + $as_echo "$as_me: failed program was:" >&5
1.6161 +sed 's/^/| /' conftest.$ac_ext >&5
1.6162 +
1.6163 + ac_header_compiler=no
1.6164 +fi
1.6165 +
1.6166 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.6167 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.6168 +$as_echo "$ac_header_compiler" >&6; }
1.6169 +
1.6170 +# Is the header present?
1.6171 +{ $as_echo "$as_me:$LINENO: checking GL/osmesa.h presence" >&5
1.6172 +$as_echo_n "checking GL/osmesa.h presence... " >&6; }
1.6173 +cat >conftest.$ac_ext <<_ACEOF
1.6174 +/* confdefs.h. */
1.6175 +_ACEOF
1.6176 +cat confdefs.h >>conftest.$ac_ext
1.6177 +cat >>conftest.$ac_ext <<_ACEOF
1.6178 +/* end confdefs.h. */
1.6179 +#include <GL/osmesa.h>
1.6180 +_ACEOF
1.6181 +if { (ac_try="$ac_cpp conftest.$ac_ext"
1.6182 +case "(($ac_try" in
1.6183 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6184 + *) ac_try_echo=$ac_try;;
1.6185 +esac
1.6186 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6187 +$as_echo "$ac_try_echo") >&5
1.6188 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.6189 + ac_status=$?
1.6190 + grep -v '^ *+' conftest.er1 >conftest.err
1.6191 + rm -f conftest.er1
1.6192 + cat conftest.err >&5
1.6193 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6194 + (exit $ac_status); } >/dev/null && {
1.6195 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.6196 + test ! -s conftest.err
1.6197 + }; then
1.6198 + ac_header_preproc=yes
1.6199 +else
1.6200 + $as_echo "$as_me: failed program was:" >&5
1.6201 +sed 's/^/| /' conftest.$ac_ext >&5
1.6202 +
1.6203 + ac_header_preproc=no
1.6204 +fi
1.6205 +
1.6206 +rm -f conftest.err conftest.$ac_ext
1.6207 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.6208 +$as_echo "$ac_header_preproc" >&6; }
1.6209 +
1.6210 +# So? What about this header?
1.6211 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.6212 + yes:no: )
1.6213 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.6214 +$as_echo "$as_me: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.6215 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&5
1.6216 +$as_echo "$as_me: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&2;}
1.6217 + ac_header_preproc=yes
1.6218 + ;;
1.6219 + no:yes:* )
1.6220 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: present but cannot be compiled" >&5
1.6221 +$as_echo "$as_me: WARNING: GL/osmesa.h: present but cannot be compiled" >&2;}
1.6222 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&5
1.6223 +$as_echo "$as_me: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&2;}
1.6224 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: see the Autoconf documentation" >&5
1.6225 +$as_echo "$as_me: WARNING: GL/osmesa.h: see the Autoconf documentation" >&2;}
1.6226 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&5
1.6227 +$as_echo "$as_me: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.6228 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&5
1.6229 +$as_echo "$as_me: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&2;}
1.6230 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&5
1.6231 +$as_echo "$as_me: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&2;}
1.6232 +
1.6233 + ;;
1.6234 +esac
1.6235 +{ $as_echo "$as_me:$LINENO: checking for GL/osmesa.h" >&5
1.6236 +$as_echo_n "checking for GL/osmesa.h... " >&6; }
1.6237 +if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
1.6238 + $as_echo_n "(cached) " >&6
1.6239 +else
1.6240 + ac_cv_header_GL_osmesa_h=$ac_header_preproc
1.6241 +fi
1.6242 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&5
1.6243 +$as_echo "$ac_cv_header_GL_osmesa_h" >&6; }
1.6244 +
1.6245 +fi
1.6246 +if test $ac_cv_header_GL_osmesa_h = yes; then
1.6247 + :
1.6248 +else
1.6249 + { { $as_echo "$as_me:$LINENO: error: --with-osmesa was given, but osmesa.h could not be found
1.6250 +See \`config.log' for more details." >&5
1.6251 +$as_echo "$as_me: error: --with-osmesa was given, but osmesa.h could not be found
1.6252 +See \`config.log' for more details." >&2;}
1.6253 + { (exit 1); exit 1; }; }
1.6254 +fi
1.6255 +
1.6256 +
1.6257 + HAVE_OSMESA='yes'
1.6258 +
1.6259 +cat >>confdefs.h <<\_ACEOF
1.6260 +#define HAVE_OSMESA 1
1.6261 +_ACEOF
1.6262 +
1.6263 +else
1.6264 +
1.6265 +
1.6266 + if test "x$APPLE_BUILD" != 'xyes'; then
1.6267 +
1.6268 +{ $as_echo "$as_me:$LINENO: checking for glVertex3f in -lGL" >&5
1.6269 +$as_echo_n "checking for glVertex3f in -lGL... " >&6; }
1.6270 +if test "${ac_cv_lib_GL_glVertex3f+set}" = set; then
1.6271 + $as_echo_n "(cached) " >&6
1.6272 +else
1.6273 + ac_check_lib_save_LIBS=$LIBS
1.6274 +LIBS="-lGL $LIBS"
1.6275 +cat >conftest.$ac_ext <<_ACEOF
1.6276 +/* confdefs.h. */
1.6277 +_ACEOF
1.6278 +cat confdefs.h >>conftest.$ac_ext
1.6279 +cat >>conftest.$ac_ext <<_ACEOF
1.6280 +/* end confdefs.h. */
1.6281 +
1.6282 +/* Override any GCC internal prototype to avoid an error.
1.6283 + Use char because int might match the return type of a GCC
1.6284 + builtin and then its argument prototype would still apply. */
1.6285 +#ifdef __cplusplus
1.6286 +extern "C"
1.6287 +#endif
1.6288 +char glVertex3f ();
1.6289 +int
1.6290 +main ()
1.6291 +{
1.6292 +return glVertex3f ();
1.6293 + ;
1.6294 + return 0;
1.6295 +}
1.6296 +_ACEOF
1.6297 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6298 +if { (ac_try="$ac_link"
1.6299 +case "(($ac_try" in
1.6300 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6301 + *) ac_try_echo=$ac_try;;
1.6302 +esac
1.6303 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6304 +$as_echo "$ac_try_echo") >&5
1.6305 + (eval "$ac_link") 2>conftest.er1
1.6306 + ac_status=$?
1.6307 + grep -v '^ *+' conftest.er1 >conftest.err
1.6308 + rm -f conftest.er1
1.6309 + cat conftest.err >&5
1.6310 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6311 + (exit $ac_status); } && {
1.6312 + test -z "$ac_c_werror_flag" ||
1.6313 + test ! -s conftest.err
1.6314 + } && test -s conftest$ac_exeext && {
1.6315 + test "$cross_compiling" = yes ||
1.6316 + $as_test_x conftest$ac_exeext
1.6317 + }; then
1.6318 + ac_cv_lib_GL_glVertex3f=yes
1.6319 +else
1.6320 + $as_echo "$as_me: failed program was:" >&5
1.6321 +sed 's/^/| /' conftest.$ac_ext >&5
1.6322 +
1.6323 + ac_cv_lib_GL_glVertex3f=no
1.6324 +fi
1.6325 +
1.6326 +rm -rf conftest.dSYM
1.6327 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6328 + conftest$ac_exeext conftest.$ac_ext
1.6329 +LIBS=$ac_check_lib_save_LIBS
1.6330 +fi
1.6331 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glVertex3f" >&5
1.6332 +$as_echo "$ac_cv_lib_GL_glVertex3f" >&6; }
1.6333 +if test $ac_cv_lib_GL_glVertex3f = yes; then
1.6334 + cat >>confdefs.h <<_ACEOF
1.6335 +#define HAVE_LIBGL 1
1.6336 +_ACEOF
1.6337 +
1.6338 + LIBS="-lGL $LIBS"
1.6339 +
1.6340 +else
1.6341 +
1.6342 + { { $as_echo "$as_me:$LINENO: error: \"The OpenGL library (libGL.so) could not be found, but is required.\"
1.6343 +See \`config.log' for more details." >&5
1.6344 +$as_echo "$as_me: error: \"The OpenGL library (libGL.so) could not be found, but is required.\"
1.6345 +See \`config.log' for more details." >&2;}
1.6346 + { (exit 1); exit 1; }; }
1.6347 +fi
1.6348 +
1.6349 + if test "${ac_cv_header_GL_gl_h+set}" = set; then
1.6350 + { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
1.6351 +$as_echo_n "checking for GL/gl.h... " >&6; }
1.6352 +if test "${ac_cv_header_GL_gl_h+set}" = set; then
1.6353 + $as_echo_n "(cached) " >&6
1.6354 +fi
1.6355 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
1.6356 +$as_echo "$ac_cv_header_GL_gl_h" >&6; }
1.6357 +else
1.6358 + # Is the header compilable?
1.6359 +{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
1.6360 +$as_echo_n "checking GL/gl.h usability... " >&6; }
1.6361 +cat >conftest.$ac_ext <<_ACEOF
1.6362 +/* confdefs.h. */
1.6363 +_ACEOF
1.6364 +cat confdefs.h >>conftest.$ac_ext
1.6365 +cat >>conftest.$ac_ext <<_ACEOF
1.6366 +/* end confdefs.h. */
1.6367 +$ac_includes_default
1.6368 +#include <GL/gl.h>
1.6369 +_ACEOF
1.6370 +rm -f conftest.$ac_objext
1.6371 +if { (ac_try="$ac_compile"
1.6372 +case "(($ac_try" in
1.6373 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6374 + *) ac_try_echo=$ac_try;;
1.6375 +esac
1.6376 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6377 +$as_echo "$ac_try_echo") >&5
1.6378 + (eval "$ac_compile") 2>conftest.er1
1.6379 + ac_status=$?
1.6380 + grep -v '^ *+' conftest.er1 >conftest.err
1.6381 + rm -f conftest.er1
1.6382 + cat conftest.err >&5
1.6383 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6384 + (exit $ac_status); } && {
1.6385 + test -z "$ac_c_werror_flag" ||
1.6386 + test ! -s conftest.err
1.6387 + } && test -s conftest.$ac_objext; then
1.6388 + ac_header_compiler=yes
1.6389 +else
1.6390 + $as_echo "$as_me: failed program was:" >&5
1.6391 +sed 's/^/| /' conftest.$ac_ext >&5
1.6392 +
1.6393 + ac_header_compiler=no
1.6394 +fi
1.6395 +
1.6396 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.6397 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.6398 +$as_echo "$ac_header_compiler" >&6; }
1.6399 +
1.6400 +# Is the header present?
1.6401 +{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
1.6402 +$as_echo_n "checking GL/gl.h presence... " >&6; }
1.6403 +cat >conftest.$ac_ext <<_ACEOF
1.6404 +/* confdefs.h. */
1.6405 +_ACEOF
1.6406 +cat confdefs.h >>conftest.$ac_ext
1.6407 +cat >>conftest.$ac_ext <<_ACEOF
1.6408 +/* end confdefs.h. */
1.6409 +#include <GL/gl.h>
1.6410 +_ACEOF
1.6411 +if { (ac_try="$ac_cpp conftest.$ac_ext"
1.6412 +case "(($ac_try" in
1.6413 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6414 + *) ac_try_echo=$ac_try;;
1.6415 +esac
1.6416 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6417 +$as_echo "$ac_try_echo") >&5
1.6418 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.6419 + ac_status=$?
1.6420 + grep -v '^ *+' conftest.er1 >conftest.err
1.6421 + rm -f conftest.er1
1.6422 + cat conftest.err >&5
1.6423 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6424 + (exit $ac_status); } >/dev/null && {
1.6425 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.6426 + test ! -s conftest.err
1.6427 + }; then
1.6428 + ac_header_preproc=yes
1.6429 +else
1.6430 + $as_echo "$as_me: failed program was:" >&5
1.6431 +sed 's/^/| /' conftest.$ac_ext >&5
1.6432 +
1.6433 + ac_header_preproc=no
1.6434 +fi
1.6435 +
1.6436 +rm -f conftest.err conftest.$ac_ext
1.6437 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.6438 +$as_echo "$ac_header_preproc" >&6; }
1.6439 +
1.6440 +# So? What about this header?
1.6441 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.6442 + yes:no: )
1.6443 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.6444 +$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.6445 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
1.6446 +$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
1.6447 + ac_header_preproc=yes
1.6448 + ;;
1.6449 + no:yes:* )
1.6450 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
1.6451 +$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
1.6452 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
1.6453 +$as_echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
1.6454 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5
1.6455 +$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
1.6456 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5
1.6457 +$as_echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.6458 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
1.6459 +$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
1.6460 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
1.6461 +$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
1.6462 +
1.6463 + ;;
1.6464 +esac
1.6465 +{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
1.6466 +$as_echo_n "checking for GL/gl.h... " >&6; }
1.6467 +if test "${ac_cv_header_GL_gl_h+set}" = set; then
1.6468 + $as_echo_n "(cached) " >&6
1.6469 +else
1.6470 + ac_cv_header_GL_gl_h=$ac_header_preproc
1.6471 +fi
1.6472 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
1.6473 +$as_echo "$ac_cv_header_GL_gl_h" >&6; }
1.6474 +
1.6475 +fi
1.6476 +if test $ac_cv_header_GL_gl_h = yes; then
1.6477 + :
1.6478 +else
1.6479 +
1.6480 + { { $as_echo "$as_me:$LINENO: error: \"The OpenGL header files (eg GL/gl.h) could not be found, but are required.\"
1.6481 +See \`config.log' for more details." >&5
1.6482 +$as_echo "$as_me: error: \"The OpenGL header files (eg GL/gl.h) could not be found, but are required.\"
1.6483 +See \`config.log' for more details." >&2;}
1.6484 + { (exit 1); exit 1; }; }
1.6485 +fi
1.6486 +
1.6487 +
1.6488 + fi
1.6489 +
1.6490 + if test "x$HAVE_GTK_X11" = "xyes"; then
1.6491 + if test "x$APPLE_BUILD" = "xyes"; then
1.6492 + LIBS="$LIBS -L/usr/X11/lib -lGL"
1.6493 + fi
1.6494 + { $as_echo "$as_me:$LINENO: checking for glXQueryVersion" >&5
1.6495 +$as_echo_n "checking for glXQueryVersion... " >&6; }
1.6496 +if test "${ac_cv_func_glXQueryVersion+set}" = set; then
1.6497 + $as_echo_n "(cached) " >&6
1.6498 +else
1.6499 + cat >conftest.$ac_ext <<_ACEOF
1.6500 +/* confdefs.h. */
1.6501 +_ACEOF
1.6502 +cat confdefs.h >>conftest.$ac_ext
1.6503 +cat >>conftest.$ac_ext <<_ACEOF
1.6504 +/* end confdefs.h. */
1.6505 +/* Define glXQueryVersion to an innocuous variant, in case <limits.h> declares glXQueryVersion.
1.6506 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.6507 +#define glXQueryVersion innocuous_glXQueryVersion
1.6508 +
1.6509 +/* System header to define __stub macros and hopefully few prototypes,
1.6510 + which can conflict with char glXQueryVersion (); below.
1.6511 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.6512 + <limits.h> exists even on freestanding compilers. */
1.6513 +
1.6514 +#ifdef __STDC__
1.6515 +# include <limits.h>
1.6516 +#else
1.6517 +# include <assert.h>
1.6518 +#endif
1.6519 +
1.6520 +#undef glXQueryVersion
1.6521 +
1.6522 +/* Override any GCC internal prototype to avoid an error.
1.6523 + Use char because int might match the return type of a GCC
1.6524 + builtin and then its argument prototype would still apply. */
1.6525 +#ifdef __cplusplus
1.6526 +extern "C"
1.6527 +#endif
1.6528 +char glXQueryVersion ();
1.6529 +/* The GNU C library defines this for functions which it implements
1.6530 + to always fail with ENOSYS. Some functions are actually named
1.6531 + something starting with __ and the normal name is an alias. */
1.6532 +#if defined __stub_glXQueryVersion || defined __stub___glXQueryVersion
1.6533 +choke me
1.6534 +#endif
1.6535 +
1.6536 +int
1.6537 +main ()
1.6538 +{
1.6539 +return glXQueryVersion ();
1.6540 + ;
1.6541 + return 0;
1.6542 +}
1.6543 +_ACEOF
1.6544 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6545 +if { (ac_try="$ac_link"
1.6546 +case "(($ac_try" in
1.6547 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6548 + *) ac_try_echo=$ac_try;;
1.6549 +esac
1.6550 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6551 +$as_echo "$ac_try_echo") >&5
1.6552 + (eval "$ac_link") 2>conftest.er1
1.6553 + ac_status=$?
1.6554 + grep -v '^ *+' conftest.er1 >conftest.err
1.6555 + rm -f conftest.er1
1.6556 + cat conftest.err >&5
1.6557 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6558 + (exit $ac_status); } && {
1.6559 + test -z "$ac_c_werror_flag" ||
1.6560 + test ! -s conftest.err
1.6561 + } && test -s conftest$ac_exeext && {
1.6562 + test "$cross_compiling" = yes ||
1.6563 + $as_test_x conftest$ac_exeext
1.6564 + }; then
1.6565 + ac_cv_func_glXQueryVersion=yes
1.6566 +else
1.6567 + $as_echo "$as_me: failed program was:" >&5
1.6568 +sed 's/^/| /' conftest.$ac_ext >&5
1.6569 +
1.6570 + ac_cv_func_glXQueryVersion=no
1.6571 +fi
1.6572 +
1.6573 +rm -rf conftest.dSYM
1.6574 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6575 + conftest$ac_exeext conftest.$ac_ext
1.6576 +fi
1.6577 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glXQueryVersion" >&5
1.6578 +$as_echo "$ac_cv_func_glXQueryVersion" >&6; }
1.6579 +if test $ac_cv_func_glXQueryVersion = yes; then
1.6580 +
1.6581 + HAVE_GLX='yes'
1.6582 +
1.6583 +cat >>confdefs.h <<\_ACEOF
1.6584 +#define HAVE_GLX 1
1.6585 +_ACEOF
1.6586 +
1.6587 +fi
1.6588 +
1.6589 + elif test "x$HAVE_GTK_OSX" = "xyes"; then
1.6590 + { $as_echo "$as_me:$LINENO: checking for NSOpenGLGetVersion" >&5
1.6591 +$as_echo_n "checking for NSOpenGLGetVersion... " >&6; }
1.6592 +if test "${ac_cv_func_NSOpenGLGetVersion+set}" = set; then
1.6593 + $as_echo_n "(cached) " >&6
1.6594 +else
1.6595 + cat >conftest.$ac_ext <<_ACEOF
1.6596 +/* confdefs.h. */
1.6597 +_ACEOF
1.6598 +cat confdefs.h >>conftest.$ac_ext
1.6599 +cat >>conftest.$ac_ext <<_ACEOF
1.6600 +/* end confdefs.h. */
1.6601 +/* Define NSOpenGLGetVersion to an innocuous variant, in case <limits.h> declares NSOpenGLGetVersion.
1.6602 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.6603 +#define NSOpenGLGetVersion innocuous_NSOpenGLGetVersion
1.6604 +
1.6605 +/* System header to define __stub macros and hopefully few prototypes,
1.6606 + which can conflict with char NSOpenGLGetVersion (); below.
1.6607 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.6608 + <limits.h> exists even on freestanding compilers. */
1.6609 +
1.6610 +#ifdef __STDC__
1.6611 +# include <limits.h>
1.6612 +#else
1.6613 +# include <assert.h>
1.6614 +#endif
1.6615 +
1.6616 +#undef NSOpenGLGetVersion
1.6617 +
1.6618 +/* Override any GCC internal prototype to avoid an error.
1.6619 + Use char because int might match the return type of a GCC
1.6620 + builtin and then its argument prototype would still apply. */
1.6621 +#ifdef __cplusplus
1.6622 +extern "C"
1.6623 +#endif
1.6624 +char NSOpenGLGetVersion ();
1.6625 +/* The GNU C library defines this for functions which it implements
1.6626 + to always fail with ENOSYS. Some functions are actually named
1.6627 + something starting with __ and the normal name is an alias. */
1.6628 +#if defined __stub_NSOpenGLGetVersion || defined __stub___NSOpenGLGetVersion
1.6629 +choke me
1.6630 +#endif
1.6631 +
1.6632 +int
1.6633 +main ()
1.6634 +{
1.6635 +return NSOpenGLGetVersion ();
1.6636 + ;
1.6637 + return 0;
1.6638 +}
1.6639 +_ACEOF
1.6640 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6641 +if { (ac_try="$ac_link"
1.6642 +case "(($ac_try" in
1.6643 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6644 + *) ac_try_echo=$ac_try;;
1.6645 +esac
1.6646 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6647 +$as_echo "$ac_try_echo") >&5
1.6648 + (eval "$ac_link") 2>conftest.er1
1.6649 + ac_status=$?
1.6650 + grep -v '^ *+' conftest.er1 >conftest.err
1.6651 + rm -f conftest.er1
1.6652 + cat conftest.err >&5
1.6653 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6654 + (exit $ac_status); } && {
1.6655 + test -z "$ac_c_werror_flag" ||
1.6656 + test ! -s conftest.err
1.6657 + } && test -s conftest$ac_exeext && {
1.6658 + test "$cross_compiling" = yes ||
1.6659 + $as_test_x conftest$ac_exeext
1.6660 + }; then
1.6661 + ac_cv_func_NSOpenGLGetVersion=yes
1.6662 +else
1.6663 + $as_echo "$as_me: failed program was:" >&5
1.6664 +sed 's/^/| /' conftest.$ac_ext >&5
1.6665 +
1.6666 + ac_cv_func_NSOpenGLGetVersion=no
1.6667 +fi
1.6668 +
1.6669 +rm -rf conftest.dSYM
1.6670 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6671 + conftest$ac_exeext conftest.$ac_ext
1.6672 +fi
1.6673 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_NSOpenGLGetVersion" >&5
1.6674 +$as_echo "$ac_cv_func_NSOpenGLGetVersion" >&6; }
1.6675 +if test $ac_cv_func_NSOpenGLGetVersion = yes; then
1.6676 +
1.6677 + HAVE_NSGL='yes'
1.6678 +
1.6679 +cat >>confdefs.h <<\_ACEOF
1.6680 +#define HAVE_NSGL 1
1.6681 +_ACEOF
1.6682 +
1.6683 +fi
1.6684 +
1.6685 + fi
1.6686 +
1.6687 +
1.6688 +fi
1.6689 +
1.6690 +
1.6691 +
1.6692 +if test "x$HAVE_OSMESA" = "x" -a "x$HAVE_GLX" = "x" -a "x$HAVE_NSGL" = "x"; then
1.6693 + echo "Warning: Building with no video support"
1.6694 +fi
1.6695 +
1.6696 +
1.6697 +
1.6698 +if test "x$HAVE_OSMESA" = "xyes"; then
1.6699 + VIDEO_OSMESA_TRUE=
1.6700 + VIDEO_OSMESA_FALSE='#'
1.6701 +else
1.6702 + VIDEO_OSMESA_TRUE='#'
1.6703 + VIDEO_OSMESA_FALSE=
1.6704 +fi
1.6705 +
1.6706 +
1.6707 +
1.6708 +if test "x$HAVE_GLX" = "xyes"; then
1.6709 + VIDEO_GLX_TRUE=
1.6710 + VIDEO_GLX_FALSE='#'
1.6711 +else
1.6712 + VIDEO_GLX_TRUE='#'
1.6713 + VIDEO_GLX_FALSE=
1.6714 +fi
1.6715 +
1.6716 +
1.6717 +
1.6718 +if test "x$HAVE_NSGL" = "xyes"; then
1.6719 + VIDEO_NSGL_TRUE=
1.6720 + VIDEO_NSGL_FALSE='#'
1.6721 +else
1.6722 + VIDEO_NSGL_TRUE='#'
1.6723 + VIDEO_NSGL_FALSE=
1.6724 +fi
1.6725 +
1.6726 +
1.6727 +{ $as_echo "$as_me:$LINENO: checking for glGenFramebuffersEXT" >&5
1.6728 +$as_echo_n "checking for glGenFramebuffersEXT... " >&6; }
1.6729 +if test "${ac_cv_func_glGenFramebuffersEXT+set}" = set; then
1.6730 + $as_echo_n "(cached) " >&6
1.6731 +else
1.6732 + cat >conftest.$ac_ext <<_ACEOF
1.6733 +/* confdefs.h. */
1.6734 +_ACEOF
1.6735 +cat confdefs.h >>conftest.$ac_ext
1.6736 +cat >>conftest.$ac_ext <<_ACEOF
1.6737 +/* end confdefs.h. */
1.6738 +/* Define glGenFramebuffersEXT to an innocuous variant, in case <limits.h> declares glGenFramebuffersEXT.
1.6739 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.6740 +#define glGenFramebuffersEXT innocuous_glGenFramebuffersEXT
1.6741 +
1.6742 +/* System header to define __stub macros and hopefully few prototypes,
1.6743 + which can conflict with char glGenFramebuffersEXT (); below.
1.6744 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.6745 + <limits.h> exists even on freestanding compilers. */
1.6746 +
1.6747 +#ifdef __STDC__
1.6748 +# include <limits.h>
1.6749 +#else
1.6750 +# include <assert.h>
1.6751 +#endif
1.6752 +
1.6753 +#undef glGenFramebuffersEXT
1.6754 +
1.6755 +/* Override any GCC internal prototype to avoid an error.
1.6756 + Use char because int might match the return type of a GCC
1.6757 + builtin and then its argument prototype would still apply. */
1.6758 +#ifdef __cplusplus
1.6759 +extern "C"
1.6760 +#endif
1.6761 +char glGenFramebuffersEXT ();
1.6762 +/* The GNU C library defines this for functions which it implements
1.6763 + to always fail with ENOSYS. Some functions are actually named
1.6764 + something starting with __ and the normal name is an alias. */
1.6765 +#if defined __stub_glGenFramebuffersEXT || defined __stub___glGenFramebuffersEXT
1.6766 +choke me
1.6767 +#endif
1.6768 +
1.6769 +int
1.6770 +main ()
1.6771 +{
1.6772 +return glGenFramebuffersEXT ();
1.6773 + ;
1.6774 + return 0;
1.6775 +}
1.6776 +_ACEOF
1.6777 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6778 +if { (ac_try="$ac_link"
1.6779 +case "(($ac_try" in
1.6780 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6781 + *) ac_try_echo=$ac_try;;
1.6782 +esac
1.6783 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6784 +$as_echo "$ac_try_echo") >&5
1.6785 + (eval "$ac_link") 2>conftest.er1
1.6786 + ac_status=$?
1.6787 + grep -v '^ *+' conftest.er1 >conftest.err
1.6788 + rm -f conftest.er1
1.6789 + cat conftest.err >&5
1.6790 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6791 + (exit $ac_status); } && {
1.6792 + test -z "$ac_c_werror_flag" ||
1.6793 + test ! -s conftest.err
1.6794 + } && test -s conftest$ac_exeext && {
1.6795 + test "$cross_compiling" = yes ||
1.6796 + $as_test_x conftest$ac_exeext
1.6797 + }; then
1.6798 + ac_cv_func_glGenFramebuffersEXT=yes
1.6799 +else
1.6800 + $as_echo "$as_me: failed program was:" >&5
1.6801 +sed 's/^/| /' conftest.$ac_ext >&5
1.6802 +
1.6803 + ac_cv_func_glGenFramebuffersEXT=no
1.6804 +fi
1.6805 +
1.6806 +rm -rf conftest.dSYM
1.6807 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6808 + conftest$ac_exeext conftest.$ac_ext
1.6809 +fi
1.6810 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glGenFramebuffersEXT" >&5
1.6811 +$as_echo "$ac_cv_func_glGenFramebuffersEXT" >&6; }
1.6812 +if test $ac_cv_func_glGenFramebuffersEXT = yes; then
1.6813 +
1.6814 +cat >>confdefs.h <<\_ACEOF
1.6815 +#define HAVE_OPENGL_FBO 1
1.6816 +_ACEOF
1.6817 +
1.6818 +fi
1.6819 +
1.6820 +{ $as_echo "$as_me:$LINENO: checking for glCreateShader" >&5
1.6821 +$as_echo_n "checking for glCreateShader... " >&6; }
1.6822 +if test "${ac_cv_func_glCreateShader+set}" = set; then
1.6823 + $as_echo_n "(cached) " >&6
1.6824 +else
1.6825 + cat >conftest.$ac_ext <<_ACEOF
1.6826 +/* confdefs.h. */
1.6827 +_ACEOF
1.6828 +cat confdefs.h >>conftest.$ac_ext
1.6829 +cat >>conftest.$ac_ext <<_ACEOF
1.6830 +/* end confdefs.h. */
1.6831 +/* Define glCreateShader to an innocuous variant, in case <limits.h> declares glCreateShader.
1.6832 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.6833 +#define glCreateShader innocuous_glCreateShader
1.6834 +
1.6835 +/* System header to define __stub macros and hopefully few prototypes,
1.6836 + which can conflict with char glCreateShader (); below.
1.6837 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.6838 + <limits.h> exists even on freestanding compilers. */
1.6839 +
1.6840 +#ifdef __STDC__
1.6841 +# include <limits.h>
1.6842 +#else
1.6843 +# include <assert.h>
1.6844 +#endif
1.6845 +
1.6846 +#undef glCreateShader
1.6847 +
1.6848 +/* Override any GCC internal prototype to avoid an error.
1.6849 + Use char because int might match the return type of a GCC
1.6850 + builtin and then its argument prototype would still apply. */
1.6851 +#ifdef __cplusplus
1.6852 +extern "C"
1.6853 +#endif
1.6854 +char glCreateShader ();
1.6855 +/* The GNU C library defines this for functions which it implements
1.6856 + to always fail with ENOSYS. Some functions are actually named
1.6857 + something starting with __ and the normal name is an alias. */
1.6858 +#if defined __stub_glCreateShader || defined __stub___glCreateShader
1.6859 +choke me
1.6860 +#endif
1.6861 +
1.6862 +int
1.6863 +main ()
1.6864 +{
1.6865 +return glCreateShader ();
1.6866 + ;
1.6867 + return 0;
1.6868 +}
1.6869 +_ACEOF
1.6870 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6871 +if { (ac_try="$ac_link"
1.6872 +case "(($ac_try" in
1.6873 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6874 + *) ac_try_echo=$ac_try;;
1.6875 +esac
1.6876 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6877 +$as_echo "$ac_try_echo") >&5
1.6878 + (eval "$ac_link") 2>conftest.er1
1.6879 + ac_status=$?
1.6880 + grep -v '^ *+' conftest.er1 >conftest.err
1.6881 + rm -f conftest.er1
1.6882 + cat conftest.err >&5
1.6883 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6884 + (exit $ac_status); } && {
1.6885 + test -z "$ac_c_werror_flag" ||
1.6886 + test ! -s conftest.err
1.6887 + } && test -s conftest$ac_exeext && {
1.6888 + test "$cross_compiling" = yes ||
1.6889 + $as_test_x conftest$ac_exeext
1.6890 + }; then
1.6891 + ac_cv_func_glCreateShader=yes
1.6892 +else
1.6893 + $as_echo "$as_me: failed program was:" >&5
1.6894 +sed 's/^/| /' conftest.$ac_ext >&5
1.6895 +
1.6896 + ac_cv_func_glCreateShader=no
1.6897 +fi
1.6898 +
1.6899 +rm -rf conftest.dSYM
1.6900 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6901 + conftest$ac_exeext conftest.$ac_ext
1.6902 +fi
1.6903 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShader" >&5
1.6904 +$as_echo "$ac_cv_func_glCreateShader" >&6; }
1.6905 +if test $ac_cv_func_glCreateShader = yes; then
1.6906 +
1.6907 +cat >>confdefs.h <<\_ACEOF
1.6908 +#define HAVE_OPENGL_SHADER 1
1.6909 +_ACEOF
1.6910 +
1.6911 +fi
1.6912 +
1.6913 +{ $as_echo "$as_me:$LINENO: checking for glCreateShaderObjectARB" >&5
1.6914 +$as_echo_n "checking for glCreateShaderObjectARB... " >&6; }
1.6915 +if test "${ac_cv_func_glCreateShaderObjectARB+set}" = set; then
1.6916 + $as_echo_n "(cached) " >&6
1.6917 +else
1.6918 + cat >conftest.$ac_ext <<_ACEOF
1.6919 +/* confdefs.h. */
1.6920 +_ACEOF
1.6921 +cat confdefs.h >>conftest.$ac_ext
1.6922 +cat >>conftest.$ac_ext <<_ACEOF
1.6923 +/* end confdefs.h. */
1.6924 +/* Define glCreateShaderObjectARB to an innocuous variant, in case <limits.h> declares glCreateShaderObjectARB.
1.6925 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
1.6926 +#define glCreateShaderObjectARB innocuous_glCreateShaderObjectARB
1.6927 +
1.6928 +/* System header to define __stub macros and hopefully few prototypes,
1.6929 + which can conflict with char glCreateShaderObjectARB (); below.
1.6930 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.6931 + <limits.h> exists even on freestanding compilers. */
1.6932 +
1.6933 +#ifdef __STDC__
1.6934 +# include <limits.h>
1.6935 +#else
1.6936 +# include <assert.h>
1.6937 +#endif
1.6938 +
1.6939 +#undef glCreateShaderObjectARB
1.6940 +
1.6941 +/* Override any GCC internal prototype to avoid an error.
1.6942 + Use char because int might match the return type of a GCC
1.6943 + builtin and then its argument prototype would still apply. */
1.6944 +#ifdef __cplusplus
1.6945 +extern "C"
1.6946 +#endif
1.6947 +char glCreateShaderObjectARB ();
1.6948 +/* The GNU C library defines this for functions which it implements
1.6949 + to always fail with ENOSYS. Some functions are actually named
1.6950 + something starting with __ and the normal name is an alias. */
1.6951 +#if defined __stub_glCreateShaderObjectARB || defined __stub___glCreateShaderObjectARB
1.6952 +choke me
1.6953 +#endif
1.6954 +
1.6955 +int
1.6956 +main ()
1.6957 +{
1.6958 +return glCreateShaderObjectARB ();
1.6959 + ;
1.6960 + return 0;
1.6961 +}
1.6962 +_ACEOF
1.6963 +rm -f conftest.$ac_objext conftest$ac_exeext
1.6964 +if { (ac_try="$ac_link"
1.6965 +case "(($ac_try" in
1.6966 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.6967 + *) ac_try_echo=$ac_try;;
1.6968 +esac
1.6969 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.6970 +$as_echo "$ac_try_echo") >&5
1.6971 + (eval "$ac_link") 2>conftest.er1
1.6972 + ac_status=$?
1.6973 + grep -v '^ *+' conftest.er1 >conftest.err
1.6974 + rm -f conftest.er1
1.6975 + cat conftest.err >&5
1.6976 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.6977 + (exit $ac_status); } && {
1.6978 + test -z "$ac_c_werror_flag" ||
1.6979 + test ! -s conftest.err
1.6980 + } && test -s conftest$ac_exeext && {
1.6981 + test "$cross_compiling" = yes ||
1.6982 + $as_test_x conftest$ac_exeext
1.6983 + }; then
1.6984 + ac_cv_func_glCreateShaderObjectARB=yes
1.6985 +else
1.6986 + $as_echo "$as_me: failed program was:" >&5
1.6987 +sed 's/^/| /' conftest.$ac_ext >&5
1.6988 +
1.6989 + ac_cv_func_glCreateShaderObjectARB=no
1.6990 +fi
1.6991 +
1.6992 +rm -rf conftest.dSYM
1.6993 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.6994 + conftest$ac_exeext conftest.$ac_ext
1.6995 +fi
1.6996 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShaderObjectARB" >&5
1.6997 +$as_echo "$ac_cv_func_glCreateShaderObjectARB" >&6; }
1.6998 +if test $ac_cv_func_glCreateShaderObjectARB = yes; then
1.6999 +
1.7000 +cat >>confdefs.h <<\_ACEOF
1.7001 +#define HAVE_OPENGL_SHADER_ARB 1
1.7002 +_ACEOF
1.7003 +
1.7004 +fi
1.7005 +
1.7006 +
1.7007 +
1.7008 case $host_cpu in
1.7009 i386|i486|i586|i686)
1.7010 SH4_TRANSLATOR="x86"
1.7011 @@ -6431,18 +7751,18 @@
1.7012
1.7013
1.7014 pkg_failed=no
1.7015 -{ echo "$as_me:$LINENO: checking for PULSE" >&5
1.7016 -echo $ECHO_N "checking for PULSE... $ECHO_C" >&6; }
1.7017 +{ $as_echo "$as_me:$LINENO: checking for PULSE" >&5
1.7018 +$as_echo_n "checking for PULSE... " >&6; }
1.7019
1.7020 if test -n "$PKG_CONFIG"; then
1.7021 if test -n "$PULSE_CFLAGS"; then
1.7022 pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
1.7023 else
1.7024 if test -n "$PKG_CONFIG" && \
1.7025 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&5
1.7026 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&5
1.7027 ($PKG_CONFIG --exists --print-errors "libpulse-simple") 2>&5
1.7028 ac_status=$?
1.7029 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7030 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7031 (exit $ac_status); }; then
1.7032 pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse-simple" 2>/dev/null`
1.7033 else
1.7034 @@ -6457,10 +7777,10 @@
1.7035 pkg_cv_PULSE_LIBS="$PULSE_LIBS"
1.7036 else
1.7037 if test -n "$PKG_CONFIG" && \
1.7038 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&5
1.7039 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&5
1.7040 ($PKG_CONFIG --exists --print-errors "libpulse-simple") 2>&5
1.7041 ac_status=$?
1.7042 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7043 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7044 (exit $ac_status); }; then
1.7045 pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse-simple" 2>/dev/null`
1.7046 else
1.7047 @@ -6488,16 +7808,16 @@
1.7048 # Put the nasty error message in config.log where it belongs
1.7049 echo "$PULSE_PKG_ERRORS" >&5
1.7050
1.7051 - { echo "$as_me:$LINENO: result: no" >&5
1.7052 -echo "${ECHO_T}no" >&6; }
1.7053 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7054 +$as_echo "no" >&6; }
1.7055 true
1.7056 elif test $pkg_failed = untried; then
1.7057 true
1.7058 else
1.7059 PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
1.7060 PULSE_LIBS=$pkg_cv_PULSE_LIBS
1.7061 - { echo "$as_me:$LINENO: result: yes" >&5
1.7062 -echo "${ECHO_T}yes" >&6; }
1.7063 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.7064 +$as_echo "yes" >&6; }
1.7065
1.7066 HAVE_PULSE='yes'
1.7067
1.7068 @@ -6519,18 +7839,18 @@
1.7069
1.7070
1.7071 pkg_failed=no
1.7072 -{ echo "$as_me:$LINENO: checking for ESOUND" >&5
1.7073 -echo $ECHO_N "checking for ESOUND... $ECHO_C" >&6; }
1.7074 +{ $as_echo "$as_me:$LINENO: checking for ESOUND" >&5
1.7075 +$as_echo_n "checking for ESOUND... " >&6; }
1.7076
1.7077 if test -n "$PKG_CONFIG"; then
1.7078 if test -n "$ESOUND_CFLAGS"; then
1.7079 pkg_cv_ESOUND_CFLAGS="$ESOUND_CFLAGS"
1.7080 else
1.7081 if test -n "$PKG_CONFIG" && \
1.7082 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&5
1.7083 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&5
1.7084 ($PKG_CONFIG --exists --print-errors "esound") 2>&5
1.7085 ac_status=$?
1.7086 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7087 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7088 (exit $ac_status); }; then
1.7089 pkg_cv_ESOUND_CFLAGS=`$PKG_CONFIG --cflags "esound" 2>/dev/null`
1.7090 else
1.7091 @@ -6545,10 +7865,10 @@
1.7092 pkg_cv_ESOUND_LIBS="$ESOUND_LIBS"
1.7093 else
1.7094 if test -n "$PKG_CONFIG" && \
1.7095 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&5
1.7096 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&5
1.7097 ($PKG_CONFIG --exists --print-errors "esound") 2>&5
1.7098 ac_status=$?
1.7099 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7100 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7101 (exit $ac_status); }; then
1.7102 pkg_cv_ESOUND_LIBS=`$PKG_CONFIG --libs "esound" 2>/dev/null`
1.7103 else
1.7104 @@ -6576,16 +7896,16 @@
1.7105 # Put the nasty error message in config.log where it belongs
1.7106 echo "$ESOUND_PKG_ERRORS" >&5
1.7107
1.7108 - { echo "$as_me:$LINENO: result: no" >&5
1.7109 -echo "${ECHO_T}no" >&6; }
1.7110 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7111 +$as_echo "no" >&6; }
1.7112 true
1.7113 elif test $pkg_failed = untried; then
1.7114 true
1.7115 else
1.7116 ESOUND_CFLAGS=$pkg_cv_ESOUND_CFLAGS
1.7117 ESOUND_LIBS=$pkg_cv_ESOUND_LIBS
1.7118 - { echo "$as_me:$LINENO: result: yes" >&5
1.7119 -echo "${ECHO_T}yes" >&6; }
1.7120 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.7121 +$as_echo "yes" >&6; }
1.7122
1.7123 HAVE_ESOUND='yes'
1.7124
1.7125 @@ -6607,18 +7927,18 @@
1.7126
1.7127
1.7128 pkg_failed=no
1.7129 -{ echo "$as_me:$LINENO: checking for ALSA" >&5
1.7130 -echo $ECHO_N "checking for ALSA... $ECHO_C" >&6; }
1.7131 +{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5
1.7132 +$as_echo_n "checking for ALSA... " >&6; }
1.7133
1.7134 if test -n "$PKG_CONFIG"; then
1.7135 if test -n "$ALSA_CFLAGS"; then
1.7136 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
1.7137 else
1.7138 if test -n "$PKG_CONFIG" && \
1.7139 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
1.7140 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
1.7141 ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
1.7142 ac_status=$?
1.7143 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7144 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7145 (exit $ac_status); }; then
1.7146 pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
1.7147 else
1.7148 @@ -6633,10 +7953,10 @@
1.7149 pkg_cv_ALSA_LIBS="$ALSA_LIBS"
1.7150 else
1.7151 if test -n "$PKG_CONFIG" && \
1.7152 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
1.7153 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&5
1.7154 ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
1.7155 ac_status=$?
1.7156 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7157 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7158 (exit $ac_status); }; then
1.7159 pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
1.7160 else
1.7161 @@ -6664,16 +7984,16 @@
1.7162 # Put the nasty error message in config.log where it belongs
1.7163 echo "$ALSA_PKG_ERRORS" >&5
1.7164
1.7165 - { echo "$as_me:$LINENO: result: no" >&5
1.7166 -echo "${ECHO_T}no" >&6; }
1.7167 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7168 +$as_echo "no" >&6; }
1.7169 true
1.7170 elif test $pkg_failed = untried; then
1.7171 true
1.7172 else
1.7173 ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
1.7174 ALSA_LIBS=$pkg_cv_ALSA_LIBS
1.7175 - { echo "$as_me:$LINENO: result: yes" >&5
1.7176 -echo "${ECHO_T}yes" >&6; }
1.7177 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1.7178 +$as_echo "yes" >&6; }
1.7179
1.7180 HAVE_ALSA='yes'
1.7181
1.7182 @@ -6698,17 +8018,17 @@
1.7183 fi
1.7184
1.7185 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.7186 - { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
1.7187 -echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
1.7188 + { $as_echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
1.7189 +$as_echo_n "checking for linux/cdrom.h... " >&6; }
1.7190 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.7191 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7192 -fi
1.7193 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
1.7194 -echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }
1.7195 + $as_echo_n "(cached) " >&6
1.7196 +fi
1.7197 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
1.7198 +$as_echo "$ac_cv_header_linux_cdrom_h" >&6; }
1.7199 else
1.7200 # Is the header compilable?
1.7201 -{ echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5
1.7202 -echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6; }
1.7203 +{ $as_echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5
1.7204 +$as_echo_n "checking linux/cdrom.h usability... " >&6; }
1.7205 cat >conftest.$ac_ext <<_ACEOF
1.7206 /* confdefs.h. */
1.7207 _ACEOF
1.7208 @@ -6724,32 +8044,33 @@
1.7209 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7210 *) ac_try_echo=$ac_try;;
1.7211 esac
1.7212 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7213 - (eval "$ac_compile") 2>conftest.er1
1.7214 - ac_status=$?
1.7215 - grep -v '^ *+' conftest.er1 >conftest.err
1.7216 - rm -f conftest.er1
1.7217 - cat conftest.err >&5
1.7218 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7219 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7220 +$as_echo "$ac_try_echo") >&5
1.7221 + (eval "$ac_compile") 2>conftest.er1
1.7222 + ac_status=$?
1.7223 + grep -v '^ *+' conftest.er1 >conftest.err
1.7224 + rm -f conftest.er1
1.7225 + cat conftest.err >&5
1.7226 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7227 (exit $ac_status); } && {
1.7228 test -z "$ac_c_werror_flag" ||
1.7229 test ! -s conftest.err
1.7230 } && test -s conftest.$ac_objext; then
1.7231 ac_header_compiler=yes
1.7232 else
1.7233 - echo "$as_me: failed program was:" >&5
1.7234 + $as_echo "$as_me: failed program was:" >&5
1.7235 sed 's/^/| /' conftest.$ac_ext >&5
1.7236
1.7237 ac_header_compiler=no
1.7238 fi
1.7239
1.7240 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.7241 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.7242 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.7243 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.7244 +$as_echo "$ac_header_compiler" >&6; }
1.7245
1.7246 # Is the header present?
1.7247 -{ echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5
1.7248 -echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6; }
1.7249 +{ $as_echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5
1.7250 +$as_echo_n "checking linux/cdrom.h presence... " >&6; }
1.7251 cat >conftest.$ac_ext <<_ACEOF
1.7252 /* confdefs.h. */
1.7253 _ACEOF
1.7254 @@ -6763,63 +8084,64 @@
1.7255 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7256 *) ac_try_echo=$ac_try;;
1.7257 esac
1.7258 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7259 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7260 +$as_echo "$ac_try_echo") >&5
1.7261 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.7262 ac_status=$?
1.7263 grep -v '^ *+' conftest.er1 >conftest.err
1.7264 rm -f conftest.er1
1.7265 cat conftest.err >&5
1.7266 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7267 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7268 (exit $ac_status); } >/dev/null && {
1.7269 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.7270 test ! -s conftest.err
1.7271 }; then
1.7272 ac_header_preproc=yes
1.7273 else
1.7274 - echo "$as_me: failed program was:" >&5
1.7275 + $as_echo "$as_me: failed program was:" >&5
1.7276 sed 's/^/| /' conftest.$ac_ext >&5
1.7277
1.7278 ac_header_preproc=no
1.7279 fi
1.7280
1.7281 rm -f conftest.err conftest.$ac_ext
1.7282 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.7283 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.7284 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.7285 +$as_echo "$ac_header_preproc" >&6; }
1.7286
1.7287 # So? What about this header?
1.7288 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.7289 yes:no: )
1.7290 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.7291 -echo "$as_me: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.7292 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&5
1.7293 -echo "$as_me: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&2;}
1.7294 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.7295 +$as_echo "$as_me: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.7296 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&5
1.7297 +$as_echo "$as_me: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&2;}
1.7298 ac_header_preproc=yes
1.7299 ;;
1.7300 no:yes:* )
1.7301 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: present but cannot be compiled" >&5
1.7302 -echo "$as_me: WARNING: linux/cdrom.h: present but cannot be compiled" >&2;}
1.7303 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&5
1.7304 -echo "$as_me: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&2;}
1.7305 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: see the Autoconf documentation" >&5
1.7306 -echo "$as_me: WARNING: linux/cdrom.h: see the Autoconf documentation" >&2;}
1.7307 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&5
1.7308 -echo "$as_me: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.7309 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&5
1.7310 -echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
1.7311 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
1.7312 -echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
1.7313 -
1.7314 - ;;
1.7315 -esac
1.7316 -{ echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
1.7317 -echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
1.7318 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: present but cannot be compiled" >&5
1.7319 +$as_echo "$as_me: WARNING: linux/cdrom.h: present but cannot be compiled" >&2;}
1.7320 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&5
1.7321 +$as_echo "$as_me: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&2;}
1.7322 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: see the Autoconf documentation" >&5
1.7323 +$as_echo "$as_me: WARNING: linux/cdrom.h: see the Autoconf documentation" >&2;}
1.7324 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&5
1.7325 +$as_echo "$as_me: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.7326 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&5
1.7327 +$as_echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
1.7328 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
1.7329 +$as_echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
1.7330 +
1.7331 + ;;
1.7332 +esac
1.7333 +{ $as_echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
1.7334 +$as_echo_n "checking for linux/cdrom.h... " >&6; }
1.7335 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.7336 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7337 + $as_echo_n "(cached) " >&6
1.7338 else
1.7339 ac_cv_header_linux_cdrom_h=$ac_header_preproc
1.7340 fi
1.7341 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
1.7342 -echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }
1.7343 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
1.7344 +$as_echo "$ac_cv_header_linux_cdrom_h" >&6; }
1.7345
1.7346 fi
1.7347 if test $ac_cv_header_linux_cdrom_h = yes; then
1.7348 @@ -6841,19 +8163,18 @@
1.7349 fi
1.7350
1.7351
1.7352 -
1.7353 if test "${ac_cv_header_linux_joystick_h+set}" = set; then
1.7354 - { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
1.7355 -echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
1.7356 + { $as_echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
1.7357 +$as_echo_n "checking for linux/joystick.h... " >&6; }
1.7358 if test "${ac_cv_header_linux_joystick_h+set}" = set; then
1.7359 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7360 -fi
1.7361 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
1.7362 -echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
1.7363 + $as_echo_n "(cached) " >&6
1.7364 +fi
1.7365 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
1.7366 +$as_echo "$ac_cv_header_linux_joystick_h" >&6; }
1.7367 else
1.7368 # Is the header compilable?
1.7369 -{ echo "$as_me:$LINENO: checking linux/joystick.h usability" >&5
1.7370 -echo $ECHO_N "checking linux/joystick.h usability... $ECHO_C" >&6; }
1.7371 +{ $as_echo "$as_me:$LINENO: checking linux/joystick.h usability" >&5
1.7372 +$as_echo_n "checking linux/joystick.h usability... " >&6; }
1.7373 cat >conftest.$ac_ext <<_ACEOF
1.7374 /* confdefs.h. */
1.7375 _ACEOF
1.7376 @@ -6869,32 +8190,33 @@
1.7377 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7378 *) ac_try_echo=$ac_try;;
1.7379 esac
1.7380 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7381 - (eval "$ac_compile") 2>conftest.er1
1.7382 - ac_status=$?
1.7383 - grep -v '^ *+' conftest.er1 >conftest.err
1.7384 - rm -f conftest.er1
1.7385 - cat conftest.err >&5
1.7386 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7387 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7388 +$as_echo "$ac_try_echo") >&5
1.7389 + (eval "$ac_compile") 2>conftest.er1
1.7390 + ac_status=$?
1.7391 + grep -v '^ *+' conftest.er1 >conftest.err
1.7392 + rm -f conftest.er1
1.7393 + cat conftest.err >&5
1.7394 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7395 (exit $ac_status); } && {
1.7396 test -z "$ac_c_werror_flag" ||
1.7397 test ! -s conftest.err
1.7398 } && test -s conftest.$ac_objext; then
1.7399 ac_header_compiler=yes
1.7400 else
1.7401 - echo "$as_me: failed program was:" >&5
1.7402 + $as_echo "$as_me: failed program was:" >&5
1.7403 sed 's/^/| /' conftest.$ac_ext >&5
1.7404
1.7405 ac_header_compiler=no
1.7406 fi
1.7407
1.7408 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.7409 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.7410 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.7411 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.7412 +$as_echo "$ac_header_compiler" >&6; }
1.7413
1.7414 # Is the header present?
1.7415 -{ echo "$as_me:$LINENO: checking linux/joystick.h presence" >&5
1.7416 -echo $ECHO_N "checking linux/joystick.h presence... $ECHO_C" >&6; }
1.7417 +{ $as_echo "$as_me:$LINENO: checking linux/joystick.h presence" >&5
1.7418 +$as_echo_n "checking linux/joystick.h presence... " >&6; }
1.7419 cat >conftest.$ac_ext <<_ACEOF
1.7420 /* confdefs.h. */
1.7421 _ACEOF
1.7422 @@ -6908,63 +8230,64 @@
1.7423 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7424 *) ac_try_echo=$ac_try;;
1.7425 esac
1.7426 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7427 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7428 +$as_echo "$ac_try_echo") >&5
1.7429 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.7430 ac_status=$?
1.7431 grep -v '^ *+' conftest.er1 >conftest.err
1.7432 rm -f conftest.er1
1.7433 cat conftest.err >&5
1.7434 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7435 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7436 (exit $ac_status); } >/dev/null && {
1.7437 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.7438 test ! -s conftest.err
1.7439 }; then
1.7440 ac_header_preproc=yes
1.7441 else
1.7442 - echo "$as_me: failed program was:" >&5
1.7443 + $as_echo "$as_me: failed program was:" >&5
1.7444 sed 's/^/| /' conftest.$ac_ext >&5
1.7445
1.7446 ac_header_preproc=no
1.7447 fi
1.7448
1.7449 rm -f conftest.err conftest.$ac_ext
1.7450 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.7451 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.7452 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.7453 +$as_echo "$ac_header_preproc" >&6; }
1.7454
1.7455 # So? What about this header?
1.7456 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.7457 yes:no: )
1.7458 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.7459 -echo "$as_me: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.7460 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the compiler's result" >&5
1.7461 -echo "$as_me: WARNING: linux/joystick.h: proceeding with the compiler's result" >&2;}
1.7462 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.7463 +$as_echo "$as_me: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.7464 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the compiler's result" >&5
1.7465 +$as_echo "$as_me: WARNING: linux/joystick.h: proceeding with the compiler's result" >&2;}
1.7466 ac_header_preproc=yes
1.7467 ;;
1.7468 no:yes:* )
1.7469 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: present but cannot be compiled" >&5
1.7470 -echo "$as_me: WARNING: linux/joystick.h: present but cannot be compiled" >&2;}
1.7471 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&5
1.7472 -echo "$as_me: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&2;}
1.7473 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: see the Autoconf documentation" >&5
1.7474 -echo "$as_me: WARNING: linux/joystick.h: see the Autoconf documentation" >&2;}
1.7475 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&5
1.7476 -echo "$as_me: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.7477 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&5
1.7478 -echo "$as_me: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&2;}
1.7479 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&5
1.7480 -echo "$as_me: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&2;}
1.7481 -
1.7482 - ;;
1.7483 -esac
1.7484 -{ echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
1.7485 -echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
1.7486 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: present but cannot be compiled" >&5
1.7487 +$as_echo "$as_me: WARNING: linux/joystick.h: present but cannot be compiled" >&2;}
1.7488 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&5
1.7489 +$as_echo "$as_me: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&2;}
1.7490 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: see the Autoconf documentation" >&5
1.7491 +$as_echo "$as_me: WARNING: linux/joystick.h: see the Autoconf documentation" >&2;}
1.7492 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&5
1.7493 +$as_echo "$as_me: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.7494 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&5
1.7495 +$as_echo "$as_me: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&2;}
1.7496 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&5
1.7497 +$as_echo "$as_me: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&2;}
1.7498 +
1.7499 + ;;
1.7500 +esac
1.7501 +{ $as_echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
1.7502 +$as_echo_n "checking for linux/joystick.h... " >&6; }
1.7503 if test "${ac_cv_header_linux_joystick_h+set}" = set; then
1.7504 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7505 + $as_echo_n "(cached) " >&6
1.7506 else
1.7507 ac_cv_header_linux_joystick_h=$ac_header_preproc
1.7508 fi
1.7509 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
1.7510 -echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
1.7511 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
1.7512 +$as_echo "$ac_cv_header_linux_joystick_h" >&6; }
1.7513
1.7514 fi
1.7515 if test $ac_cv_header_linux_joystick_h = yes; then
1.7516 @@ -6993,10 +8316,10 @@
1.7517
1.7518 # Extract the first word of "sh-elf-gcc", so it can be a program name with args.
1.7519 set dummy sh-elf-gcc; ac_word=$2
1.7520 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7521 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.7522 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7523 +$as_echo_n "checking for $ac_word... " >&6; }
1.7524 if test "${ac_cv_path_SHCC+set}" = set; then
1.7525 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7526 + $as_echo_n "(cached) " >&6
1.7527 else
1.7528 case $SHCC in
1.7529 [\\/]* | ?:[\\/]*)
1.7530 @@ -7011,7 +8334,7 @@
1.7531 for ac_exec_ext in '' $ac_executable_extensions; do
1.7532 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.7533 ac_cv_path_SHCC="$as_dir/$ac_word$ac_exec_ext"
1.7534 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7535 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7536 break 2
1.7537 fi
1.7538 done
1.7539 @@ -7023,20 +8346,20 @@
1.7540 fi
1.7541 SHCC=$ac_cv_path_SHCC
1.7542 if test -n "$SHCC"; then
1.7543 - { echo "$as_me:$LINENO: result: $SHCC" >&5
1.7544 -echo "${ECHO_T}$SHCC" >&6; }
1.7545 -else
1.7546 - { echo "$as_me:$LINENO: result: no" >&5
1.7547 -echo "${ECHO_T}no" >&6; }
1.7548 + { $as_echo "$as_me:$LINENO: result: $SHCC" >&5
1.7549 +$as_echo "$SHCC" >&6; }
1.7550 +else
1.7551 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7552 +$as_echo "no" >&6; }
1.7553 fi
1.7554
1.7555
1.7556 # Extract the first word of "sh-elf-ld", so it can be a program name with args.
1.7557 set dummy sh-elf-ld; ac_word=$2
1.7558 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7559 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.7560 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7561 +$as_echo_n "checking for $ac_word... " >&6; }
1.7562 if test "${ac_cv_path_SHLD+set}" = set; then
1.7563 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7564 + $as_echo_n "(cached) " >&6
1.7565 else
1.7566 case $SHLD in
1.7567 [\\/]* | ?:[\\/]*)
1.7568 @@ -7051,7 +8374,7 @@
1.7569 for ac_exec_ext in '' $ac_executable_extensions; do
1.7570 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.7571 ac_cv_path_SHLD="$as_dir/$ac_word$ac_exec_ext"
1.7572 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7573 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7574 break 2
1.7575 fi
1.7576 done
1.7577 @@ -7063,20 +8386,20 @@
1.7578 fi
1.7579 SHLD=$ac_cv_path_SHLD
1.7580 if test -n "$SHLD"; then
1.7581 - { echo "$as_me:$LINENO: result: $SHLD" >&5
1.7582 -echo "${ECHO_T}$SHLD" >&6; }
1.7583 -else
1.7584 - { echo "$as_me:$LINENO: result: no" >&5
1.7585 -echo "${ECHO_T}no" >&6; }
1.7586 + { $as_echo "$as_me:$LINENO: result: $SHLD" >&5
1.7587 +$as_echo "$SHLD" >&6; }
1.7588 +else
1.7589 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7590 +$as_echo "no" >&6; }
1.7591 fi
1.7592
1.7593
1.7594 # Extract the first word of "sh-elf-objcopy", so it can be a program name with args.
1.7595 set dummy sh-elf-objcopy; ac_word=$2
1.7596 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7597 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.7598 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7599 +$as_echo_n "checking for $ac_word... " >&6; }
1.7600 if test "${ac_cv_path_SHOBJCOPY+set}" = set; then
1.7601 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7602 + $as_echo_n "(cached) " >&6
1.7603 else
1.7604 case $SHOBJCOPY in
1.7605 [\\/]* | ?:[\\/]*)
1.7606 @@ -7091,7 +8414,7 @@
1.7607 for ac_exec_ext in '' $ac_executable_extensions; do
1.7608 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.7609 ac_cv_path_SHOBJCOPY="$as_dir/$ac_word$ac_exec_ext"
1.7610 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7611 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7612 break 2
1.7613 fi
1.7614 done
1.7615 @@ -7103,20 +8426,20 @@
1.7616 fi
1.7617 SHOBJCOPY=$ac_cv_path_SHOBJCOPY
1.7618 if test -n "$SHOBJCOPY"; then
1.7619 - { echo "$as_me:$LINENO: result: $SHOBJCOPY" >&5
1.7620 -echo "${ECHO_T}$SHOBJCOPY" >&6; }
1.7621 -else
1.7622 - { echo "$as_me:$LINENO: result: no" >&5
1.7623 -echo "${ECHO_T}no" >&6; }
1.7624 + { $as_echo "$as_me:$LINENO: result: $SHOBJCOPY" >&5
1.7625 +$as_echo "$SHOBJCOPY" >&6; }
1.7626 +else
1.7627 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7628 +$as_echo "no" >&6; }
1.7629 fi
1.7630
1.7631
1.7632 # Extract the first word of "arm-elf-gcc", so it can be a program name with args.
1.7633 set dummy arm-elf-gcc; ac_word=$2
1.7634 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7635 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.7636 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7637 +$as_echo_n "checking for $ac_word... " >&6; }
1.7638 if test "${ac_cv_path_ARMCC+set}" = set; then
1.7639 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7640 + $as_echo_n "(cached) " >&6
1.7641 else
1.7642 case $ARMCC in
1.7643 [\\/]* | ?:[\\/]*)
1.7644 @@ -7131,7 +8454,7 @@
1.7645 for ac_exec_ext in '' $ac_executable_extensions; do
1.7646 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.7647 ac_cv_path_ARMCC="$as_dir/$ac_word$ac_exec_ext"
1.7648 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7649 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7650 break 2
1.7651 fi
1.7652 done
1.7653 @@ -7143,20 +8466,20 @@
1.7654 fi
1.7655 ARMCC=$ac_cv_path_ARMCC
1.7656 if test -n "$ARMCC"; then
1.7657 - { echo "$as_me:$LINENO: result: $ARMCC" >&5
1.7658 -echo "${ECHO_T}$ARMCC" >&6; }
1.7659 -else
1.7660 - { echo "$as_me:$LINENO: result: no" >&5
1.7661 -echo "${ECHO_T}no" >&6; }
1.7662 + { $as_echo "$as_me:$LINENO: result: $ARMCC" >&5
1.7663 +$as_echo "$ARMCC" >&6; }
1.7664 +else
1.7665 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7666 +$as_echo "no" >&6; }
1.7667 fi
1.7668
1.7669
1.7670 # Extract the first word of "arm-elf-ld", so it can be a program name with args.
1.7671 set dummy arm-elf-ld; ac_word=$2
1.7672 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7673 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.7674 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7675 +$as_echo_n "checking for $ac_word... " >&6; }
1.7676 if test "${ac_cv_path_ARMLD+set}" = set; then
1.7677 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7678 + $as_echo_n "(cached) " >&6
1.7679 else
1.7680 case $ARMLD in
1.7681 [\\/]* | ?:[\\/]*)
1.7682 @@ -7171,7 +8494,7 @@
1.7683 for ac_exec_ext in '' $ac_executable_extensions; do
1.7684 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.7685 ac_cv_path_ARMLD="$as_dir/$ac_word$ac_exec_ext"
1.7686 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7687 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7688 break 2
1.7689 fi
1.7690 done
1.7691 @@ -7183,20 +8506,20 @@
1.7692 fi
1.7693 ARMLD=$ac_cv_path_ARMLD
1.7694 if test -n "$ARMLD"; then
1.7695 - { echo "$as_me:$LINENO: result: $ARMLD" >&5
1.7696 -echo "${ECHO_T}$ARMLD" >&6; }
1.7697 -else
1.7698 - { echo "$as_me:$LINENO: result: no" >&5
1.7699 -echo "${ECHO_T}no" >&6; }
1.7700 + { $as_echo "$as_me:$LINENO: result: $ARMLD" >&5
1.7701 +$as_echo "$ARMLD" >&6; }
1.7702 +else
1.7703 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7704 +$as_echo "no" >&6; }
1.7705 fi
1.7706
1.7707
1.7708 # Extract the first word of "arm-elf-objcopy", so it can be a program name with args.
1.7709 set dummy arm-elf-objcopy; ac_word=$2
1.7710 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7711 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.7712 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.7713 +$as_echo_n "checking for $ac_word... " >&6; }
1.7714 if test "${ac_cv_path_ARMOBJCOPY+set}" = set; then
1.7715 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7716 + $as_echo_n "(cached) " >&6
1.7717 else
1.7718 case $ARMOBJCOPY in
1.7719 [\\/]* | ?:[\\/]*)
1.7720 @@ -7211,7 +8534,7 @@
1.7721 for ac_exec_ext in '' $ac_executable_extensions; do
1.7722 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.7723 ac_cv_path_ARMOBJCOPY="$as_dir/$ac_word$ac_exec_ext"
1.7724 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7725 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7726 break 2
1.7727 fi
1.7728 done
1.7729 @@ -7223,11 +8546,11 @@
1.7730 fi
1.7731 ARMOBJCOPY=$ac_cv_path_ARMOBJCOPY
1.7732 if test -n "$ARMOBJCOPY"; then
1.7733 - { echo "$as_me:$LINENO: result: $ARMOBJCOPY" >&5
1.7734 -echo "${ECHO_T}$ARMOBJCOPY" >&6; }
1.7735 -else
1.7736 - { echo "$as_me:$LINENO: result: no" >&5
1.7737 -echo "${ECHO_T}no" >&6; }
1.7738 + { $as_echo "$as_me:$LINENO: result: $ARMOBJCOPY" >&5
1.7739 +$as_echo "$ARMOBJCOPY" >&6; }
1.7740 +else
1.7741 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.7742 +$as_echo "no" >&6; }
1.7743 fi
1.7744
1.7745
1.7746 @@ -7279,20 +8602,21 @@
1.7747
1.7748 for ac_header in locale.h
1.7749 do
1.7750 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.7751 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.7752 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
1.7753 - { echo "$as_me:$LINENO: checking for $ac_header" >&5
1.7754 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
1.7755 + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
1.7756 +$as_echo_n "checking for $ac_header... " >&6; }
1.7757 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
1.7758 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7759 -fi
1.7760 -ac_res=`eval echo '${'$as_ac_Header'}'`
1.7761 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1.7762 -echo "${ECHO_T}$ac_res" >&6; }
1.7763 + $as_echo_n "(cached) " >&6
1.7764 +fi
1.7765 +ac_res=`eval 'as_val=${'$as_ac_Header'}
1.7766 + $as_echo "$as_val"'`
1.7767 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1.7768 +$as_echo "$ac_res" >&6; }
1.7769 else
1.7770 # Is the header compilable?
1.7771 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
1.7772 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
1.7773 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
1.7774 +$as_echo_n "checking $ac_header usability... " >&6; }
1.7775 cat >conftest.$ac_ext <<_ACEOF
1.7776 /* confdefs.h. */
1.7777 _ACEOF
1.7778 @@ -7308,32 +8632,33 @@
1.7779 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7780 *) ac_try_echo=$ac_try;;
1.7781 esac
1.7782 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7783 - (eval "$ac_compile") 2>conftest.er1
1.7784 - ac_status=$?
1.7785 - grep -v '^ *+' conftest.er1 >conftest.err
1.7786 - rm -f conftest.er1
1.7787 - cat conftest.err >&5
1.7788 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7789 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7790 +$as_echo "$ac_try_echo") >&5
1.7791 + (eval "$ac_compile") 2>conftest.er1
1.7792 + ac_status=$?
1.7793 + grep -v '^ *+' conftest.er1 >conftest.err
1.7794 + rm -f conftest.er1
1.7795 + cat conftest.err >&5
1.7796 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7797 (exit $ac_status); } && {
1.7798 test -z "$ac_c_werror_flag" ||
1.7799 test ! -s conftest.err
1.7800 } && test -s conftest.$ac_objext; then
1.7801 ac_header_compiler=yes
1.7802 else
1.7803 - echo "$as_me: failed program was:" >&5
1.7804 + $as_echo "$as_me: failed program was:" >&5
1.7805 sed 's/^/| /' conftest.$ac_ext >&5
1.7806
1.7807 ac_header_compiler=no
1.7808 fi
1.7809
1.7810 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.7811 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.7812 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.7813 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.7814 +$as_echo "$ac_header_compiler" >&6; }
1.7815
1.7816 # Is the header present?
1.7817 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
1.7818 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
1.7819 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
1.7820 +$as_echo_n "checking $ac_header presence... " >&6; }
1.7821 cat >conftest.$ac_ext <<_ACEOF
1.7822 /* confdefs.h. */
1.7823 _ACEOF
1.7824 @@ -7347,69 +8672,72 @@
1.7825 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7826 *) ac_try_echo=$ac_try;;
1.7827 esac
1.7828 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7829 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7830 +$as_echo "$ac_try_echo") >&5
1.7831 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.7832 ac_status=$?
1.7833 grep -v '^ *+' conftest.er1 >conftest.err
1.7834 rm -f conftest.er1
1.7835 cat conftest.err >&5
1.7836 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7837 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7838 (exit $ac_status); } >/dev/null && {
1.7839 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.7840 test ! -s conftest.err
1.7841 }; then
1.7842 ac_header_preproc=yes
1.7843 else
1.7844 - echo "$as_me: failed program was:" >&5
1.7845 + $as_echo "$as_me: failed program was:" >&5
1.7846 sed 's/^/| /' conftest.$ac_ext >&5
1.7847
1.7848 ac_header_preproc=no
1.7849 fi
1.7850
1.7851 rm -f conftest.err conftest.$ac_ext
1.7852 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.7853 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.7854 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.7855 +$as_echo "$ac_header_preproc" >&6; }
1.7856
1.7857 # So? What about this header?
1.7858 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.7859 yes:no: )
1.7860 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
1.7861 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.7862 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
1.7863 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
1.7864 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
1.7865 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.7866 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
1.7867 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
1.7868 ac_header_preproc=yes
1.7869 ;;
1.7870 no:yes:* )
1.7871 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
1.7872 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
1.7873 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
1.7874 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
1.7875 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
1.7876 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
1.7877 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
1.7878 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
1.7879 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
1.7880 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1.7881 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
1.7882 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
1.7883 -
1.7884 - ;;
1.7885 -esac
1.7886 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
1.7887 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
1.7888 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
1.7889 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
1.7890 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
1.7891 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
1.7892 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
1.7893 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
1.7894 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
1.7895 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
1.7896 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
1.7897 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
1.7898 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
1.7899 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
1.7900 +
1.7901 + ;;
1.7902 +esac
1.7903 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
1.7904 +$as_echo_n "checking for $ac_header... " >&6; }
1.7905 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
1.7906 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7907 + $as_echo_n "(cached) " >&6
1.7908 else
1.7909 eval "$as_ac_Header=\$ac_header_preproc"
1.7910 fi
1.7911 -ac_res=`eval echo '${'$as_ac_Header'}'`
1.7912 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1.7913 -echo "${ECHO_T}$ac_res" >&6; }
1.7914 -
1.7915 -fi
1.7916 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
1.7917 +ac_res=`eval 'as_val=${'$as_ac_Header'}
1.7918 + $as_echo "$as_val"'`
1.7919 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1.7920 +$as_echo "$ac_res" >&6; }
1.7921 +
1.7922 +fi
1.7923 +if test `eval 'as_val=${'$as_ac_Header'}
1.7924 + $as_echo "$as_val"'` = yes; then
1.7925 cat >>confdefs.h <<_ACEOF
1.7926 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.7927 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.7928 _ACEOF
1.7929
1.7930 fi
1.7931 @@ -7417,10 +8745,10 @@
1.7932 done
1.7933
1.7934 if test $ac_cv_header_locale_h = yes; then
1.7935 - { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
1.7936 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
1.7937 + { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
1.7938 +$as_echo_n "checking for LC_MESSAGES... " >&6; }
1.7939 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
1.7940 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.7941 + $as_echo_n "(cached) " >&6
1.7942 else
1.7943 cat >conftest.$ac_ext <<_ACEOF
1.7944 /* confdefs.h. */
1.7945 @@ -7443,31 +8771,35 @@
1.7946 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.7947 *) ac_try_echo=$ac_try;;
1.7948 esac
1.7949 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.7950 - (eval "$ac_link") 2>conftest.er1
1.7951 - ac_status=$?
1.7952 - grep -v '^ *+' conftest.er1 >conftest.err
1.7953 - rm -f conftest.er1
1.7954 - cat conftest.err >&5
1.7955 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7956 - (exit $ac_status); } && {
1.7957 - test -z "$ac_c_werror_flag" ||
1.7958 - test ! -s conftest.err
1.7959 - } && test -s conftest$ac_exeext &&
1.7960 - $as_test_x conftest$ac_exeext; then
1.7961 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.7962 +$as_echo "$ac_try_echo") >&5
1.7963 + (eval "$ac_link") 2>conftest.er1
1.7964 + ac_status=$?
1.7965 + grep -v '^ *+' conftest.er1 >conftest.err
1.7966 + rm -f conftest.er1
1.7967 + cat conftest.err >&5
1.7968 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.7969 + (exit $ac_status); } && {
1.7970 + test -z "$ac_c_werror_flag" ||
1.7971 + test ! -s conftest.err
1.7972 + } && test -s conftest$ac_exeext && {
1.7973 + test "$cross_compiling" = yes ||
1.7974 + $as_test_x conftest$ac_exeext
1.7975 + }; then
1.7976 am_cv_val_LC_MESSAGES=yes
1.7977 else
1.7978 - echo "$as_me: failed program was:" >&5
1.7979 + $as_echo "$as_me: failed program was:" >&5
1.7980 sed 's/^/| /' conftest.$ac_ext >&5
1.7981
1.7982 am_cv_val_LC_MESSAGES=no
1.7983 fi
1.7984
1.7985 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.7986 - conftest$ac_exeext conftest.$ac_ext
1.7987 -fi
1.7988 -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
1.7989 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
1.7990 +rm -rf conftest.dSYM
1.7991 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.7992 + conftest$ac_exeext conftest.$ac_ext
1.7993 +fi
1.7994 +{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
1.7995 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
1.7996 if test $am_cv_val_LC_MESSAGES = yes; then
1.7997
1.7998 cat >>confdefs.h <<\_ACEOF
1.7999 @@ -7486,17 +8818,17 @@
1.8000 INTLLIBS=
1.8001
1.8002 if test "${ac_cv_header_libintl_h+set}" = set; then
1.8003 - { echo "$as_me:$LINENO: checking for libintl.h" >&5
1.8004 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
1.8005 + { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
1.8006 +$as_echo_n "checking for libintl.h... " >&6; }
1.8007 if test "${ac_cv_header_libintl_h+set}" = set; then
1.8008 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8009 -fi
1.8010 -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
1.8011 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
1.8012 + $as_echo_n "(cached) " >&6
1.8013 +fi
1.8014 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
1.8015 +$as_echo "$ac_cv_header_libintl_h" >&6; }
1.8016 else
1.8017 # Is the header compilable?
1.8018 -{ echo "$as_me:$LINENO: checking libintl.h usability" >&5
1.8019 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }
1.8020 +{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
1.8021 +$as_echo_n "checking libintl.h usability... " >&6; }
1.8022 cat >conftest.$ac_ext <<_ACEOF
1.8023 /* confdefs.h. */
1.8024 _ACEOF
1.8025 @@ -7512,32 +8844,33 @@
1.8026 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8027 *) ac_try_echo=$ac_try;;
1.8028 esac
1.8029 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8030 - (eval "$ac_compile") 2>conftest.er1
1.8031 - ac_status=$?
1.8032 - grep -v '^ *+' conftest.er1 >conftest.err
1.8033 - rm -f conftest.er1
1.8034 - cat conftest.err >&5
1.8035 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8036 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8037 +$as_echo "$ac_try_echo") >&5
1.8038 + (eval "$ac_compile") 2>conftest.er1
1.8039 + ac_status=$?
1.8040 + grep -v '^ *+' conftest.er1 >conftest.err
1.8041 + rm -f conftest.er1
1.8042 + cat conftest.err >&5
1.8043 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8044 (exit $ac_status); } && {
1.8045 test -z "$ac_c_werror_flag" ||
1.8046 test ! -s conftest.err
1.8047 } && test -s conftest.$ac_objext; then
1.8048 ac_header_compiler=yes
1.8049 else
1.8050 - echo "$as_me: failed program was:" >&5
1.8051 + $as_echo "$as_me: failed program was:" >&5
1.8052 sed 's/^/| /' conftest.$ac_ext >&5
1.8053
1.8054 ac_header_compiler=no
1.8055 fi
1.8056
1.8057 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.8058 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.8059 -echo "${ECHO_T}$ac_header_compiler" >&6; }
1.8060 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
1.8061 +$as_echo "$ac_header_compiler" >&6; }
1.8062
1.8063 # Is the header present?
1.8064 -{ echo "$as_me:$LINENO: checking libintl.h presence" >&5
1.8065 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }
1.8066 +{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
1.8067 +$as_echo_n "checking libintl.h presence... " >&6; }
1.8068 cat >conftest.$ac_ext <<_ACEOF
1.8069 /* confdefs.h. */
1.8070 _ACEOF
1.8071 @@ -7551,63 +8884,64 @@
1.8072 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8073 *) ac_try_echo=$ac_try;;
1.8074 esac
1.8075 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8076 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8077 +$as_echo "$ac_try_echo") >&5
1.8078 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
1.8079 ac_status=$?
1.8080 grep -v '^ *+' conftest.er1 >conftest.err
1.8081 rm -f conftest.er1
1.8082 cat conftest.err >&5
1.8083 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8084 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8085 (exit $ac_status); } >/dev/null && {
1.8086 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.8087 test ! -s conftest.err
1.8088 }; then
1.8089 ac_header_preproc=yes
1.8090 else
1.8091 - echo "$as_me: failed program was:" >&5
1.8092 + $as_echo "$as_me: failed program was:" >&5
1.8093 sed 's/^/| /' conftest.$ac_ext >&5
1.8094
1.8095 ac_header_preproc=no
1.8096 fi
1.8097
1.8098 rm -f conftest.err conftest.$ac_ext
1.8099 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.8100 -echo "${ECHO_T}$ac_header_preproc" >&6; }
1.8101 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
1.8102 +$as_echo "$ac_header_preproc" >&6; }
1.8103
1.8104 # So? What about this header?
1.8105 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.8106 yes:no: )
1.8107 - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.8108 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.8109 - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
1.8110 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
1.8111 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.8112 +$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.8113 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
1.8114 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
1.8115 ac_header_preproc=yes
1.8116 ;;
1.8117 no:yes:* )
1.8118 - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
1.8119 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
1.8120 - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
1.8121 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
1.8122 - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
1.8123 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
1.8124 - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
1.8125 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.8126 - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
1.8127 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
1.8128 - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
1.8129 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
1.8130 -
1.8131 - ;;
1.8132 -esac
1.8133 -{ echo "$as_me:$LINENO: checking for libintl.h" >&5
1.8134 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }
1.8135 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
1.8136 +$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
1.8137 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
1.8138 +$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
1.8139 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
1.8140 +$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
1.8141 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
1.8142 +$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.8143 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
1.8144 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
1.8145 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
1.8146 +$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
1.8147 +
1.8148 + ;;
1.8149 +esac
1.8150 +{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
1.8151 +$as_echo_n "checking for libintl.h... " >&6; }
1.8152 if test "${ac_cv_header_libintl_h+set}" = set; then
1.8153 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8154 + $as_echo_n "(cached) " >&6
1.8155 else
1.8156 ac_cv_header_libintl_h=$ac_header_preproc
1.8157 fi
1.8158 -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
1.8159 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }
1.8160 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
1.8161 +$as_echo "$ac_cv_header_libintl_h" >&6; }
1.8162
1.8163 fi
1.8164 if test $ac_cv_header_libintl_h = yes; then
1.8165 @@ -7617,10 +8951,10 @@
1.8166 #
1.8167 # First check in libc
1.8168 #
1.8169 - { echo "$as_me:$LINENO: checking for ngettext in libc" >&5
1.8170 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }
1.8171 + { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
1.8172 +$as_echo_n "checking for ngettext in libc... " >&6; }
1.8173 if test "${gt_cv_func_ngettext_libc+set}" = set; then
1.8174 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8175 + $as_echo_n "(cached) " >&6
1.8176 else
1.8177 cat >conftest.$ac_ext <<_ACEOF
1.8178 /* confdefs.h. */
1.8179 @@ -7645,38 +8979,42 @@
1.8180 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8181 *) ac_try_echo=$ac_try;;
1.8182 esac
1.8183 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8184 - (eval "$ac_link") 2>conftest.er1
1.8185 - ac_status=$?
1.8186 - grep -v '^ *+' conftest.er1 >conftest.err
1.8187 - rm -f conftest.er1
1.8188 - cat conftest.err >&5
1.8189 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8190 - (exit $ac_status); } && {
1.8191 - test -z "$ac_c_werror_flag" ||
1.8192 - test ! -s conftest.err
1.8193 - } && test -s conftest$ac_exeext &&
1.8194 - $as_test_x conftest$ac_exeext; then
1.8195 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8196 +$as_echo "$ac_try_echo") >&5
1.8197 + (eval "$ac_link") 2>conftest.er1
1.8198 + ac_status=$?
1.8199 + grep -v '^ *+' conftest.er1 >conftest.err
1.8200 + rm -f conftest.er1
1.8201 + cat conftest.err >&5
1.8202 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8203 + (exit $ac_status); } && {
1.8204 + test -z "$ac_c_werror_flag" ||
1.8205 + test ! -s conftest.err
1.8206 + } && test -s conftest$ac_exeext && {
1.8207 + test "$cross_compiling" = yes ||
1.8208 + $as_test_x conftest$ac_exeext
1.8209 + }; then
1.8210 gt_cv_func_ngettext_libc=yes
1.8211 else
1.8212 - echo "$as_me: failed program was:" >&5
1.8213 + $as_echo "$as_me: failed program was:" >&5
1.8214 sed 's/^/| /' conftest.$ac_ext >&5
1.8215
1.8216 gt_cv_func_ngettext_libc=no
1.8217 fi
1.8218
1.8219 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8220 - conftest$ac_exeext conftest.$ac_ext
1.8221 -
1.8222 -fi
1.8223 -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
1.8224 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }
1.8225 +rm -rf conftest.dSYM
1.8226 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8227 + conftest$ac_exeext conftest.$ac_ext
1.8228 +
1.8229 +fi
1.8230 +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
1.8231 +$as_echo "$gt_cv_func_ngettext_libc" >&6; }
1.8232
1.8233 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1.8234 - { echo "$as_me:$LINENO: checking for dgettext in libc" >&5
1.8235 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }
1.8236 + { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
1.8237 +$as_echo_n "checking for dgettext in libc... " >&6; }
1.8238 if test "${gt_cv_func_dgettext_libc+set}" = set; then
1.8239 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8240 + $as_echo_n "(cached) " >&6
1.8241 else
1.8242 cat >conftest.$ac_ext <<_ACEOF
1.8243 /* confdefs.h. */
1.8244 @@ -7701,43 +9039,47 @@
1.8245 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8246 *) ac_try_echo=$ac_try;;
1.8247 esac
1.8248 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8249 - (eval "$ac_link") 2>conftest.er1
1.8250 - ac_status=$?
1.8251 - grep -v '^ *+' conftest.er1 >conftest.err
1.8252 - rm -f conftest.er1
1.8253 - cat conftest.err >&5
1.8254 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8255 - (exit $ac_status); } && {
1.8256 - test -z "$ac_c_werror_flag" ||
1.8257 - test ! -s conftest.err
1.8258 - } && test -s conftest$ac_exeext &&
1.8259 - $as_test_x conftest$ac_exeext; then
1.8260 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8261 +$as_echo "$ac_try_echo") >&5
1.8262 + (eval "$ac_link") 2>conftest.er1
1.8263 + ac_status=$?
1.8264 + grep -v '^ *+' conftest.er1 >conftest.err
1.8265 + rm -f conftest.er1
1.8266 + cat conftest.err >&5
1.8267 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8268 + (exit $ac_status); } && {
1.8269 + test -z "$ac_c_werror_flag" ||
1.8270 + test ! -s conftest.err
1.8271 + } && test -s conftest$ac_exeext && {
1.8272 + test "$cross_compiling" = yes ||
1.8273 + $as_test_x conftest$ac_exeext
1.8274 + }; then
1.8275 gt_cv_func_dgettext_libc=yes
1.8276 else
1.8277 - echo "$as_me: failed program was:" >&5
1.8278 + $as_echo "$as_me: failed program was:" >&5
1.8279 sed 's/^/| /' conftest.$ac_ext >&5
1.8280
1.8281 gt_cv_func_dgettext_libc=no
1.8282 fi
1.8283
1.8284 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8285 - conftest$ac_exeext conftest.$ac_ext
1.8286 -
1.8287 -fi
1.8288 -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
1.8289 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }
1.8290 +rm -rf conftest.dSYM
1.8291 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8292 + conftest$ac_exeext conftest.$ac_ext
1.8293 +
1.8294 +fi
1.8295 +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
1.8296 +$as_echo "$gt_cv_func_dgettext_libc" >&6; }
1.8297 fi
1.8298
1.8299 if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1.8300
1.8301 for ac_func in bind_textdomain_codeset
1.8302 do
1.8303 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1.8304 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
1.8305 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
1.8306 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1.8307 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
1.8308 +$as_echo_n "checking for $ac_func... " >&6; }
1.8309 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1.8310 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8311 + $as_echo_n "(cached) " >&6
1.8312 else
1.8313 cat >conftest.$ac_ext <<_ACEOF
1.8314 /* confdefs.h. */
1.8315 @@ -7790,35 +9132,41 @@
1.8316 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8317 *) ac_try_echo=$ac_try;;
1.8318 esac
1.8319 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8320 - (eval "$ac_link") 2>conftest.er1
1.8321 - ac_status=$?
1.8322 - grep -v '^ *+' conftest.er1 >conftest.err
1.8323 - rm -f conftest.er1
1.8324 - cat conftest.err >&5
1.8325 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8326 - (exit $ac_status); } && {
1.8327 - test -z "$ac_c_werror_flag" ||
1.8328 - test ! -s conftest.err
1.8329 - } && test -s conftest$ac_exeext &&
1.8330 - $as_test_x conftest$ac_exeext; then
1.8331 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8332 +$as_echo "$ac_try_echo") >&5
1.8333 + (eval "$ac_link") 2>conftest.er1
1.8334 + ac_status=$?
1.8335 + grep -v '^ *+' conftest.er1 >conftest.err
1.8336 + rm -f conftest.er1
1.8337 + cat conftest.err >&5
1.8338 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8339 + (exit $ac_status); } && {
1.8340 + test -z "$ac_c_werror_flag" ||
1.8341 + test ! -s conftest.err
1.8342 + } && test -s conftest$ac_exeext && {
1.8343 + test "$cross_compiling" = yes ||
1.8344 + $as_test_x conftest$ac_exeext
1.8345 + }; then
1.8346 eval "$as_ac_var=yes"
1.8347 else
1.8348 - echo "$as_me: failed program was:" >&5
1.8349 + $as_echo "$as_me: failed program was:" >&5
1.8350 sed 's/^/| /' conftest.$ac_ext >&5
1.8351
1.8352 eval "$as_ac_var=no"
1.8353 fi
1.8354
1.8355 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8356 - conftest$ac_exeext conftest.$ac_ext
1.8357 -fi
1.8358 -ac_res=`eval echo '${'$as_ac_var'}'`
1.8359 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1.8360 -echo "${ECHO_T}$ac_res" >&6; }
1.8361 -if test `eval echo '${'$as_ac_var'}'` = yes; then
1.8362 +rm -rf conftest.dSYM
1.8363 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8364 + conftest$ac_exeext conftest.$ac_ext
1.8365 +fi
1.8366 +ac_res=`eval 'as_val=${'$as_ac_var'}
1.8367 + $as_echo "$as_val"'`
1.8368 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1.8369 +$as_echo "$ac_res" >&6; }
1.8370 +if test `eval 'as_val=${'$as_ac_var'}
1.8371 + $as_echo "$as_val"'` = yes; then
1.8372 cat >>confdefs.h <<_ACEOF
1.8373 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1.8374 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1.8375 _ACEOF
1.8376
1.8377 fi
1.8378 @@ -7833,10 +9181,10 @@
1.8379 || test "$gt_cv_func_ngettext_libc" != "yes" \
1.8380 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
1.8381
1.8382 - { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
1.8383 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
1.8384 + { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
1.8385 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
1.8386 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
1.8387 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8388 + $as_echo_n "(cached) " >&6
1.8389 else
1.8390 ac_check_lib_save_LIBS=$LIBS
1.8391 LIBS="-lintl $LIBS"
1.8392 @@ -7868,37 +9216,41 @@
1.8393 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8394 *) ac_try_echo=$ac_try;;
1.8395 esac
1.8396 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8397 - (eval "$ac_link") 2>conftest.er1
1.8398 - ac_status=$?
1.8399 - grep -v '^ *+' conftest.er1 >conftest.err
1.8400 - rm -f conftest.er1
1.8401 - cat conftest.err >&5
1.8402 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8403 - (exit $ac_status); } && {
1.8404 - test -z "$ac_c_werror_flag" ||
1.8405 - test ! -s conftest.err
1.8406 - } && test -s conftest$ac_exeext &&
1.8407 - $as_test_x conftest$ac_exeext; then
1.8408 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8409 +$as_echo "$ac_try_echo") >&5
1.8410 + (eval "$ac_link") 2>conftest.er1
1.8411 + ac_status=$?
1.8412 + grep -v '^ *+' conftest.er1 >conftest.err
1.8413 + rm -f conftest.er1
1.8414 + cat conftest.err >&5
1.8415 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8416 + (exit $ac_status); } && {
1.8417 + test -z "$ac_c_werror_flag" ||
1.8418 + test ! -s conftest.err
1.8419 + } && test -s conftest$ac_exeext && {
1.8420 + test "$cross_compiling" = yes ||
1.8421 + $as_test_x conftest$ac_exeext
1.8422 + }; then
1.8423 ac_cv_lib_intl_bindtextdomain=yes
1.8424 else
1.8425 - echo "$as_me: failed program was:" >&5
1.8426 + $as_echo "$as_me: failed program was:" >&5
1.8427 sed 's/^/| /' conftest.$ac_ext >&5
1.8428
1.8429 ac_cv_lib_intl_bindtextdomain=no
1.8430 fi
1.8431
1.8432 +rm -rf conftest.dSYM
1.8433 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8434 conftest$ac_exeext conftest.$ac_ext
1.8435 LIBS=$ac_check_lib_save_LIBS
1.8436 fi
1.8437 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
1.8438 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
1.8439 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
1.8440 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
1.8441 if test $ac_cv_lib_intl_bindtextdomain = yes; then
1.8442 - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
1.8443 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
1.8444 + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
1.8445 +$as_echo_n "checking for ngettext in -lintl... " >&6; }
1.8446 if test "${ac_cv_lib_intl_ngettext+set}" = set; then
1.8447 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8448 + $as_echo_n "(cached) " >&6
1.8449 else
1.8450 ac_check_lib_save_LIBS=$LIBS
1.8451 LIBS="-lintl $LIBS"
1.8452 @@ -7930,37 +9282,41 @@
1.8453 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8454 *) ac_try_echo=$ac_try;;
1.8455 esac
1.8456 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8457 - (eval "$ac_link") 2>conftest.er1
1.8458 - ac_status=$?
1.8459 - grep -v '^ *+' conftest.er1 >conftest.err
1.8460 - rm -f conftest.er1
1.8461 - cat conftest.err >&5
1.8462 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8463 - (exit $ac_status); } && {
1.8464 - test -z "$ac_c_werror_flag" ||
1.8465 - test ! -s conftest.err
1.8466 - } && test -s conftest$ac_exeext &&
1.8467 - $as_test_x conftest$ac_exeext; then
1.8468 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8469 +$as_echo "$ac_try_echo") >&5
1.8470 + (eval "$ac_link") 2>conftest.er1
1.8471 + ac_status=$?
1.8472 + grep -v '^ *+' conftest.er1 >conftest.err
1.8473 + rm -f conftest.er1
1.8474 + cat conftest.err >&5
1.8475 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8476 + (exit $ac_status); } && {
1.8477 + test -z "$ac_c_werror_flag" ||
1.8478 + test ! -s conftest.err
1.8479 + } && test -s conftest$ac_exeext && {
1.8480 + test "$cross_compiling" = yes ||
1.8481 + $as_test_x conftest$ac_exeext
1.8482 + }; then
1.8483 ac_cv_lib_intl_ngettext=yes
1.8484 else
1.8485 - echo "$as_me: failed program was:" >&5
1.8486 + $as_echo "$as_me: failed program was:" >&5
1.8487 sed 's/^/| /' conftest.$ac_ext >&5
1.8488
1.8489 ac_cv_lib_intl_ngettext=no
1.8490 fi
1.8491
1.8492 +rm -rf conftest.dSYM
1.8493 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8494 conftest$ac_exeext conftest.$ac_ext
1.8495 LIBS=$ac_check_lib_save_LIBS
1.8496 fi
1.8497 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
1.8498 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
1.8499 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
1.8500 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
1.8501 if test $ac_cv_lib_intl_ngettext = yes; then
1.8502 - { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
1.8503 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }
1.8504 + { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
1.8505 +$as_echo_n "checking for dgettext in -lintl... " >&6; }
1.8506 if test "${ac_cv_lib_intl_dgettext+set}" = set; then
1.8507 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8508 + $as_echo_n "(cached) " >&6
1.8509 else
1.8510 ac_check_lib_save_LIBS=$LIBS
1.8511 LIBS="-lintl $LIBS"
1.8512 @@ -7992,32 +9348,36 @@
1.8513 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8514 *) ac_try_echo=$ac_try;;
1.8515 esac
1.8516 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8517 - (eval "$ac_link") 2>conftest.er1
1.8518 - ac_status=$?
1.8519 - grep -v '^ *+' conftest.er1 >conftest.err
1.8520 - rm -f conftest.er1
1.8521 - cat conftest.err >&5
1.8522 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8523 - (exit $ac_status); } && {
1.8524 - test -z "$ac_c_werror_flag" ||
1.8525 - test ! -s conftest.err
1.8526 - } && test -s conftest$ac_exeext &&
1.8527 - $as_test_x conftest$ac_exeext; then
1.8528 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8529 +$as_echo "$ac_try_echo") >&5
1.8530 + (eval "$ac_link") 2>conftest.er1
1.8531 + ac_status=$?
1.8532 + grep -v '^ *+' conftest.er1 >conftest.err
1.8533 + rm -f conftest.er1
1.8534 + cat conftest.err >&5
1.8535 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8536 + (exit $ac_status); } && {
1.8537 + test -z "$ac_c_werror_flag" ||
1.8538 + test ! -s conftest.err
1.8539 + } && test -s conftest$ac_exeext && {
1.8540 + test "$cross_compiling" = yes ||
1.8541 + $as_test_x conftest$ac_exeext
1.8542 + }; then
1.8543 ac_cv_lib_intl_dgettext=yes
1.8544 else
1.8545 - echo "$as_me: failed program was:" >&5
1.8546 + $as_echo "$as_me: failed program was:" >&5
1.8547 sed 's/^/| /' conftest.$ac_ext >&5
1.8548
1.8549 ac_cv_lib_intl_dgettext=no
1.8550 fi
1.8551
1.8552 +rm -rf conftest.dSYM
1.8553 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8554 conftest$ac_exeext conftest.$ac_ext
1.8555 LIBS=$ac_check_lib_save_LIBS
1.8556 fi
1.8557 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
1.8558 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }
1.8559 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
1.8560 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
1.8561 if test $ac_cv_lib_intl_dgettext = yes; then
1.8562 gt_cv_func_dgettext_libintl=yes
1.8563 fi
1.8564 @@ -8028,14 +9388,14 @@
1.8565
1.8566
1.8567 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1.8568 - { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
1.8569 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }
1.8570 - { echo "$as_me:$LINENO: result: " >&5
1.8571 -echo "${ECHO_T}" >&6; }
1.8572 - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
1.8573 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }
1.8574 + { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
1.8575 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
1.8576 + { $as_echo "$as_me:$LINENO: result: " >&5
1.8577 +$as_echo "" >&6; }
1.8578 + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
1.8579 +$as_echo_n "checking for ngettext in -lintl... " >&6; }
1.8580 if test "${ac_cv_lib_intl_ngettext+set}" = set; then
1.8581 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8582 + $as_echo_n "(cached) " >&6
1.8583 else
1.8584 ac_check_lib_save_LIBS=$LIBS
1.8585 LIBS="-lintl -liconv $LIBS"
1.8586 @@ -8067,37 +9427,41 @@
1.8587 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8588 *) ac_try_echo=$ac_try;;
1.8589 esac
1.8590 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8591 - (eval "$ac_link") 2>conftest.er1
1.8592 - ac_status=$?
1.8593 - grep -v '^ *+' conftest.er1 >conftest.err
1.8594 - rm -f conftest.er1
1.8595 - cat conftest.err >&5
1.8596 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8597 - (exit $ac_status); } && {
1.8598 - test -z "$ac_c_werror_flag" ||
1.8599 - test ! -s conftest.err
1.8600 - } && test -s conftest$ac_exeext &&
1.8601 - $as_test_x conftest$ac_exeext; then
1.8602 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8603 +$as_echo "$ac_try_echo") >&5
1.8604 + (eval "$ac_link") 2>conftest.er1
1.8605 + ac_status=$?
1.8606 + grep -v '^ *+' conftest.er1 >conftest.err
1.8607 + rm -f conftest.er1
1.8608 + cat conftest.err >&5
1.8609 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8610 + (exit $ac_status); } && {
1.8611 + test -z "$ac_c_werror_flag" ||
1.8612 + test ! -s conftest.err
1.8613 + } && test -s conftest$ac_exeext && {
1.8614 + test "$cross_compiling" = yes ||
1.8615 + $as_test_x conftest$ac_exeext
1.8616 + }; then
1.8617 ac_cv_lib_intl_ngettext=yes
1.8618 else
1.8619 - echo "$as_me: failed program was:" >&5
1.8620 + $as_echo "$as_me: failed program was:" >&5
1.8621 sed 's/^/| /' conftest.$ac_ext >&5
1.8622
1.8623 ac_cv_lib_intl_ngettext=no
1.8624 fi
1.8625
1.8626 +rm -rf conftest.dSYM
1.8627 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8628 conftest$ac_exeext conftest.$ac_ext
1.8629 LIBS=$ac_check_lib_save_LIBS
1.8630 fi
1.8631 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
1.8632 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }
1.8633 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
1.8634 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
1.8635 if test $ac_cv_lib_intl_ngettext = yes; then
1.8636 - { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
1.8637 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }
1.8638 + { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
1.8639 +$as_echo_n "checking for dcgettext in -lintl... " >&6; }
1.8640 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
1.8641 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8642 + $as_echo_n "(cached) " >&6
1.8643 else
1.8644 ac_check_lib_save_LIBS=$LIBS
1.8645 LIBS="-lintl -liconv $LIBS"
1.8646 @@ -8129,32 +9493,36 @@
1.8647 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8648 *) ac_try_echo=$ac_try;;
1.8649 esac
1.8650 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8651 - (eval "$ac_link") 2>conftest.er1
1.8652 - ac_status=$?
1.8653 - grep -v '^ *+' conftest.er1 >conftest.err
1.8654 - rm -f conftest.er1
1.8655 - cat conftest.err >&5
1.8656 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8657 - (exit $ac_status); } && {
1.8658 - test -z "$ac_c_werror_flag" ||
1.8659 - test ! -s conftest.err
1.8660 - } && test -s conftest$ac_exeext &&
1.8661 - $as_test_x conftest$ac_exeext; then
1.8662 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8663 +$as_echo "$ac_try_echo") >&5
1.8664 + (eval "$ac_link") 2>conftest.er1
1.8665 + ac_status=$?
1.8666 + grep -v '^ *+' conftest.er1 >conftest.err
1.8667 + rm -f conftest.er1
1.8668 + cat conftest.err >&5
1.8669 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8670 + (exit $ac_status); } && {
1.8671 + test -z "$ac_c_werror_flag" ||
1.8672 + test ! -s conftest.err
1.8673 + } && test -s conftest$ac_exeext && {
1.8674 + test "$cross_compiling" = yes ||
1.8675 + $as_test_x conftest$ac_exeext
1.8676 + }; then
1.8677 ac_cv_lib_intl_dcgettext=yes
1.8678 else
1.8679 - echo "$as_me: failed program was:" >&5
1.8680 + $as_echo "$as_me: failed program was:" >&5
1.8681 sed 's/^/| /' conftest.$ac_ext >&5
1.8682
1.8683 ac_cv_lib_intl_dcgettext=no
1.8684 fi
1.8685
1.8686 +rm -rf conftest.dSYM
1.8687 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8688 conftest$ac_exeext conftest.$ac_ext
1.8689 LIBS=$ac_check_lib_save_LIBS
1.8690 fi
1.8691 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
1.8692 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }
1.8693 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
1.8694 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
1.8695 if test $ac_cv_lib_intl_dcgettext = yes; then
1.8696 gt_cv_func_dgettext_libintl=yes
1.8697 libintl_extra_libs=-liconv
1.8698 @@ -8180,11 +9548,11 @@
1.8699
1.8700 for ac_func in bind_textdomain_codeset
1.8701 do
1.8702 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1.8703 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
1.8704 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
1.8705 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1.8706 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
1.8707 +$as_echo_n "checking for $ac_func... " >&6; }
1.8708 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1.8709 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8710 + $as_echo_n "(cached) " >&6
1.8711 else
1.8712 cat >conftest.$ac_ext <<_ACEOF
1.8713 /* confdefs.h. */
1.8714 @@ -8237,35 +9605,41 @@
1.8715 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8716 *) ac_try_echo=$ac_try;;
1.8717 esac
1.8718 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8719 - (eval "$ac_link") 2>conftest.er1
1.8720 - ac_status=$?
1.8721 - grep -v '^ *+' conftest.er1 >conftest.err
1.8722 - rm -f conftest.er1
1.8723 - cat conftest.err >&5
1.8724 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8725 - (exit $ac_status); } && {
1.8726 - test -z "$ac_c_werror_flag" ||
1.8727 - test ! -s conftest.err
1.8728 - } && test -s conftest$ac_exeext &&
1.8729 - $as_test_x conftest$ac_exeext; then
1.8730 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8731 +$as_echo "$ac_try_echo") >&5
1.8732 + (eval "$ac_link") 2>conftest.er1
1.8733 + ac_status=$?
1.8734 + grep -v '^ *+' conftest.er1 >conftest.err
1.8735 + rm -f conftest.er1
1.8736 + cat conftest.err >&5
1.8737 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8738 + (exit $ac_status); } && {
1.8739 + test -z "$ac_c_werror_flag" ||
1.8740 + test ! -s conftest.err
1.8741 + } && test -s conftest$ac_exeext && {
1.8742 + test "$cross_compiling" = yes ||
1.8743 + $as_test_x conftest$ac_exeext
1.8744 + }; then
1.8745 eval "$as_ac_var=yes"
1.8746 else
1.8747 - echo "$as_me: failed program was:" >&5
1.8748 + $as_echo "$as_me: failed program was:" >&5
1.8749 sed 's/^/| /' conftest.$ac_ext >&5
1.8750
1.8751 eval "$as_ac_var=no"
1.8752 fi
1.8753
1.8754 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8755 - conftest$ac_exeext conftest.$ac_ext
1.8756 -fi
1.8757 -ac_res=`eval echo '${'$as_ac_var'}'`
1.8758 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1.8759 -echo "${ECHO_T}$ac_res" >&6; }
1.8760 -if test `eval echo '${'$as_ac_var'}'` = yes; then
1.8761 +rm -rf conftest.dSYM
1.8762 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8763 + conftest$ac_exeext conftest.$ac_ext
1.8764 +fi
1.8765 +ac_res=`eval 'as_val=${'$as_ac_var'}
1.8766 + $as_echo "$as_val"'`
1.8767 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1.8768 +$as_echo "$ac_res" >&6; }
1.8769 +if test `eval 'as_val=${'$as_ac_var'}
1.8770 + $as_echo "$as_val"'` = yes; then
1.8771 cat >>confdefs.h <<_ACEOF
1.8772 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1.8773 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1.8774 _ACEOF
1.8775
1.8776 fi
1.8777 @@ -8301,10 +9675,10 @@
1.8778
1.8779 # Extract the first word of "msgfmt", so it can be a program name with args.
1.8780 set dummy msgfmt; ac_word=$2
1.8781 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.8782 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.8783 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.8784 +$as_echo_n "checking for $ac_word... " >&6; }
1.8785 if test "${ac_cv_path_MSGFMT+set}" = set; then
1.8786 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8787 + $as_echo_n "(cached) " >&6
1.8788 else
1.8789 case "$MSGFMT" in
1.8790 /*)
1.8791 @@ -8328,11 +9702,11 @@
1.8792 fi
1.8793 MSGFMT="$ac_cv_path_MSGFMT"
1.8794 if test "$MSGFMT" != "no"; then
1.8795 - { echo "$as_me:$LINENO: result: $MSGFMT" >&5
1.8796 -echo "${ECHO_T}$MSGFMT" >&6; }
1.8797 -else
1.8798 - { echo "$as_me:$LINENO: result: no" >&5
1.8799 -echo "${ECHO_T}no" >&6; }
1.8800 + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
1.8801 +$as_echo "$MSGFMT" >&6; }
1.8802 +else
1.8803 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.8804 +$as_echo "no" >&6; }
1.8805 fi
1.8806 if test "$MSGFMT" != "no"; then
1.8807 glib_save_LIBS="$LIBS"
1.8808 @@ -8340,11 +9714,11 @@
1.8809
1.8810 for ac_func in dcgettext
1.8811 do
1.8812 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1.8813 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
1.8814 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
1.8815 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1.8816 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
1.8817 +$as_echo_n "checking for $ac_func... " >&6; }
1.8818 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
1.8819 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8820 + $as_echo_n "(cached) " >&6
1.8821 else
1.8822 cat >conftest.$ac_ext <<_ACEOF
1.8823 /* confdefs.h. */
1.8824 @@ -8397,43 +9771,49 @@
1.8825 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8826 *) ac_try_echo=$ac_try;;
1.8827 esac
1.8828 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8829 - (eval "$ac_link") 2>conftest.er1
1.8830 - ac_status=$?
1.8831 - grep -v '^ *+' conftest.er1 >conftest.err
1.8832 - rm -f conftest.er1
1.8833 - cat conftest.err >&5
1.8834 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8835 - (exit $ac_status); } && {
1.8836 - test -z "$ac_c_werror_flag" ||
1.8837 - test ! -s conftest.err
1.8838 - } && test -s conftest$ac_exeext &&
1.8839 - $as_test_x conftest$ac_exeext; then
1.8840 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.8841 +$as_echo "$ac_try_echo") >&5
1.8842 + (eval "$ac_link") 2>conftest.er1
1.8843 + ac_status=$?
1.8844 + grep -v '^ *+' conftest.er1 >conftest.err
1.8845 + rm -f conftest.er1
1.8846 + cat conftest.err >&5
1.8847 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8848 + (exit $ac_status); } && {
1.8849 + test -z "$ac_c_werror_flag" ||
1.8850 + test ! -s conftest.err
1.8851 + } && test -s conftest$ac_exeext && {
1.8852 + test "$cross_compiling" = yes ||
1.8853 + $as_test_x conftest$ac_exeext
1.8854 + }; then
1.8855 eval "$as_ac_var=yes"
1.8856 else
1.8857 - echo "$as_me: failed program was:" >&5
1.8858 + $as_echo "$as_me: failed program was:" >&5
1.8859 sed 's/^/| /' conftest.$ac_ext >&5
1.8860
1.8861 eval "$as_ac_var=no"
1.8862 fi
1.8863
1.8864 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8865 - conftest$ac_exeext conftest.$ac_ext
1.8866 -fi
1.8867 -ac_res=`eval echo '${'$as_ac_var'}'`
1.8868 - { echo "$as_me:$LINENO: result: $ac_res" >&5
1.8869 -echo "${ECHO_T}$ac_res" >&6; }
1.8870 -if test `eval echo '${'$as_ac_var'}'` = yes; then
1.8871 +rm -rf conftest.dSYM
1.8872 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.8873 + conftest$ac_exeext conftest.$ac_ext
1.8874 +fi
1.8875 +ac_res=`eval 'as_val=${'$as_ac_var'}
1.8876 + $as_echo "$as_val"'`
1.8877 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
1.8878 +$as_echo "$ac_res" >&6; }
1.8879 +if test `eval 'as_val=${'$as_ac_var'}
1.8880 + $as_echo "$as_val"'` = yes; then
1.8881 cat >>confdefs.h <<_ACEOF
1.8882 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
1.8883 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1.8884 _ACEOF
1.8885
1.8886 fi
1.8887 done
1.8888
1.8889 MSGFMT_OPTS=
1.8890 - { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
1.8891 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
1.8892 + { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
1.8893 +$as_echo_n "checking if msgfmt accepts -c... " >&6; }
1.8894 cat >conftest.foo <<_ACEOF
1.8895
1.8896 msgid ""
1.8897 @@ -8447,25 +9827,25 @@
1.8898 "Content-Transfer-Encoding: 8bit\n"
1.8899
1.8900 _ACEOF
1.8901 -if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
1.8902 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
1.8903 - ac_status=$?
1.8904 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8905 - (exit $ac_status); }; then
1.8906 - MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
1.8907 -echo "${ECHO_T}yes" >&6; }
1.8908 -else { echo "$as_me:$LINENO: result: no" >&5
1.8909 -echo "${ECHO_T}no" >&6; }
1.8910 +if { ($as_echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
1.8911 + (msgfmt -c -o /dev/null conftest.foo) 2>&5
1.8912 + ac_status=$?
1.8913 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.8914 + (exit $ac_status); }; then
1.8915 + MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
1.8916 +$as_echo "yes" >&6; }
1.8917 +else { $as_echo "$as_me:$LINENO: result: no" >&5
1.8918 +$as_echo "no" >&6; }
1.8919 echo "$as_me: failed input was:" >&5
1.8920 sed 's/^/| /' conftest.foo >&5
1.8921 fi
1.8922
1.8923 # Extract the first word of "gmsgfmt", so it can be a program name with args.
1.8924 set dummy gmsgfmt; ac_word=$2
1.8925 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.8926 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.8927 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.8928 +$as_echo_n "checking for $ac_word... " >&6; }
1.8929 if test "${ac_cv_path_GMSGFMT+set}" = set; then
1.8930 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8931 + $as_echo_n "(cached) " >&6
1.8932 else
1.8933 case $GMSGFMT in
1.8934 [\\/]* | ?:[\\/]*)
1.8935 @@ -8480,7 +9860,7 @@
1.8936 for ac_exec_ext in '' $ac_executable_extensions; do
1.8937 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.8938 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
1.8939 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8940 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8941 break 2
1.8942 fi
1.8943 done
1.8944 @@ -8493,20 +9873,20 @@
1.8945 fi
1.8946 GMSGFMT=$ac_cv_path_GMSGFMT
1.8947 if test -n "$GMSGFMT"; then
1.8948 - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
1.8949 -echo "${ECHO_T}$GMSGFMT" >&6; }
1.8950 -else
1.8951 - { echo "$as_me:$LINENO: result: no" >&5
1.8952 -echo "${ECHO_T}no" >&6; }
1.8953 + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
1.8954 +$as_echo "$GMSGFMT" >&6; }
1.8955 +else
1.8956 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.8957 +$as_echo "no" >&6; }
1.8958 fi
1.8959
1.8960
1.8961 # Extract the first word of "xgettext", so it can be a program name with args.
1.8962 set dummy xgettext; ac_word=$2
1.8963 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1.8964 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1.8965 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1.8966 +$as_echo_n "checking for $ac_word... " >&6; }
1.8967 if test "${ac_cv_path_XGETTEXT+set}" = set; then
1.8968 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.8969 + $as_echo_n "(cached) " >&6
1.8970 else
1.8971 case "$XGETTEXT" in
1.8972 /*)
1.8973 @@ -8530,11 +9910,11 @@
1.8974 fi
1.8975 XGETTEXT="$ac_cv_path_XGETTEXT"
1.8976 if test "$XGETTEXT" != ":"; then
1.8977 - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
1.8978 -echo "${ECHO_T}$XGETTEXT" >&6; }
1.8979 -else
1.8980 - { echo "$as_me:$LINENO: result: no" >&5
1.8981 -echo "${ECHO_T}no" >&6; }
1.8982 + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
1.8983 +$as_echo "$XGETTEXT" >&6; }
1.8984 +else
1.8985 + { $as_echo "$as_me:$LINENO: result: no" >&5
1.8986 +$as_echo "no" >&6; }
1.8987 fi
1.8988
1.8989 cat >conftest.$ac_ext <<_ACEOF
1.8990 @@ -8559,30 +9939,33 @@
1.8991 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.8992 *) ac_try_echo=$ac_try;;
1.8993 esac
1.8994 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.8995 - (eval "$ac_link") 2>conftest.er1
1.8996 - ac_status=$?
1.8997 - grep -v '^ *+' conftest.er1 >conftest.err
1.8998 - rm -f conftest.er1
1.8999 - cat conftest.err >&5
1.9000 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.9001 - (exit $ac_status); } && {
1.9002 - test -z "$ac_c_werror_flag" ||
1.9003 - test ! -s conftest.err
1.9004 - } && test -s conftest$ac_exeext &&
1.9005 - $as_test_x conftest$ac_exeext; then
1.9006 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.9007 +$as_echo "$ac_try_echo") >&5
1.9008 + (eval "$ac_link") 2>conftest.er1
1.9009 + ac_status=$?
1.9010 + grep -v '^ *+' conftest.er1 >conftest.err
1.9011 + rm -f conftest.er1
1.9012 + cat conftest.err >&5
1.9013 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.9014 + (exit $ac_status); } && {
1.9015 + test -z "$ac_c_werror_flag" ||
1.9016 + test ! -s conftest.err
1.9017 + } && test -s conftest$ac_exeext && {
1.9018 + test "$cross_compiling" = yes ||
1.9019 + $as_test_x conftest$ac_exeext
1.9020 + }; then
1.9021 CATOBJEXT=.gmo
1.9022 DATADIRNAME=share
1.9023 else
1.9024 - echo "$as_me: failed program was:" >&5
1.9025 + $as_echo "$as_me: failed program was:" >&5
1.9026 sed 's/^/| /' conftest.$ac_ext >&5
1.9027
1.9028 case $host in
1.9029 *-*-solaris*)
1.9030 - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
1.9031 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
1.9032 + { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
1.9033 +$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
1.9034 if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
1.9035 - echo $ECHO_N "(cached) $ECHO_C" >&6
1.9036 + $as_echo_n "(cached) " >&6
1.9037 else
1.9038 cat >conftest.$ac_ext <<_ACEOF
1.9039 /* confdefs.h. */
1.9040 @@ -8635,31 +10018,35 @@
1.9041 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.9042 *) ac_try_echo=$ac_try;;
1.9043 esac
1.9044 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.9045 - (eval "$ac_link") 2>conftest.er1
1.9046 - ac_status=$?
1.9047 - grep -v '^ *+' conftest.er1 >conftest.err
1.9048 - rm -f conftest.er1
1.9049 - cat conftest.err >&5
1.9050 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.9051 - (exit $ac_status); } && {
1.9052 - test -z "$ac_c_werror_flag" ||
1.9053 - test ! -s conftest.err
1.9054 - } && test -s conftest$ac_exeext &&
1.9055 - $as_test_x conftest$ac_exeext; then
1.9056 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.9057 +$as_echo "$ac_try_echo") >&5
1.9058 + (eval "$ac_link") 2>conftest.er1
1.9059 + ac_status=$?
1.9060 + grep -v '^ *+' conftest.er1 >conftest.err
1.9061 + rm -f conftest.er1
1.9062 + cat conftest.err >&5
1.9063 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.9064 + (exit $ac_status); } && {
1.9065 + test -z "$ac_c_werror_flag" ||
1.9066 + test ! -s conftest.err
1.9067 + } && test -s conftest$ac_exeext && {
1.9068 + test "$cross_compiling" = yes ||
1.9069 + $as_test_x conftest$ac_exeext
1.9070 + }; then
1.9071 ac_cv_func_bind_textdomain_codeset=yes
1.9072 else
1.9073 - echo "$as_me: failed program was:" >&5
1.9074 + $as_echo "$as_me: failed program was:" >&5
1.9075 sed 's/^/| /' conftest.$ac_ext >&5
1.9076
1.9077 ac_cv_func_bind_textdomain_codeset=no
1.9078 fi
1.9079
1.9080 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.9081 - conftest$ac_exeext conftest.$ac_ext
1.9082 -fi
1.9083 -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
1.9084 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
1.9085 +rm -rf conftest.dSYM
1.9086 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.9087 + conftest$ac_exeext conftest.$ac_ext
1.9088 +fi
1.9089 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
1.9090 +$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
1.9091 if test $ac_cv_func_bind_textdomain_codeset = yes; then
1.9092 CATOBJEXT=.gmo
1.9093 DATADIRNAME=share
1.9094 @@ -8676,6 +10063,7 @@
1.9095 esac
1.9096 fi
1.9097
1.9098 +rm -rf conftest.dSYM
1.9099 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.9100 conftest$ac_exeext conftest.$ac_ext
1.9101 LIBS="$glib_save_LIBS"
1.9102 @@ -8701,8 +10089,8 @@
1.9103 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1.9104 : ;
1.9105 else
1.9106 - { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
1.9107 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
1.9108 + { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
1.9109 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
1.9110 XGETTEXT=":"
1.9111 fi
1.9112 fi
1.9113 @@ -8734,8 +10122,8 @@
1.9114 if test "x$ALL_LINGUAS" = "x"; then
1.9115 LINGUAS=
1.9116 else
1.9117 - { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
1.9118 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }
1.9119 + { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
1.9120 +$as_echo_n "checking for catalogs to be installed... " >&6; }
1.9121 NEW_LINGUAS=
1.9122 for presentlang in $ALL_LINGUAS; do
1.9123 useit=no
1.9124 @@ -8759,8 +10147,8 @@
1.9125 fi
1.9126 done
1.9127 LINGUAS=$NEW_LINGUAS
1.9128 - { echo "$as_me:$LINENO: result: $LINGUAS" >&5
1.9129 -echo "${ECHO_T}$LINGUAS" >&6; }
1.9130 + { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
1.9131 +$as_echo "$LINGUAS" >&6; }
1.9132 fi
1.9133
1.9134 if test -n "$LINGUAS"; then
1.9135 @@ -8821,11 +10209,12 @@
1.9136 case $ac_val in #(
1.9137 *${as_nl}*)
1.9138 case $ac_var in #(
1.9139 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
1.9140 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
1.9141 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
1.9142 +$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
1.9143 esac
1.9144 case $ac_var in #(
1.9145 _ | IFS | as_nl) ;; #(
1.9146 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1.9147 *) $as_unset $ac_var ;;
1.9148 esac ;;
1.9149 esac
1.9150 @@ -8858,12 +10247,12 @@
1.9151 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
1.9152 if test -w "$cache_file"; then
1.9153 test "x$cache_file" != "x/dev/null" &&
1.9154 - { echo "$as_me:$LINENO: updating cache $cache_file" >&5
1.9155 -echo "$as_me: updating cache $cache_file" >&6;}
1.9156 + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
1.9157 +$as_echo "$as_me: updating cache $cache_file" >&6;}
1.9158 cat confcache >$cache_file
1.9159 else
1.9160 - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
1.9161 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
1.9162 + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
1.9163 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
1.9164 fi
1.9165 fi
1.9166 rm -f confcache
1.9167 @@ -8879,7 +10268,7 @@
1.9168 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
1.9169 # 1. Remove the extension, and $U if already installed.
1.9170 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
1.9171 - ac_i=`echo "$ac_i" | sed "$ac_script"`
1.9172 + ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
1.9173 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
1.9174 # will be set to the directory where LIBOBJS objects are built.
1.9175 ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
1.9176 @@ -8891,124 +10280,146 @@
1.9177
1.9178
1.9179 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
1.9180 - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
1.9181 -Usually this means the macro was only invoked conditionally." >&5
1.9182 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
1.9183 + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
1.9184 +Usually this means the macro was only invoked conditionally." >&5
1.9185 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
1.9186 Usually this means the macro was only invoked conditionally." >&2;}
1.9187 { (exit 1); exit 1; }; }
1.9188 fi
1.9189 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
1.9190 - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
1.9191 -Usually this means the macro was only invoked conditionally." >&5
1.9192 -echo "$as_me: error: conditional \"AMDEP\" was never defined.
1.9193 + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
1.9194 +Usually this means the macro was only invoked conditionally." >&5
1.9195 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
1.9196 Usually this means the macro was only invoked conditionally." >&2;}
1.9197 { (exit 1); exit 1; }; }
1.9198 fi
1.9199 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
1.9200 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
1.9201 -Usually this means the macro was only invoked conditionally." >&5
1.9202 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
1.9203 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
1.9204 +Usually this means the macro was only invoked conditionally." >&5
1.9205 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
1.9206 Usually this means the macro was only invoked conditionally." >&2;}
1.9207 { (exit 1); exit 1; }; }
1.9208 fi
1.9209 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
1.9210 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
1.9211 -Usually this means the macro was only invoked conditionally." >&5
1.9212 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
1.9213 -Usually this means the macro was only invoked conditionally." >&2;}
1.9214 - { (exit 1); exit 1; }; }
1.9215 -fi
1.9216 -if test -z "${OSMESA_DRIVER_TRUE}" && test -z "${OSMESA_DRIVER_FALSE}"; then
1.9217 - { { echo "$as_me:$LINENO: error: conditional \"OSMESA_DRIVER\" was never defined.
1.9218 -Usually this means the macro was only invoked conditionally." >&5
1.9219 -echo "$as_me: error: conditional \"OSMESA_DRIVER\" was never defined.
1.9220 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
1.9221 +Usually this means the macro was only invoked conditionally." >&5
1.9222 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
1.9223 +Usually this means the macro was only invoked conditionally." >&2;}
1.9224 + { (exit 1); exit 1; }; }
1.9225 +fi
1.9226 +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
1.9227 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
1.9228 +Usually this means the macro was only invoked conditionally." >&5
1.9229 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
1.9230 Usually this means the macro was only invoked conditionally." >&2;}
1.9231 { (exit 1); exit 1; }; }
1.9232 fi
1.9233 if test -z "${GUI_CARBON_TRUE}" && test -z "${GUI_CARBON_FALSE}"; then
1.9234 - { { echo "$as_me:$LINENO: error: conditional \"GUI_CARBON\" was never defined.
1.9235 -Usually this means the macro was only invoked conditionally." >&5
1.9236 -echo "$as_me: error: conditional \"GUI_CARBON\" was never defined.
1.9237 + { { $as_echo "$as_me:$LINENO: error: conditional \"GUI_CARBON\" was never defined.
1.9238 +Usually this means the macro was only invoked conditionally." >&5
1.9239 +$as_echo "$as_me: error: conditional \"GUI_CARBON\" was never defined.
1.9240 Usually this means the macro was only invoked conditionally." >&2;}
1.9241 { (exit 1); exit 1; }; }
1.9242 fi
1.9243 if test -z "${GUI_GTK_TRUE}" && test -z "${GUI_GTK_FALSE}"; then
1.9244 - { { echo "$as_me:$LINENO: error: conditional \"GUI_GTK\" was never defined.
1.9245 -Usually this means the macro was only invoked conditionally." >&5
1.9246 -echo "$as_me: error: conditional \"GUI_GTK\" was never defined.
1.9247 + { { $as_echo "$as_me:$LINENO: error: conditional \"GUI_GTK\" was never defined.
1.9248 +Usually this means the macro was only invoked conditionally." >&5
1.9249 +$as_echo "$as_me: error: conditional \"GUI_GTK\" was never defined.
1.9250 +Usually this means the macro was only invoked conditionally." >&2;}
1.9251 + { (exit 1); exit 1; }; }
1.9252 +fi
1.9253 +if test -z "${VIDEO_OSMESA_TRUE}" && test -z "${VIDEO_OSMESA_FALSE}"; then
1.9254 + { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_OSMESA\" was never defined.
1.9255 +Usually this means the macro was only invoked conditionally." >&5
1.9256 +$as_echo "$as_me: error: conditional \"VIDEO_OSMESA\" was never defined.
1.9257 +Usually this means the macro was only invoked conditionally." >&2;}
1.9258 + { (exit 1); exit 1; }; }
1.9259 +fi
1.9260 +if test -z "${VIDEO_GLX_TRUE}" && test -z "${VIDEO_GLX_FALSE}"; then
1.9261 + { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_GLX\" was never defined.
1.9262 +Usually this means the macro was only invoked conditionally." >&5
1.9263 +$as_echo "$as_me: error: conditional \"VIDEO_GLX\" was never defined.
1.9264 +Usually this means the macro was only invoked conditionally." >&2;}
1.9265 + { (exit 1); exit 1; }; }
1.9266 +fi
1.9267 +if test -z "${VIDEO_NSGL_TRUE}" && test -z "${VIDEO_NSGL_FALSE}"; then
1.9268 + { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_NSGL\" was never defined.
1.9269 +Usually this means the macro was only invoked conditionally." >&5
1.9270 +$as_echo "$as_me: error: conditional \"VIDEO_NSGL\" was never defined.
1.9271 Usually this means the macro was only invoked conditionally." >&2;}
1.9272 { (exit 1); exit 1; }; }
1.9273 fi
1.9274 if test -z "${BUILD_SH4X86_TRUE}" && test -z "${BUILD_SH4X86_FALSE}"; then
1.9275 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_SH4X86\" was never defined.
1.9276 -Usually this means the macro was only invoked conditionally." >&5
1.9277 -echo "$as_me: error: conditional \"BUILD_SH4X86\" was never defined.
1.9278 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SH4X86\" was never defined.
1.9279 +Usually this means the macro was only invoked conditionally." >&5
1.9280 +$as_echo "$as_me: error: conditional \"BUILD_SH4X86\" was never defined.
1.9281 Usually this means the macro was only invoked conditionally." >&2;}
1.9282 { (exit 1); exit 1; }; }
1.9283 fi
1.9284 if test -z "${BUILD_X86_64_TRUE}" && test -z "${BUILD_X86_64_FALSE}"; then
1.9285 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_X86_64\" was never defined.
1.9286 -Usually this means the macro was only invoked conditionally." >&5
1.9287 -echo "$as_me: error: conditional \"BUILD_X86_64\" was never defined.
1.9288 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_X86_64\" was never defined.
1.9289 +Usually this means the macro was only invoked conditionally." >&5
1.9290 +$as_echo "$as_me: error: conditional \"BUILD_X86_64\" was never defined.
1.9291 Usually this means the macro was only invoked conditionally." >&2;}
1.9292 { (exit 1); exit 1; }; }
1.9293 fi
1.9294 if test -z "${AUDIO_PULSE_TRUE}" && test -z "${AUDIO_PULSE_FALSE}"; then
1.9295 - { { echo "$as_me:$LINENO: error: conditional \"AUDIO_PULSE\" was never defined.
1.9296 -Usually this means the macro was only invoked conditionally." >&5
1.9297 -echo "$as_me: error: conditional \"AUDIO_PULSE\" was never defined.
1.9298 + { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_PULSE\" was never defined.
1.9299 +Usually this means the macro was only invoked conditionally." >&5
1.9300 +$as_echo "$as_me: error: conditional \"AUDIO_PULSE\" was never defined.
1.9301 Usually this means the macro was only invoked conditionally." >&2;}
1.9302 { (exit 1); exit 1; }; }
1.9303 fi
1.9304 if test -z "${AUDIO_ESOUND_TRUE}" && test -z "${AUDIO_ESOUND_FALSE}"; then
1.9305 - { { echo "$as_me:$LINENO: error: conditional \"AUDIO_ESOUND\" was never defined.
1.9306 -Usually this means the macro was only invoked conditionally." >&5
1.9307 -echo "$as_me: error: conditional \"AUDIO_ESOUND\" was never defined.
1.9308 + { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_ESOUND\" was never defined.
1.9309 +Usually this means the macro was only invoked conditionally." >&5
1.9310 +$as_echo "$as_me: error: conditional \"AUDIO_ESOUND\" was never defined.
1.9311 Usually this means the macro was only invoked conditionally." >&2;}
1.9312 { (exit 1); exit 1; }; }
1.9313 fi
1.9314 if test -z "${AUDIO_ALSA_TRUE}" && test -z "${AUDIO_ALSA_FALSE}"; then
1.9315 - { { echo "$as_me:$LINENO: error: conditional \"AUDIO_ALSA\" was never defined.
1.9316 -Usually this means the macro was only invoked conditionally." >&5
1.9317 -echo "$as_me: error: conditional \"AUDIO_ALSA\" was never defined.
1.9318 + { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_ALSA\" was never defined.
1.9319 +Usually this means the macro was only invoked conditionally." >&5
1.9320 +$as_echo "$as_me: error: conditional \"AUDIO_ALSA\" was never defined.
1.9321 Usually this means the macro was only invoked conditionally." >&2;}
1.9322 { (exit 1); exit 1; }; }
1.9323 fi
1.9324 if test -z "${CDROM_LINUX_TRUE}" && test -z "${CDROM_LINUX_FALSE}"; then
1.9325 - { { echo "$as_me:$LINENO: error: conditional \"CDROM_LINUX\" was never defined.
1.9326 -Usually this means the macro was only invoked conditionally." >&5
1.9327 -echo "$as_me: error: conditional \"CDROM_LINUX\" was never defined.
1.9328 + { { $as_echo "$as_me:$LINENO: error: conditional \"CDROM_LINUX\" was never defined.
1.9329 +Usually this means the macro was only invoked conditionally." >&5
1.9330 +$as_echo "$as_me: error: conditional \"CDROM_LINUX\" was never defined.
1.9331 Usually this means the macro was only invoked conditionally." >&2;}
1.9332 { (exit 1); exit 1; }; }
1.9333 fi
1.9334 if test -z "${JOY_LINUX_TRUE}" && test -z "${JOY_LINUX_FALSE}"; then
1.9335 - { { echo "$as_me:$LINENO: error: conditional \"JOY_LINUX\" was never defined.
1.9336 -Usually this means the macro was only invoked conditionally." >&5
1.9337 -echo "$as_me: error: conditional \"JOY_LINUX\" was never defined.
1.9338 + { { $as_echo "$as_me:$LINENO: error: conditional \"JOY_LINUX\" was never defined.
1.9339 +Usually this means the macro was only invoked conditionally." >&5
1.9340 +$as_echo "$as_me: error: conditional \"JOY_LINUX\" was never defined.
1.9341 Usually this means the macro was only invoked conditionally." >&2;}
1.9342 { (exit 1); exit 1; }; }
1.9343 fi
1.9344 if test -z "${BUILD_SYSTEST_TRUE}" && test -z "${BUILD_SYSTEST_FALSE}"; then
1.9345 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_SYSTEST\" was never defined.
1.9346 -Usually this means the macro was only invoked conditionally." >&5
1.9347 -echo "$as_me: error: conditional \"BUILD_SYSTEST\" was never defined.
1.9348 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SYSTEST\" was never defined.
1.9349 +Usually this means the macro was only invoked conditionally." >&5
1.9350 +$as_echo "$as_me: error: conditional \"BUILD_SYSTEST\" was never defined.
1.9351 Usually this means the macro was only invoked conditionally." >&2;}
1.9352 { (exit 1); exit 1; }; }
1.9353 fi
1.9354 if test -z "${BUILD_ARMTEST_TRUE}" && test -z "${BUILD_ARMTEST_FALSE}"; then
1.9355 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_ARMTEST\" was never defined.
1.9356 -Usually this means the macro was only invoked conditionally." >&5
1.9357 -echo "$as_me: error: conditional \"BUILD_ARMTEST\" was never defined.
1.9358 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ARMTEST\" was never defined.
1.9359 +Usually this means the macro was only invoked conditionally." >&5
1.9360 +$as_echo "$as_me: error: conditional \"BUILD_ARMTEST\" was never defined.
1.9361 Usually this means the macro was only invoked conditionally." >&2;}
1.9362 { (exit 1); exit 1; }; }
1.9363 fi
1.9364
1.9365 : ${CONFIG_STATUS=./config.status}
1.9366 +ac_write_fail=0
1.9367 ac_clean_files_save=$ac_clean_files
1.9368 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
1.9369 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
1.9370 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
1.9371 -cat >$CONFIG_STATUS <<_ACEOF
1.9372 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
1.9373 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
1.9374 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.9375 #! $SHELL
1.9376 # Generated by $as_me.
1.9377 # Run this file to recreate the current configuration.
1.9378 @@ -9021,7 +10432,7 @@
1.9379 SHELL=\${CONFIG_SHELL-$SHELL}
1.9380 _ACEOF
1.9381
1.9382 -cat >>$CONFIG_STATUS <<\_ACEOF
1.9383 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.9384 ## --------------------- ##
1.9385 ## M4sh Initialization. ##
1.9386 ## --------------------- ##
1.9387 @@ -9031,7 +10442,7 @@
1.9388 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1.9389 emulate sh
1.9390 NULLCMD=:
1.9391 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
1.9392 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1.9393 # is contrary to our usage. Disable this feature.
1.9394 alias -g '${1+"$@"}'='"$@"'
1.9395 setopt NO_GLOB_SUBST
1.9396 @@ -9053,17 +10464,45 @@
1.9397 as_cr_digits='0123456789'
1.9398 as_cr_alnum=$as_cr_Letters$as_cr_digits
1.9399
1.9400 +as_nl='
1.9401 +'
1.9402 +export as_nl
1.9403 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
1.9404 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1.9405 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
1.9406 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
1.9407 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1.9408 + as_echo='printf %s\n'
1.9409 + as_echo_n='printf %s'
1.9410 +else
1.9411 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
1.9412 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
1.9413 + as_echo_n='/usr/ucb/echo -n'
1.9414 + else
1.9415 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
1.9416 + as_echo_n_body='eval
1.9417 + arg=$1;
1.9418 + case $arg in
1.9419 + *"$as_nl"*)
1.9420 + expr "X$arg" : "X\\(.*\\)$as_nl";
1.9421 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
1.9422 + esac;
1.9423 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
1.9424 + '
1.9425 + export as_echo_n_body
1.9426 + as_echo_n='sh -c $as_echo_n_body as_echo'
1.9427 + fi
1.9428 + export as_echo_body
1.9429 + as_echo='sh -c $as_echo_body as_echo'
1.9430 +fi
1.9431 +
1.9432 # The user is always right.
1.9433 if test "${PATH_SEPARATOR+set}" != set; then
1.9434 - echo "#! /bin/sh" >conf$$.sh
1.9435 - echo "exit 0" >>conf$$.sh
1.9436 - chmod +x conf$$.sh
1.9437 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
1.9438 - PATH_SEPARATOR=';'
1.9439 - else
1.9440 - PATH_SEPARATOR=:
1.9441 - fi
1.9442 - rm -f conf$$.sh
1.9443 + PATH_SEPARATOR=:
1.9444 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
1.9445 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
1.9446 + PATH_SEPARATOR=';'
1.9447 + }
1.9448 fi
1.9449
1.9450 # Support unset when possible.
1.9451 @@ -9079,8 +10518,6 @@
1.9452 # there to prevent editors from complaining about space-tab.
1.9453 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
1.9454 # splitting by setting IFS to empty value.)
1.9455 -as_nl='
1.9456 -'
1.9457 IFS=" "" $as_nl"
1.9458
1.9459 # Find who we are. Look in the path if we contain no directory separator.
1.9460 @@ -9103,7 +10540,7 @@
1.9461 as_myself=$0
1.9462 fi
1.9463 if test ! -f "$as_myself"; then
1.9464 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1.9465 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1.9466 { (exit 1); exit 1; }
1.9467 fi
1.9468
1.9469 @@ -9116,17 +10553,10 @@
1.9470 PS4='+ '
1.9471
1.9472 # NLS nuisances.
1.9473 -for as_var in \
1.9474 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
1.9475 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
1.9476 - LC_TELEPHONE LC_TIME
1.9477 -do
1.9478 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
1.9479 - eval $as_var=C; export $as_var
1.9480 - else
1.9481 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1.9482 - fi
1.9483 -done
1.9484 +LC_ALL=C
1.9485 +export LC_ALL
1.9486 +LANGUAGE=C
1.9487 +export LANGUAGE
1.9488
1.9489 # Required to use basename.
1.9490 if expr a : '\(a\)' >/dev/null 2>&1 &&
1.9491 @@ -9148,7 +10578,7 @@
1.9492 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1.9493 X"$0" : 'X\(//\)$' \| \
1.9494 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
1.9495 -echo X/"$0" |
1.9496 +$as_echo X/"$0" |
1.9497 sed '/^.*\/\([^/][^/]*\)\/*$/{
1.9498 s//\1/
1.9499 q
1.9500 @@ -9199,7 +10629,7 @@
1.9501 s/-\n.*//
1.9502 ' >$as_me.lineno &&
1.9503 chmod +x "$as_me.lineno" ||
1.9504 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1.9505 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1.9506 { (exit 1); exit 1; }; }
1.9507
1.9508 # Don't try to exec as it changes $[0], causing all sort of problems
1.9509 @@ -9227,7 +10657,6 @@
1.9510 *)
1.9511 ECHO_N='-n';;
1.9512 esac
1.9513 -
1.9514 if expr a : '\(a\)' >/dev/null 2>&1 &&
1.9515 test "X`expr 00001 : '.*\(...\)'`" = X001; then
1.9516 as_expr=expr
1.9517 @@ -9240,19 +10669,22 @@
1.9518 rm -f conf$$.dir/conf$$.file
1.9519 else
1.9520 rm -f conf$$.dir
1.9521 - mkdir conf$$.dir
1.9522 -fi
1.9523 -echo >conf$$.file
1.9524 -if ln -s conf$$.file conf$$ 2>/dev/null; then
1.9525 - as_ln_s='ln -s'
1.9526 - # ... but there are two gotchas:
1.9527 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1.9528 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1.9529 - # In both cases, we have to default to `cp -p'.
1.9530 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1.9531 + mkdir conf$$.dir 2>/dev/null
1.9532 +fi
1.9533 +if (echo >conf$$.file) 2>/dev/null; then
1.9534 + if ln -s conf$$.file conf$$ 2>/dev/null; then
1.9535 + as_ln_s='ln -s'
1.9536 + # ... but there are two gotchas:
1.9537 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1.9538 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1.9539 + # In both cases, we have to default to `cp -p'.
1.9540 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1.9541 + as_ln_s='cp -p'
1.9542 + elif ln conf$$.file conf$$ 2>/dev/null; then
1.9543 + as_ln_s=ln
1.9544 + else
1.9545 as_ln_s='cp -p'
1.9546 -elif ln conf$$.file conf$$ 2>/dev/null; then
1.9547 - as_ln_s=ln
1.9548 + fi
1.9549 else
1.9550 as_ln_s='cp -p'
1.9551 fi
1.9552 @@ -9277,10 +10709,10 @@
1.9553 as_test_x='
1.9554 eval sh -c '\''
1.9555 if test -d "$1"; then
1.9556 - test -d "$1/.";
1.9557 + test -d "$1/.";
1.9558 else
1.9559 case $1 in
1.9560 - -*)set "./$1";;
1.9561 + -*)set "./$1";;
1.9562 esac;
1.9563 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
1.9564 ???[sx]*):;;*)false;;esac;fi
1.9565 @@ -9303,7 +10735,7 @@
1.9566 # values after options handling.
1.9567 ac_log="
1.9568 This file was extended by $as_me, which was
1.9569 -generated by GNU Autoconf 2.61. Invocation command line was
1.9570 +generated by GNU Autoconf 2.62. Invocation command line was
1.9571
1.9572 CONFIG_FILES = $CONFIG_FILES
1.9573 CONFIG_HEADERS = $CONFIG_HEADERS
1.9574 @@ -9316,7 +10748,7 @@
1.9575
1.9576 _ACEOF
1.9577
1.9578 -cat >>$CONFIG_STATUS <<_ACEOF
1.9579 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.9580 # Files that config.status was made for.
1.9581 config_files="$ac_config_files"
1.9582 config_headers="$ac_config_headers"
1.9583 @@ -9324,7 +10756,7 @@
1.9584
1.9585 _ACEOF
1.9586
1.9587 -cat >>$CONFIG_STATUS <<\_ACEOF
1.9588 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.9589 ac_cs_usage="\
1.9590 \`$as_me' instantiates files from templates according to the
1.9591 current configuration.
1.9592 @@ -9337,9 +10769,9 @@
1.9593 -d, --debug don't remove temporary files
1.9594 --recheck update $as_me by reconfiguring in the same conditions
1.9595 --file=FILE[:TEMPLATE]
1.9596 - instantiate the configuration file FILE
1.9597 + instantiate the configuration file FILE
1.9598 --header=FILE[:TEMPLATE]
1.9599 - instantiate the configuration header FILE
1.9600 + instantiate the configuration header FILE
1.9601
1.9602 Configuration files:
1.9603 $config_files
1.9604 @@ -9353,24 +10785,25 @@
1.9605 Report bugs to <bug-autoconf@gnu.org>."
1.9606
1.9607 _ACEOF
1.9608 -cat >>$CONFIG_STATUS <<_ACEOF
1.9609 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.9610 ac_cs_version="\\
1.9611 config.status
1.9612 -configured by $0, generated by GNU Autoconf 2.61,
1.9613 - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1.9614 -
1.9615 -Copyright (C) 2006 Free Software Foundation, Inc.
1.9616 +configured by $0, generated by GNU Autoconf 2.62,
1.9617 + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1.9618 +
1.9619 +Copyright (C) 2008 Free Software Foundation, Inc.
1.9620 This config.status script is free software; the Free Software Foundation
1.9621 gives unlimited permission to copy, distribute and modify it."
1.9622
1.9623 ac_pwd='$ac_pwd'
1.9624 srcdir='$srcdir'
1.9625 INSTALL='$INSTALL'
1.9626 -_ACEOF
1.9627 -
1.9628 -cat >>$CONFIG_STATUS <<\_ACEOF
1.9629 -# If no file are specified by the user, then we need to provide default
1.9630 -# value. By we need to know if files were specified by the user.
1.9631 +AWK='$AWK'
1.9632 +test -n "\$AWK" || AWK=awk
1.9633 +_ACEOF
1.9634 +
1.9635 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.9636 +# The default lists apply if the user does not specify any file.
1.9637 ac_need_defaults=:
1.9638 while test $# != 0
1.9639 do
1.9640 @@ -9392,30 +10825,36 @@
1.9641 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
1.9642 ac_cs_recheck=: ;;
1.9643 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
1.9644 - echo "$ac_cs_version"; exit ;;
1.9645 + $as_echo "$ac_cs_version"; exit ;;
1.9646 --debug | --debu | --deb | --de | --d | -d )
1.9647 debug=: ;;
1.9648 --file | --fil | --fi | --f )
1.9649 $ac_shift
1.9650 - CONFIG_FILES="$CONFIG_FILES $ac_optarg"
1.9651 + case $ac_optarg in
1.9652 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
1.9653 + esac
1.9654 + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
1.9655 ac_need_defaults=false;;
1.9656 --header | --heade | --head | --hea )
1.9657 $ac_shift
1.9658 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
1.9659 + case $ac_optarg in
1.9660 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
1.9661 + esac
1.9662 + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
1.9663 ac_need_defaults=false;;
1.9664 --he | --h)
1.9665 # Conflict between --help and --header
1.9666 - { echo "$as_me: error: ambiguous option: $1
1.9667 + { $as_echo "$as_me: error: ambiguous option: $1
1.9668 Try \`$0 --help' for more information." >&2
1.9669 { (exit 1); exit 1; }; };;
1.9670 --help | --hel | -h )
1.9671 - echo "$ac_cs_usage"; exit ;;
1.9672 + $as_echo "$ac_cs_usage"; exit ;;
1.9673 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1.9674 | -silent | --silent | --silen | --sile | --sil | --si | --s)
1.9675 ac_cs_silent=: ;;
1.9676
1.9677 # This is an error.
1.9678 - -*) { echo "$as_me: error: unrecognized option: $1
1.9679 + -*) { $as_echo "$as_me: error: unrecognized option: $1
1.9680 Try \`$0 --help' for more information." >&2
1.9681 { (exit 1); exit 1; }; } ;;
1.9682
1.9683 @@ -9434,27 +10873,29 @@
1.9684 fi
1.9685
1.9686 _ACEOF
1.9687 -cat >>$CONFIG_STATUS <<_ACEOF
1.9688 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.9689 if \$ac_cs_recheck; then
1.9690 - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
1.9691 - CONFIG_SHELL=$SHELL
1.9692 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
1.9693 + shift
1.9694 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
1.9695 + CONFIG_SHELL='$SHELL'
1.9696 export CONFIG_SHELL
1.9697 - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
1.9698 -fi
1.9699 -
1.9700 -_ACEOF
1.9701 -cat >>$CONFIG_STATUS <<\_ACEOF
1.9702 + exec "\$@"
1.9703 +fi
1.9704 +
1.9705 +_ACEOF
1.9706 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.9707 exec 5>>config.log
1.9708 {
1.9709 echo
1.9710 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
1.9711 ## Running $as_me. ##
1.9712 _ASBOX
1.9713 - echo "$ac_log"
1.9714 + $as_echo "$ac_log"
1.9715 } >&5
1.9716
1.9717 _ACEOF
1.9718 -cat >>$CONFIG_STATUS <<_ACEOF
1.9719 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.9720 #
1.9721 # INIT-COMMANDS
1.9722 #
1.9723 @@ -9463,7 +10904,7 @@
1.9724
1.9725 _ACEOF
1.9726
1.9727 -cat >>$CONFIG_STATUS <<\_ACEOF
1.9728 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.9729
1.9730 # Handling of arguments.
1.9731 for ac_config_target in $ac_config_targets
1.9732 @@ -9477,8 +10918,8 @@
1.9733 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
1.9734 "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
1.9735
1.9736 - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
1.9737 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
1.9738 + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
1.9739 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
1.9740 { (exit 1); exit 1; }; };;
1.9741 esac
1.9742 done
1.9743 @@ -9519,252 +10960,142 @@
1.9744 (umask 077 && mkdir "$tmp")
1.9745 } ||
1.9746 {
1.9747 - echo "$me: cannot create a temporary directory in ." >&2
1.9748 + $as_echo "$as_me: cannot create a temporary directory in ." >&2
1.9749 { (exit 1); exit 1; }
1.9750 }
1.9751
1.9752 -#
1.9753 -# Set up the sed scripts for CONFIG_FILES section.
1.9754 -#
1.9755 -
1.9756 -# No need to generate the scripts if there are no CONFIG_FILES.
1.9757 -# This happens for instance when ./config.status config.h
1.9758 +# Set up the scripts for CONFIG_FILES section.
1.9759 +# No need to generate them if there are no CONFIG_FILES.
1.9760 +# This happens for instance with `./config.status config.h'.
1.9761 if test -n "$CONFIG_FILES"; then
1.9762
1.9763 -_ACEOF
1.9764 -
1.9765 -
1.9766 -
1.9767 +
1.9768 +ac_cr='
1.9769 '
1.9770 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
1.9771 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
1.9772 + ac_cs_awk_cr='\\r'
1.9773 +else
1.9774 + ac_cs_awk_cr=$ac_cr
1.9775 +fi
1.9776 +
1.9777 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
1.9778 +_ACEOF
1.9779 +
1.9780 +
1.9781 +{
1.9782 + echo "cat >conf$$subs.awk <<_ACEOF" &&
1.9783 + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
1.9784 + echo "_ACEOF"
1.9785 +} >conf$$subs.sh ||
1.9786 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1.9787 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
1.9788 + { (exit 1); exit 1; }; }
1.9789 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
1.9790 ac_delim='%!_!# '
1.9791 for ac_last_try in false false false false false :; do
1.9792 - cat >conf$$subs.sed <<_ACEOF
1.9793 -SHELL!$SHELL$ac_delim
1.9794 -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
1.9795 -PACKAGE_NAME!$PACKAGE_NAME$ac_delim
1.9796 -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
1.9797 -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
1.9798 -PACKAGE_STRING!$PACKAGE_STRING$ac_delim
1.9799 -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
1.9800 -exec_prefix!$exec_prefix$ac_delim
1.9801 -prefix!$prefix$ac_delim
1.9802 -program_transform_name!$program_transform_name$ac_delim
1.9803 -bindir!$bindir$ac_delim
1.9804 -sbindir!$sbindir$ac_delim
1.9805 -libexecdir!$libexecdir$ac_delim
1.9806 -datarootdir!$datarootdir$ac_delim
1.9807 -datadir!$datadir$ac_delim
1.9808 -sysconfdir!$sysconfdir$ac_delim
1.9809 -sharedstatedir!$sharedstatedir$ac_delim
1.9810 -localstatedir!$localstatedir$ac_delim
1.9811 -includedir!$includedir$ac_delim
1.9812 -oldincludedir!$oldincludedir$ac_delim
1.9813 -docdir!$docdir$ac_delim
1.9814 -infodir!$infodir$ac_delim
1.9815 -htmldir!$htmldir$ac_delim
1.9816 -dvidir!$dvidir$ac_delim
1.9817 -pdfdir!$pdfdir$ac_delim
1.9818 -psdir!$psdir$ac_delim
1.9819 -libdir!$libdir$ac_delim
1.9820 -localedir!$localedir$ac_delim
1.9821 -mandir!$mandir$ac_delim
1.9822 -DEFS!$DEFS$ac_delim
1.9823 -ECHO_C!$ECHO_C$ac_delim
1.9824 -ECHO_N!$ECHO_N$ac_delim
1.9825 -ECHO_T!$ECHO_T$ac_delim
1.9826 -LIBS!$LIBS$ac_delim
1.9827 -build_alias!$build_alias$ac_delim
1.9828 -host_alias!$host_alias$ac_delim
1.9829 -target_alias!$target_alias$ac_delim
1.9830 -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
1.9831 -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
1.9832 -INSTALL_DATA!$INSTALL_DATA$ac_delim
1.9833 -CYGPATH_W!$CYGPATH_W$ac_delim
1.9834 -PACKAGE!$PACKAGE$ac_delim
1.9835 -VERSION!$VERSION$ac_delim
1.9836 -ACLOCAL!$ACLOCAL$ac_delim
1.9837 -AUTOCONF!$AUTOCONF$ac_delim
1.9838 -AUTOMAKE!$AUTOMAKE$ac_delim
1.9839 -AUTOHEADER!$AUTOHEADER$ac_delim
1.9840 -MAKEINFO!$MAKEINFO$ac_delim
1.9841 -AMTAR!$AMTAR$ac_delim
1.9842 -install_sh!$install_sh$ac_delim
1.9843 -STRIP!$STRIP$ac_delim
1.9844 -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
1.9845 -AWK!$AWK$ac_delim
1.9846 -SET_MAKE!$SET_MAKE$ac_delim
1.9847 -am__leading_dot!$am__leading_dot$ac_delim
1.9848 -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
1.9849 -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
1.9850 -MAINT!$MAINT$ac_delim
1.9851 -CC!$CC$ac_delim
1.9852 -CFLAGS!$CFLAGS$ac_delim
1.9853 -LDFLAGS!$LDFLAGS$ac_delim
1.9854 -CPPFLAGS!$CPPFLAGS$ac_delim
1.9855 -ac_ct_CC!$ac_ct_CC$ac_delim
1.9856 -EXEEXT!$EXEEXT$ac_delim
1.9857 -OBJEXT!$OBJEXT$ac_delim
1.9858 -DEPDIR!$DEPDIR$ac_delim
1.9859 -am__include!$am__include$ac_delim
1.9860 -am__quote!$am__quote$ac_delim
1.9861 -AMDEP_TRUE!$AMDEP_TRUE$ac_delim
1.9862 -AMDEP_FALSE!$AMDEP_FALSE$ac_delim
1.9863 -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
1.9864 -CCDEPMODE!$CCDEPMODE$ac_delim
1.9865 -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
1.9866 -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
1.9867 -CCAS!$CCAS$ac_delim
1.9868 -CCASFLAGS!$CCASFLAGS$ac_delim
1.9869 -CPP!$CPP$ac_delim
1.9870 -GREP!$GREP$ac_delim
1.9871 -EGREP!$EGREP$ac_delim
1.9872 -build!$build$ac_delim
1.9873 -build_cpu!$build_cpu$ac_delim
1.9874 -build_vendor!$build_vendor$ac_delim
1.9875 -build_os!$build_os$ac_delim
1.9876 -host!$host$ac_delim
1.9877 -host_cpu!$host_cpu$ac_delim
1.9878 -host_vendor!$host_vendor$ac_delim
1.9879 -host_os!$host_os$ac_delim
1.9880 -OSMESA_DRIVER_TRUE!$OSMESA_DRIVER_TRUE$ac_delim
1.9881 -OSMESA_DRIVER_FALSE!$OSMESA_DRIVER_FALSE$ac_delim
1.9882 -PKG_CONFIG!$PKG_CONFIG$ac_delim
1.9883 -LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim
1.9884 -LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim
1.9885 -GTK_CFLAGS!$GTK_CFLAGS$ac_delim
1.9886 -GTK_LIBS!$GTK_LIBS$ac_delim
1.9887 -GUI_CARBON_TRUE!$GUI_CARBON_TRUE$ac_delim
1.9888 -GUI_CARBON_FALSE!$GUI_CARBON_FALSE$ac_delim
1.9889 -GUI_GTK_TRUE!$GUI_GTK_TRUE$ac_delim
1.9890 -_ACEOF
1.9891 -
1.9892 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
1.9893 + . ./conf$$subs.sh ||
1.9894 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1.9895 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
1.9896 + { (exit 1); exit 1; }; }
1.9897 +
1.9898 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
1.9899 break
1.9900 elif $ac_last_try; then
1.9901 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1.9902 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
1.9903 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1.9904 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
1.9905 { (exit 1); exit 1; }; }
1.9906 else
1.9907 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
1.9908 fi
1.9909 done
1.9910 -
1.9911 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
1.9912 -if test -n "$ac_eof"; then
1.9913 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
1.9914 - ac_eof=`expr $ac_eof + 1`
1.9915 -fi
1.9916 -
1.9917 -cat >>$CONFIG_STATUS <<_ACEOF
1.9918 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
1.9919 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
1.9920 -_ACEOF
1.9921 -sed '
1.9922 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
1.9923 -s/^/s,@/; s/!/@,|#_!!_#|/
1.9924 -:n
1.9925 -t n
1.9926 -s/'"$ac_delim"'$/,g/; t
1.9927 -s/$/\\/; p
1.9928 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
1.9929 -' >>$CONFIG_STATUS <conf$$subs.sed
1.9930 -rm -f conf$$subs.sed
1.9931 -cat >>$CONFIG_STATUS <<_ACEOF
1.9932 -CEOF$ac_eof
1.9933 -_ACEOF
1.9934 -
1.9935 -
1.9936 -ac_delim='%!_!# '
1.9937 -for ac_last_try in false false false false false :; do
1.9938 - cat >conf$$subs.sed <<_ACEOF
1.9939 -GUI_GTK_FALSE!$GUI_GTK_FALSE$ac_delim
1.9940 -BUILD_SH4X86_TRUE!$BUILD_SH4X86_TRUE$ac_delim
1.9941 -BUILD_SH4X86_FALSE!$BUILD_SH4X86_FALSE$ac_delim
1.9942 -BUILD_X86_64_TRUE!$BUILD_X86_64_TRUE$ac_delim
1.9943 -BUILD_X86_64_FALSE!$BUILD_X86_64_FALSE$ac_delim
1.9944 -PULSE_CFLAGS!$PULSE_CFLAGS$ac_delim
1.9945 -PULSE_LIBS!$PULSE_LIBS$ac_delim
1.9946 -AUDIO_PULSE_TRUE!$AUDIO_PULSE_TRUE$ac_delim
1.9947 -AUDIO_PULSE_FALSE!$AUDIO_PULSE_FALSE$ac_delim
1.9948 -ESOUND_CFLAGS!$ESOUND_CFLAGS$ac_delim
1.9949 -ESOUND_LIBS!$ESOUND_LIBS$ac_delim
1.9950 -AUDIO_ESOUND_TRUE!$AUDIO_ESOUND_TRUE$ac_delim
1.9951 -AUDIO_ESOUND_FALSE!$AUDIO_ESOUND_FALSE$ac_delim
1.9952 -ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
1.9953 -ALSA_LIBS!$ALSA_LIBS$ac_delim
1.9954 -AUDIO_ALSA_TRUE!$AUDIO_ALSA_TRUE$ac_delim
1.9955 -AUDIO_ALSA_FALSE!$AUDIO_ALSA_FALSE$ac_delim
1.9956 -CDROM_LINUX_TRUE!$CDROM_LINUX_TRUE$ac_delim
1.9957 -CDROM_LINUX_FALSE!$CDROM_LINUX_FALSE$ac_delim
1.9958 -JOY_LINUX_TRUE!$JOY_LINUX_TRUE$ac_delim
1.9959 -JOY_LINUX_FALSE!$JOY_LINUX_FALSE$ac_delim
1.9960 -SHCC!$SHCC$ac_delim
1.9961 -SHLD!$SHLD$ac_delim
1.9962 -SHOBJCOPY!$SHOBJCOPY$ac_delim
1.9963 -ARMCC!$ARMCC$ac_delim
1.9964 -ARMLD!$ARMLD$ac_delim
1.9965 -ARMOBJCOPY!$ARMOBJCOPY$ac_delim
1.9966 -BUILD_SYSTEST_TRUE!$BUILD_SYSTEST_TRUE$ac_delim
1.9967 -BUILD_SYSTEST_FALSE!$BUILD_SYSTEST_FALSE$ac_delim
1.9968 -BUILD_ARMTEST_TRUE!$BUILD_ARMTEST_TRUE$ac_delim
1.9969 -BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim
1.9970 -GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
1.9971 -USE_NLS!$USE_NLS$ac_delim
1.9972 -MSGFMT!$MSGFMT$ac_delim
1.9973 -MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
1.9974 -GMSGFMT!$GMSGFMT$ac_delim
1.9975 -XGETTEXT!$XGETTEXT$ac_delim
1.9976 -CATALOGS!$CATALOGS$ac_delim
1.9977 -CATOBJEXT!$CATOBJEXT$ac_delim
1.9978 -DATADIRNAME!$DATADIRNAME$ac_delim
1.9979 -GMOFILES!$GMOFILES$ac_delim
1.9980 -INSTOBJEXT!$INSTOBJEXT$ac_delim
1.9981 -INTLLIBS!$INTLLIBS$ac_delim
1.9982 -PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
1.9983 -PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
1.9984 -POFILES!$POFILES$ac_delim
1.9985 -POSUB!$POSUB$ac_delim
1.9986 -MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
1.9987 -LIBOBJS!$LIBOBJS$ac_delim
1.9988 -LTLIBOBJS!$LTLIBOBJS$ac_delim
1.9989 -_ACEOF
1.9990 -
1.9991 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
1.9992 - break
1.9993 - elif $ac_last_try; then
1.9994 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1.9995 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
1.9996 - { (exit 1); exit 1; }; }
1.9997 - else
1.9998 - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
1.9999 - fi
1.10000 -done
1.10001 -
1.10002 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
1.10003 -if test -n "$ac_eof"; then
1.10004 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
1.10005 - ac_eof=`expr $ac_eof + 1`
1.10006 -fi
1.10007 -
1.10008 -cat >>$CONFIG_STATUS <<_ACEOF
1.10009 -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
1.10010 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
1.10011 -_ACEOF
1.10012 -sed '
1.10013 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
1.10014 -s/^/s,@/; s/!/@,|#_!!_#|/
1.10015 -:n
1.10016 -t n
1.10017 -s/'"$ac_delim"'$/,g/; t
1.10018 -s/$/\\/; p
1.10019 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
1.10020 -' >>$CONFIG_STATUS <conf$$subs.sed
1.10021 -rm -f conf$$subs.sed
1.10022 -cat >>$CONFIG_STATUS <<_ACEOF
1.10023 -:end
1.10024 -s/|#_!!_#|//g
1.10025 -CEOF$ac_eof
1.10026 -_ACEOF
1.10027 -
1.10028 +rm -f conf$$subs.sh
1.10029 +
1.10030 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.10031 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
1.10032 +_ACEOF
1.10033 +sed -n '
1.10034 +h
1.10035 +s/^/S["/; s/!.*/"]=/
1.10036 +p
1.10037 +g
1.10038 +s/^[^!]*!//
1.10039 +:repl
1.10040 +t repl
1.10041 +s/'"$ac_delim"'$//
1.10042 +t delim
1.10043 +:nl
1.10044 +h
1.10045 +s/\(.\{148\}\).*/\1/
1.10046 +t more1
1.10047 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
1.10048 +p
1.10049 +n
1.10050 +b repl
1.10051 +:more1
1.10052 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
1.10053 +p
1.10054 +g
1.10055 +s/.\{148\}//
1.10056 +t nl
1.10057 +:delim
1.10058 +h
1.10059 +s/\(.\{148\}\).*/\1/
1.10060 +t more2
1.10061 +s/["\\]/\\&/g; s/^/"/; s/$/"/
1.10062 +p
1.10063 +b
1.10064 +:more2
1.10065 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
1.10066 +p
1.10067 +g
1.10068 +s/.\{148\}//
1.10069 +t delim
1.10070 +' <conf$$subs.awk | sed '
1.10071 +/^[^""]/{
1.10072 + N
1.10073 + s/\n//
1.10074 +}
1.10075 +' >>$CONFIG_STATUS || ac_write_fail=1
1.10076 +rm -f conf$$subs.awk
1.10077 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.10078 +_ACAWK
1.10079 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
1.10080 + for (key in S) S_is_set[key] = 1
1.10081 + FS = ""
1.10082 +
1.10083 +}
1.10084 +{
1.10085 + line = $ 0
1.10086 + nfields = split(line, field, "@")
1.10087 + substed = 0
1.10088 + len = length(field[1])
1.10089 + for (i = 2; i < nfields; i++) {
1.10090 + key = field[i]
1.10091 + keylen = length(key)
1.10092 + if (S_is_set[key]) {
1.10093 + value = S[key]
1.10094 + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
1.10095 + len += length(value) + length(field[++i])
1.10096 + substed = 1
1.10097 + } else
1.10098 + len += 1 + keylen
1.10099 + }
1.10100 +
1.10101 + print line
1.10102 +}
1.10103 +
1.10104 +_ACAWK
1.10105 +_ACEOF
1.10106 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.10107 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
1.10108 + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
1.10109 +else
1.10110 + cat
1.10111 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
1.10112 + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
1.10113 +$as_echo "$as_me: error: could not setup config files machinery" >&2;}
1.10114 + { (exit 1); exit 1; }; }
1.10115 +_ACEOF
1.10116
1.10117 # VPATH may cause trouble with some makes, so we remove $(srcdir),
1.10118 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
1.10119 @@ -9781,19 +11112,133 @@
1.10120 }'
1.10121 fi
1.10122
1.10123 -cat >>$CONFIG_STATUS <<\_ACEOF
1.10124 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.10125 fi # test -n "$CONFIG_FILES"
1.10126
1.10127 -
1.10128 -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
1.10129 +# Set up the scripts for CONFIG_HEADERS section.
1.10130 +# No need to generate them if there are no CONFIG_HEADERS.
1.10131 +# This happens for instance with `./config.status Makefile'.
1.10132 +if test -n "$CONFIG_HEADERS"; then
1.10133 +cat >"$tmp/defines.awk" <<\_ACAWK ||
1.10134 +BEGIN {
1.10135 +_ACEOF
1.10136 +
1.10137 +# Transform confdefs.h into an awk script `defines.awk', embedded as
1.10138 +# here-document in config.status, that substitutes the proper values into
1.10139 +# config.h.in to produce config.h.
1.10140 +
1.10141 +# Create a delimiter string that does not exist in confdefs.h, to ease
1.10142 +# handling of long lines.
1.10143 +ac_delim='%!_!# '
1.10144 +for ac_last_try in false false :; do
1.10145 + ac_t=`sed -n "/$ac_delim/p" confdefs.h`
1.10146 + if test -z "$ac_t"; then
1.10147 + break
1.10148 + elif $ac_last_try; then
1.10149 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
1.10150 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
1.10151 + { (exit 1); exit 1; }; }
1.10152 + else
1.10153 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
1.10154 + fi
1.10155 +done
1.10156 +
1.10157 +# For the awk script, D is an array of macro values keyed by name,
1.10158 +# likewise P contains macro parameters if any. Preserve backslash
1.10159 +# newline sequences.
1.10160 +
1.10161 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
1.10162 +sed -n '
1.10163 +s/.\{148\}/&'"$ac_delim"'/g
1.10164 +t rset
1.10165 +:rset
1.10166 +s/^[ ]*#[ ]*define[ ][ ]*/ /
1.10167 +t def
1.10168 +d
1.10169 +:def
1.10170 +s/\\$//
1.10171 +t bsnl
1.10172 +s/["\\]/\\&/g
1.10173 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
1.10174 +D["\1"]=" \3"/p
1.10175 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
1.10176 +d
1.10177 +:bsnl
1.10178 +s/["\\]/\\&/g
1.10179 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
1.10180 +D["\1"]=" \3\\\\\\n"\\/p
1.10181 +t cont
1.10182 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
1.10183 +t cont
1.10184 +d
1.10185 +:cont
1.10186 +n
1.10187 +s/.\{148\}/&'"$ac_delim"'/g
1.10188 +t clear
1.10189 +:clear
1.10190 +s/\\$//
1.10191 +t bsnlc
1.10192 +s/["\\]/\\&/g; s/^/"/; s/$/"/p
1.10193 +d
1.10194 +:bsnlc
1.10195 +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
1.10196 +b cont
1.10197 +' <confdefs.h | sed '
1.10198 +s/'"$ac_delim"'/"\\\
1.10199 +"/g' >>$CONFIG_STATUS || ac_write_fail=1
1.10200 +
1.10201 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.10202 + for (key in D) D_is_set[key] = 1
1.10203 + FS = ""
1.10204 +}
1.10205 +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
1.10206 + line = \$ 0
1.10207 + split(line, arg, " ")
1.10208 + if (arg[1] == "#") {
1.10209 + defundef = arg[2]
1.10210 + mac1 = arg[3]
1.10211 + } else {
1.10212 + defundef = substr(arg[1], 2)
1.10213 + mac1 = arg[2]
1.10214 + }
1.10215 + split(mac1, mac2, "(") #)
1.10216 + macro = mac2[1]
1.10217 + if (D_is_set[macro]) {
1.10218 + # Preserve the white space surrounding the "#".
1.10219 + prefix = substr(line, 1, index(line, defundef) - 1)
1.10220 + print prefix "define", macro P[macro] D[macro]
1.10221 + next
1.10222 + } else {
1.10223 + # Replace #undef with comments. This is necessary, for example,
1.10224 + # in the case of _POSIX_SOURCE, which is predefined and required
1.10225 + # on some systems where configure will not decide to define it.
1.10226 + if (defundef == "undef") {
1.10227 + print "/*", line, "*/"
1.10228 + next
1.10229 + }
1.10230 + }
1.10231 +}
1.10232 +{ print }
1.10233 +_ACAWK
1.10234 +_ACEOF
1.10235 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.10236 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
1.10237 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
1.10238 + { (exit 1); exit 1; }; }
1.10239 +fi # test -n "$CONFIG_HEADERS"
1.10240 +
1.10241 +
1.10242 +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
1.10243 +shift
1.10244 +for ac_tag
1.10245 do
1.10246 case $ac_tag in
1.10247 :[FHLC]) ac_mode=$ac_tag; continue;;
1.10248 esac
1.10249 case $ac_mode$ac_tag in
1.10250 :[FHL]*:*);;
1.10251 - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
1.10252 -echo "$as_me: error: Invalid tag $ac_tag." >&2;}
1.10253 + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
1.10254 +$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
1.10255 { (exit 1); exit 1; }; };;
1.10256 :[FH]-) ac_tag=-:-;;
1.10257 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
1.10258 @@ -9822,26 +11267,38 @@
1.10259 [\\/$]*) false;;
1.10260 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
1.10261 esac ||
1.10262 - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
1.10263 -echo "$as_me: error: cannot find input file: $ac_f" >&2;}
1.10264 + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
1.10265 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
1.10266 { (exit 1); exit 1; }; };;
1.10267 esac
1.10268 - ac_file_inputs="$ac_file_inputs $ac_f"
1.10269 + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
1.10270 + ac_file_inputs="$ac_file_inputs '$ac_f'"
1.10271 done
1.10272
1.10273 # Let's still pretend it is `configure' which instantiates (i.e., don't
1.10274 # use $as_me), people would be surprised to read:
1.10275 # /* config.h. Generated by config.status. */
1.10276 - configure_input="Generated from "`IFS=:
1.10277 - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
1.10278 + configure_input='Generated from '`
1.10279 + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
1.10280 + `' by configure.'
1.10281 if test x"$ac_file" != x-; then
1.10282 configure_input="$ac_file. $configure_input"
1.10283 - { echo "$as_me:$LINENO: creating $ac_file" >&5
1.10284 -echo "$as_me: creating $ac_file" >&6;}
1.10285 - fi
1.10286 + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
1.10287 +$as_echo "$as_me: creating $ac_file" >&6;}
1.10288 + fi
1.10289 + # Neutralize special characters interpreted by sed in replacement strings.
1.10290 + case $configure_input in #(
1.10291 + *\&* | *\|* | *\\* )
1.10292 + ac_sed_conf_input=`$as_echo "$configure_input" |
1.10293 + sed 's/[\\\\&|]/\\\\&/g'`;; #(
1.10294 + *) ac_sed_conf_input=$configure_input;;
1.10295 + esac
1.10296
1.10297 case $ac_tag in
1.10298 - *:-:* | *:-) cat >"$tmp/stdin";;
1.10299 + *:-:* | *:-) cat >"$tmp/stdin" \
1.10300 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
1.10301 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
1.10302 + { (exit 1); exit 1; }; } ;;
1.10303 esac
1.10304 ;;
1.10305 esac
1.10306 @@ -9851,7 +11308,7 @@
1.10307 X"$ac_file" : 'X\(//\)[^/]' \| \
1.10308 X"$ac_file" : 'X\(//\)$' \| \
1.10309 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
1.10310 -echo X"$ac_file" |
1.10311 +$as_echo X"$ac_file" |
1.10312 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.10313 s//\1/
1.10314 q
1.10315 @@ -9877,7 +11334,7 @@
1.10316 as_dirs=
1.10317 while :; do
1.10318 case $as_dir in #(
1.10319 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
1.10320 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
1.10321 *) as_qdir=$as_dir;;
1.10322 esac
1.10323 as_dirs="'$as_qdir' $as_dirs"
1.10324 @@ -9886,7 +11343,7 @@
1.10325 X"$as_dir" : 'X\(//\)[^/]' \| \
1.10326 X"$as_dir" : 'X\(//\)$' \| \
1.10327 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
1.10328 -echo X"$as_dir" |
1.10329 +$as_echo X"$as_dir" |
1.10330 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.10331 s//\1/
1.10332 q
1.10333 @@ -9907,17 +11364,17 @@
1.10334 test -d "$as_dir" && break
1.10335 done
1.10336 test -z "$as_dirs" || eval "mkdir $as_dirs"
1.10337 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
1.10338 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
1.10339 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
1.10340 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
1.10341 { (exit 1); exit 1; }; }; }
1.10342 ac_builddir=.
1.10343
1.10344 case "$ac_dir" in
1.10345 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1.10346 *)
1.10347 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
1.10348 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
1.10349 # A ".." for each directory in $ac_dir_suffix.
1.10350 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
1.10351 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
1.10352 case $ac_top_builddir_sub in
1.10353 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
1.10354 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
1.10355 @@ -9957,12 +11414,13 @@
1.10356 esac
1.10357 _ACEOF
1.10358
1.10359 -cat >>$CONFIG_STATUS <<\_ACEOF
1.10360 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.10361 # If the template does not know about datarootdir, expand it.
1.10362 # FIXME: This hack should be removed a few years after 2.60.
1.10363 ac_datarootdir_hack=; ac_datarootdir_seen=
1.10364
1.10365 -case `sed -n '/datarootdir/ {
1.10366 +ac_sed_dataroot='
1.10367 +/datarootdir/ {
1.10368 p
1.10369 q
1.10370 }
1.10371 @@ -9971,13 +11429,14 @@
1.10372 /@infodir@/p
1.10373 /@localedir@/p
1.10374 /@mandir@/p
1.10375 -' $ac_file_inputs` in
1.10376 +'
1.10377 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
1.10378 *datarootdir*) ac_datarootdir_seen=yes;;
1.10379 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
1.10380 - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
1.10381 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
1.10382 -_ACEOF
1.10383 -cat >>$CONFIG_STATUS <<_ACEOF
1.10384 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
1.10385 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
1.10386 +_ACEOF
1.10387 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.10388 ac_datarootdir_hack='
1.10389 s&@datadir@&$datadir&g
1.10390 s&@docdir@&$docdir&g
1.10391 @@ -9991,15 +11450,16 @@
1.10392 # Neutralize VPATH when `$srcdir' = `.'.
1.10393 # Shell code in configure.ac might set extrasub.
1.10394 # FIXME: do we really want to maintain this feature?
1.10395 -cat >>$CONFIG_STATUS <<_ACEOF
1.10396 - sed "$ac_vpsub
1.10397 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.10398 +ac_sed_extra="$ac_vpsub
1.10399 $extrasub
1.10400 _ACEOF
1.10401 -cat >>$CONFIG_STATUS <<\_ACEOF
1.10402 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1.10403 :t
1.10404 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
1.10405 -s&@configure_input@&$configure_input&;t t
1.10406 +s|@configure_input@|$ac_sed_conf_input|;t t
1.10407 s&@top_builddir@&$ac_top_builddir_sub&;t t
1.10408 +s&@top_build_prefix@&$ac_top_build_prefix&;t t
1.10409 s&@srcdir@&$ac_srcdir&;t t
1.10410 s&@abs_srcdir@&$ac_abs_srcdir&;t t
1.10411 s&@top_srcdir@&$ac_top_srcdir&;t t
1.10412 @@ -10009,135 +11469,74 @@
1.10413 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
1.10414 s&@INSTALL@&$ac_INSTALL&;t t
1.10415 $ac_datarootdir_hack
1.10416 -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
1.10417 +"
1.10418 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
1.10419 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
1.10420 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
1.10421 + { (exit 1); exit 1; }; }
1.10422
1.10423 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
1.10424 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
1.10425 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
1.10426 - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.10427 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.10428 which seems to be undefined. Please make sure it is defined." >&5
1.10429 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.10430 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.10431 which seems to be undefined. Please make sure it is defined." >&2;}
1.10432
1.10433 rm -f "$tmp/stdin"
1.10434 case $ac_file in
1.10435 - -) cat "$tmp/out"; rm -f "$tmp/out";;
1.10436 - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
1.10437 - esac
1.10438 + -) cat "$tmp/out" && rm -f "$tmp/out";;
1.10439 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
1.10440 + esac \
1.10441 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
1.10442 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
1.10443 + { (exit 1); exit 1; }; }
1.10444 ;;
1.10445 :H)
1.10446 #
1.10447 # CONFIG_HEADER
1.10448 #
1.10449 -_ACEOF
1.10450 -
1.10451 -# Transform confdefs.h into a sed script `conftest.defines', that
1.10452 -# substitutes the proper values into config.h.in to produce config.h.
1.10453 -rm -f conftest.defines conftest.tail
1.10454 -# First, append a space to every undef/define line, to ease matching.
1.10455 -echo 's/$/ /' >conftest.defines
1.10456 -# Then, protect against being on the right side of a sed subst, or in
1.10457 -# an unquoted here document, in config.status. If some macros were
1.10458 -# called several times there might be several #defines for the same
1.10459 -# symbol, which is useless. But do not sort them, since the last
1.10460 -# AC_DEFINE must be honored.
1.10461 -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
1.10462 -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
1.10463 -# NAME is the cpp macro being defined, VALUE is the value it is being given.
1.10464 -# PARAMS is the parameter list in the macro definition--in most cases, it's
1.10465 -# just an empty string.
1.10466 -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
1.10467 -ac_dB='\\)[ (].*,\\1define\\2'
1.10468 -ac_dC=' '
1.10469 -ac_dD=' ,'
1.10470 -
1.10471 -uniq confdefs.h |
1.10472 - sed -n '
1.10473 - t rset
1.10474 - :rset
1.10475 - s/^[ ]*#[ ]*define[ ][ ]*//
1.10476 - t ok
1.10477 - d
1.10478 - :ok
1.10479 - s/[\\&,]/\\&/g
1.10480 - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
1.10481 - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
1.10482 - ' >>conftest.defines
1.10483 -
1.10484 -# Remove the space that was appended to ease matching.
1.10485 -# Then replace #undef with comments. This is necessary, for
1.10486 -# example, in the case of _POSIX_SOURCE, which is predefined and required
1.10487 -# on some systems where configure will not decide to define it.
1.10488 -# (The regexp can be short, since the line contains either #define or #undef.)
1.10489 -echo 's/ $//
1.10490 -s,^[ #]*u.*,/* & */,' >>conftest.defines
1.10491 -
1.10492 -# Break up conftest.defines:
1.10493 -ac_max_sed_lines=50
1.10494 -
1.10495 -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
1.10496 -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
1.10497 -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
1.10498 -# et cetera.
1.10499 -ac_in='$ac_file_inputs'
1.10500 -ac_out='"$tmp/out1"'
1.10501 -ac_nxt='"$tmp/out2"'
1.10502 -
1.10503 -while :
1.10504 -do
1.10505 - # Write a here document:
1.10506 - cat >>$CONFIG_STATUS <<_ACEOF
1.10507 - # First, check the format of the line:
1.10508 - cat >"\$tmp/defines.sed" <<\\CEOF
1.10509 -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
1.10510 -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
1.10511 -b
1.10512 -:def
1.10513 -_ACEOF
1.10514 - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
1.10515 - echo 'CEOF
1.10516 - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
1.10517 - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
1.10518 - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
1.10519 - grep . conftest.tail >/dev/null || break
1.10520 - rm -f conftest.defines
1.10521 - mv conftest.tail conftest.defines
1.10522 -done
1.10523 -rm -f conftest.defines conftest.tail
1.10524 -
1.10525 -echo "ac_result=$ac_in" >>$CONFIG_STATUS
1.10526 -cat >>$CONFIG_STATUS <<\_ACEOF
1.10527 if test x"$ac_file" != x-; then
1.10528 - echo "/* $configure_input */" >"$tmp/config.h"
1.10529 - cat "$ac_result" >>"$tmp/config.h"
1.10530 - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
1.10531 - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
1.10532 -echo "$as_me: $ac_file is unchanged" >&6;}
1.10533 - else
1.10534 - rm -f $ac_file
1.10535 - mv "$tmp/config.h" $ac_file
1.10536 - fi
1.10537 - else
1.10538 - echo "/* $configure_input */"
1.10539 - cat "$ac_result"
1.10540 - fi
1.10541 - rm -f "$tmp/out12"
1.10542 -# Compute $ac_file's index in $config_headers.
1.10543 + {
1.10544 + $as_echo "/* $configure_input */" \
1.10545 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
1.10546 + } >"$tmp/config.h" \
1.10547 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
1.10548 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
1.10549 + { (exit 1); exit 1; }; }
1.10550 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
1.10551 + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
1.10552 +$as_echo "$as_me: $ac_file is unchanged" >&6;}
1.10553 + else
1.10554 + rm -f "$ac_file"
1.10555 + mv "$tmp/config.h" "$ac_file" \
1.10556 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
1.10557 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
1.10558 + { (exit 1); exit 1; }; }
1.10559 + fi
1.10560 + else
1.10561 + $as_echo "/* $configure_input */" \
1.10562 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
1.10563 + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
1.10564 +$as_echo "$as_me: error: could not create -" >&2;}
1.10565 + { (exit 1); exit 1; }; }
1.10566 + fi
1.10567 +# Compute "$ac_file"'s index in $config_headers.
1.10568 _am_stamp_count=1
1.10569 for _am_header in $config_headers :; do
1.10570 case $_am_header in
1.10571 - $ac_file | $ac_file:* )
1.10572 + "$ac_file" | "$ac_file":* )
1.10573 break ;;
1.10574 * )
1.10575 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
1.10576 esac
1.10577 done
1.10578 -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
1.10579 -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1.10580 - X$ac_file : 'X\(//\)[^/]' \| \
1.10581 - X$ac_file : 'X\(//\)$' \| \
1.10582 - X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
1.10583 -echo X$ac_file |
1.10584 +echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||
1.10585 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1.10586 + X"$ac_file" : 'X\(//\)[^/]' \| \
1.10587 + X"$ac_file" : 'X\(//\)$' \| \
1.10588 + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
1.10589 +$as_echo X"$ac_file" |
1.10590 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.10591 s//\1/
1.10592 q
1.10593 @@ -10157,8 +11556,8 @@
1.10594 s/.*/./; q'`/stamp-h$_am_stamp_count
1.10595 ;;
1.10596
1.10597 - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
1.10598 -echo "$as_me: executing $ac_file commands" >&6;}
1.10599 + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
1.10600 +$as_echo "$as_me: executing $ac_file commands" >&6;}
1.10601 ;;
1.10602 esac
1.10603
1.10604 @@ -10179,7 +11578,7 @@
1.10605 X"$mf" : 'X\(//\)[^/]' \| \
1.10606 X"$mf" : 'X\(//\)$' \| \
1.10607 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
1.10608 -echo X"$mf" |
1.10609 +$as_echo X"$mf" |
1.10610 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.10611 s//\1/
1.10612 q
1.10613 @@ -10200,27 +11599,21 @@
1.10614 else
1.10615 continue
1.10616 fi
1.10617 - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
1.10618 - # Extract the definition of DEP_FILES from the Makefile without
1.10619 - # running `make'.
1.10620 - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
1.10621 + # Extract the definition of DEPDIR, am__include, and am__quote
1.10622 + # from the Makefile without running `make'.
1.10623 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1.10624 test -z "$DEPDIR" && continue
1.10625 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
1.10626 + test -z "am__include" && continue
1.10627 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1.10628 # When using ansi2knr, U may be empty or an underscore; expand it
1.10629 - U=`sed -n -e '/^U = / s///p' < "$mf"`
1.10630 - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
1.10631 - # We invoke sed twice because it is the simplest approach to
1.10632 - # changing $(DEPDIR) to its actual value in the expansion.
1.10633 - for file in `sed -n -e '
1.10634 - /^DEP_FILES = .*\\\\$/ {
1.10635 - s/^DEP_FILES = //
1.10636 - :loop
1.10637 - s/\\\\$//
1.10638 - p
1.10639 - n
1.10640 - /\\\\$/ b loop
1.10641 - p
1.10642 - }
1.10643 - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
1.10644 + U=`sed -n 's/^U = //p' < "$mf"`
1.10645 + # Find all dependency output files, they are included files with
1.10646 + # $(DEPDIR) in their names. We invoke sed twice because it is the
1.10647 + # simplest approach to changing $(DEPDIR) to its actual value in the
1.10648 + # expansion.
1.10649 + for file in `sed -n "
1.10650 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
1.10651 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1.10652 # Make sure the directory exists.
1.10653 test -f "$dirpart/$file" && continue
1.10654 @@ -10229,7 +11622,7 @@
1.10655 X"$file" : 'X\(//\)[^/]' \| \
1.10656 X"$file" : 'X\(//\)$' \| \
1.10657 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
1.10658 -echo X"$file" |
1.10659 +$as_echo X"$file" |
1.10660 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.10661 s//\1/
1.10662 q
1.10663 @@ -10255,7 +11648,7 @@
1.10664 as_dirs=
1.10665 while :; do
1.10666 case $as_dir in #(
1.10667 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
1.10668 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
1.10669 *) as_qdir=$as_dir;;
1.10670 esac
1.10671 as_dirs="'$as_qdir' $as_dirs"
1.10672 @@ -10264,7 +11657,7 @@
1.10673 X"$as_dir" : 'X\(//\)[^/]' \| \
1.10674 X"$as_dir" : 'X\(//\)$' \| \
1.10675 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
1.10676 -echo X"$as_dir" |
1.10677 +$as_echo X"$as_dir" |
1.10678 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1.10679 s//\1/
1.10680 q
1.10681 @@ -10285,8 +11678,8 @@
1.10682 test -d "$as_dir" && break
1.10683 done
1.10684 test -z "$as_dirs" || eval "mkdir $as_dirs"
1.10685 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
1.10686 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
1.10687 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
1.10688 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
1.10689 { (exit 1); exit 1; }; }; }
1.10690 # echo "creating $dirpart/$file"
1.10691 echo '# dummy' > "$dirpart/$file"
1.10692 @@ -10306,6 +11699,11 @@
1.10693 chmod +x $CONFIG_STATUS
1.10694 ac_clean_files=$ac_clean_files_save
1.10695
1.10696 +test $ac_write_fail = 0 ||
1.10697 + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
1.10698 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
1.10699 + { (exit 1); exit 1; }; }
1.10700 +
1.10701
1.10702 # configure is writing to config.log, and then calls config.status.
1.10703 # config.status does its own redirection, appending to config.log.
1.10704 @@ -10327,5 +11725,9 @@
1.10705 # would make configure fail if this is the last instruction.
1.10706 $ac_cs_success || { (exit 1); exit 1; }
1.10707 fi
1.10708 -
1.10709 -
1.10710 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
1.10711 + { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
1.10712 +$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
1.10713 +fi
1.10714 +
1.10715 +
.