revision 681:1755a126b109
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 681:1755a126b109 |
parent | 680:e237d43e011d |
child | 682:1ddb41179083 |
author | nkeynes |
date | Sun Jun 01 00:47:45 2008 +0000 (15 years ago) |
First cut of the Cocoa GUI implementation
1.1 --- a/Makefile.am Sun Jun 01 00:46:15 2008 +00001.2 +++ b/Makefile.am Sun Jun 01 00:47:45 2008 +00001.3 @@ -30,3 +30,9 @@1.4 done \1.5 fi1.7 +# Build a Mac OS X bundle. This is meaningless anywhere else1.8 +bundle: all1.9 + mkdir -p lxdream.app/Contents/MacOS1.10 + mkdir -p lxdream.app/Contents/Resources1.11 + cp src/lxdream lxdream.app/Contents/MacOS1.12 + cp -R pixmaps/* lxdream.app/Contents/Resources
2.1 --- a/Makefile.in Sun Jun 01 00:46:15 2008 +00002.2 +++ b/Makefile.in Sun Jun 01 00:47:45 2008 +00002.3 @@ -38,7 +38,7 @@2.4 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \2.5 $(srcdir)/Makefile.in $(srcdir)/config.h.in \2.6 $(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \2.7 - COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \2.8 + COPYING ChangeLog INSTALL NEWS TODO acconfig.h config.guess \2.9 config.sub depcomp install-sh missing mkinstalldirs2.10 subdir = .2.11 ACLOCAL_M4 = $(top_srcdir)/aclocal.m42.12 @@ -122,13 +122,15 @@2.13 ESOUND_LIBS = @ESOUND_LIBS@2.14 EXEEXT = @EXEEXT@2.15 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@2.16 +GLIB_CFLAGS = @GLIB_CFLAGS@2.17 +GLIB_LIBS = @GLIB_LIBS@2.18 GMOFILES = @GMOFILES@2.19 GMSGFMT = @GMSGFMT@2.20 GREP = @GREP@2.21 GTK_CFLAGS = @GTK_CFLAGS@2.22 GTK_LIBS = @GTK_LIBS@2.23 -GUI_CARBON_FALSE = @GUI_CARBON_FALSE@2.24 -GUI_CARBON_TRUE = @GUI_CARBON_TRUE@2.25 +GUI_COCOA_FALSE = @GUI_COCOA_FALSE@2.26 +GUI_COCOA_TRUE = @GUI_COCOA_TRUE@2.27 GUI_GTK_FALSE = @GUI_GTK_FALSE@2.28 GUI_GTK_TRUE = @GUI_GTK_TRUE@2.29 INSTALL_DATA = @INSTALL_DATA@2.30 @@ -681,6 +683,13 @@2.31 fi \2.32 done \2.33 fi2.34 +2.35 +# Build a Mac OS X bundle. This is meaningless anywhere else2.36 +bundle: all2.37 + mkdir -p lxdream.app/Contents/MacOS2.38 + mkdir -p lxdream.app/Contents/Resources2.39 + cp src/lxdream lxdream.app/Contents/MacOS2.40 + cp -R pixmaps/* lxdream.app/Contents/Resources2.41 # Tell versions [3.59,3.63) of GNU make to not export all variables.2.42 # Otherwise a system limit (for SysV at least) may be exceeded.2.43 .NOEXPORT:
3.1 --- a/configure Sun Jun 01 00:46:15 2008 +00003.2 +++ b/configure Sun Jun 01 00:47:45 2008 +00003.3 @@ -1,9 +1,9 @@3.4 #! /bin/sh3.5 # Guess values for system-dependent variables and create Makefiles.3.6 -# Generated by GNU Autoconf 2.61.3.7 +# Generated by GNU Autoconf 2.62.3.8 #3.9 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,3.10 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.3.11 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.3.12 # This configure script is free software; the Free Software Foundation3.13 # gives unlimited permission to copy, distribute and modify it.3.14 ## --------------------- ##3.15 @@ -15,7 +15,7 @@3.16 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then3.17 emulate sh3.18 NULLCMD=:3.19 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which3.20 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which3.21 # is contrary to our usage. Disable this feature.3.22 alias -g '${1+"$@"}'='"$@"'3.23 setopt NO_GLOB_SUBST3.24 @@ -37,17 +37,45 @@3.25 as_cr_digits='0123456789'3.26 as_cr_alnum=$as_cr_Letters$as_cr_digits3.28 +as_nl='3.29 +'3.30 +export as_nl3.31 +# Printing a long string crashes Solaris 7 /usr/bin/printf.3.32 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'3.33 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo3.34 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo3.35 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then3.36 + as_echo='printf %s\n'3.37 + as_echo_n='printf %s'3.38 +else3.39 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then3.40 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'3.41 + as_echo_n='/usr/ucb/echo -n'3.42 + else3.43 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'3.44 + as_echo_n_body='eval3.45 + arg=$1;3.46 + case $arg in3.47 + *"$as_nl"*)3.48 + expr "X$arg" : "X\\(.*\\)$as_nl";3.49 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;3.50 + esac;3.51 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"3.52 + '3.53 + export as_echo_n_body3.54 + as_echo_n='sh -c $as_echo_n_body as_echo'3.55 + fi3.56 + export as_echo_body3.57 + as_echo='sh -c $as_echo_body as_echo'3.58 +fi3.59 +3.60 # The user is always right.3.61 if test "${PATH_SEPARATOR+set}" != set; then3.62 - echo "#! /bin/sh" >conf$$.sh3.63 - echo "exit 0" >>conf$$.sh3.64 - chmod +x conf$$.sh3.65 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then3.66 - PATH_SEPARATOR=';'3.67 - else3.68 - PATH_SEPARATOR=:3.69 - fi3.70 - rm -f conf$$.sh3.71 + PATH_SEPARATOR=:3.72 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {3.73 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||3.74 + PATH_SEPARATOR=';'3.75 + }3.76 fi3.78 # Support unset when possible.3.79 @@ -63,8 +91,6 @@3.80 # there to prevent editors from complaining about space-tab.3.81 # (If _AS_PATH_WALK were called with IFS unset, it would disable word3.82 # splitting by setting IFS to empty value.)3.83 -as_nl='3.84 -'3.85 IFS=" "" $as_nl"3.87 # Find who we are. Look in the path if we contain no directory separator.3.88 @@ -87,7 +113,7 @@3.89 as_myself=$03.90 fi3.91 if test ! -f "$as_myself"; then3.92 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&23.93 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&23.94 { (exit 1); exit 1; }3.95 fi3.97 @@ -100,17 +126,10 @@3.98 PS4='+ '3.100 # NLS nuisances.3.101 -for as_var in \3.102 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \3.103 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \3.104 - LC_TELEPHONE LC_TIME3.105 -do3.106 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then3.107 - eval $as_var=C; export $as_var3.108 - else3.109 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var3.110 - fi3.111 -done3.112 +LC_ALL=C3.113 +export LC_ALL3.114 +LANGUAGE=C3.115 +export LANGUAGE3.117 # Required to use basename.3.118 if expr a : '\(a\)' >/dev/null 2>&1 &&3.119 @@ -132,7 +151,7 @@3.120 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \3.121 X"$0" : 'X\(//\)$' \| \3.122 X"$0" : 'X\(/\)' \| . 2>/dev/null ||3.123 -echo X/"$0" |3.124 +$as_echo X/"$0" |3.125 sed '/^.*\/\([^/][^/]*\)\/*$/{3.126 s//\1/3.127 q3.128 @@ -158,7 +177,7 @@3.129 as_have_required=no3.130 fi3.132 - if test $as_have_required = yes && (eval ":3.133 + if test $as_have_required = yes && (eval ":3.134 (as_func_return () {3.135 (exit \$1)3.136 }3.137 @@ -240,7 +259,7 @@3.138 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then3.139 emulate sh3.140 NULLCMD=:3.141 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which3.142 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which3.143 # is contrary to our usage. Disable this feature.3.144 alias -g '${1+"$@"}'='"$@"'3.145 setopt NO_GLOB_SUBST3.146 @@ -261,7 +280,7 @@3.147 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then3.148 emulate sh3.149 NULLCMD=:3.150 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which3.151 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which3.152 # is contrary to our usage. Disable this feature.3.153 alias -g '${1+"$@"}'='"$@"'3.154 setopt NO_GLOB_SUBST3.155 @@ -341,10 +360,10 @@3.157 if test "x$CONFIG_SHELL" != x; then3.158 for as_var in BASH_ENV ENV3.159 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var3.160 - done3.161 - export CONFIG_SHELL3.162 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}3.163 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var3.164 + done3.165 + export CONFIG_SHELL3.166 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}3.167 fi3.170 @@ -413,9 +432,10 @@3.172 test \$exitcode = 0") || {3.173 echo No shell found that supports shell functions.3.174 - echo Please tell autoconf@gnu.org about your system,3.175 - echo including any error possibly output before this3.176 - echo message3.177 + echo Please tell bug-autoconf@gnu.org about your system,3.178 + echo including any error possibly output before this message.3.179 + echo This can help us improve future autoconf versions.3.180 + echo Configuration will now proceed without shell functions.3.181 }3.184 @@ -451,7 +471,7 @@3.185 s/-\n.*//3.186 ' >$as_me.lineno &&3.187 chmod +x "$as_me.lineno" ||3.188 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&23.189 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&23.190 { (exit 1); exit 1; }; }3.192 # Don't try to exec as it changes $[0], causing all sort of problems3.193 @@ -479,7 +499,6 @@3.194 *)3.195 ECHO_N='-n';;3.196 esac3.197 -3.198 if expr a : '\(a\)' >/dev/null 2>&1 &&3.199 test "X`expr 00001 : '.*\(...\)'`" = X001; then3.200 as_expr=expr3.201 @@ -492,19 +511,22 @@3.202 rm -f conf$$.dir/conf$$.file3.203 else3.204 rm -f conf$$.dir3.205 - mkdir conf$$.dir3.206 -fi3.207 -echo >conf$$.file3.208 -if ln -s conf$$.file conf$$ 2>/dev/null; then3.209 - as_ln_s='ln -s'3.210 - # ... but there are two gotchas:3.211 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.3.212 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.3.213 - # In both cases, we have to default to `cp -p'.3.214 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||3.215 + mkdir conf$$.dir 2>/dev/null3.216 +fi3.217 +if (echo >conf$$.file) 2>/dev/null; then3.218 + if ln -s conf$$.file conf$$ 2>/dev/null; then3.219 + as_ln_s='ln -s'3.220 + # ... but there are two gotchas:3.221 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.3.222 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.3.223 + # In both cases, we have to default to `cp -p'.3.224 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||3.225 + as_ln_s='cp -p'3.226 + elif ln conf$$.file conf$$ 2>/dev/null; then3.227 + as_ln_s=ln3.228 + else3.229 as_ln_s='cp -p'3.230 -elif ln conf$$.file conf$$ 2>/dev/null; then3.231 - as_ln_s=ln3.232 + fi3.233 else3.234 as_ln_s='cp -p'3.235 fi3.236 @@ -529,10 +551,10 @@3.237 as_test_x='3.238 eval sh -c '\''3.239 if test -d "$1"; then3.240 - test -d "$1/.";3.241 + test -d "$1/.";3.242 else3.243 case $1 in3.244 - -*)set "./$1";;3.245 + -*)set "./$1";;3.246 esac;3.247 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in3.248 ???[sx]*):;;*)false;;esac;fi3.249 @@ -708,6 +730,8 @@3.250 PKG_CONFIG3.251 LIBPNG_CFLAGS3.252 LIBPNG_LIBS3.253 +GLIB_CFLAGS3.254 +GLIB_LIBS3.255 GTK_CFLAGS3.256 GTK_LIBS3.257 GUI_GTK_TRUE3.258 @@ -768,6 +792,16 @@3.259 LIBOBJS3.260 LTLIBOBJS'3.261 ac_subst_files=''3.262 +ac_user_opts='3.263 +enable_option_checking3.264 +enable_maintainer_mode3.265 +enable_dependency_tracking3.266 +enable_trace3.267 +enable_watch3.268 +enable_sh4stats3.269 +with_osmesa3.270 +with_gtk3.271 +'3.272 ac_precious_vars='build_alias3.273 host_alias3.274 target_alias3.275 @@ -782,6 +816,8 @@3.276 PKG_CONFIG3.277 LIBPNG_CFLAGS3.278 LIBPNG_LIBS3.279 +GLIB_CFLAGS3.280 +GLIB_LIBS3.281 GTK_CFLAGS3.282 GTK_LIBS3.283 PULSE_CFLAGS3.284 @@ -795,6 +831,8 @@3.285 # Initialize some variables set by options.3.286 ac_init_help=3.287 ac_init_version=false3.288 +ac_unrecognized_opts=3.289 +ac_unrecognized_sep=3.290 # The variables have the same names as the options, with3.291 # dashes changed to underlines.3.292 cache_file=/dev/null3.293 @@ -893,13 +931,21 @@3.294 datarootdir=$ac_optarg ;;3.296 -disable-* | --disable-*)3.297 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`3.298 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`3.299 # Reject names that are not valid shell variable names.3.300 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&3.301 - { echo "$as_me: error: invalid feature name: $ac_feature" >&23.302 - { (exit 1); exit 1; }; }3.303 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`3.304 - eval enable_$ac_feature=no ;;3.305 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&3.306 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&23.307 + { (exit 1); exit 1; }; }3.308 + ac_useropt_orig=$ac_useropt3.309 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`3.310 + case $ac_user_opts in3.311 + *"3.312 +"enable_$ac_useropt"3.313 +"*) ;;3.314 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"3.315 + ac_unrecognized_sep=', ';;3.316 + esac3.317 + eval enable_$ac_useropt=no ;;3.319 -docdir | --docdir | --docdi | --doc | --do)3.320 ac_prev=docdir ;;3.321 @@ -912,13 +958,21 @@3.322 dvidir=$ac_optarg ;;3.324 -enable-* | --enable-*)3.325 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`3.326 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`3.327 # Reject names that are not valid shell variable names.3.328 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&3.329 - { echo "$as_me: error: invalid feature name: $ac_feature" >&23.330 - { (exit 1); exit 1; }; }3.331 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`3.332 - eval enable_$ac_feature=\$ac_optarg ;;3.333 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&3.334 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&23.335 + { (exit 1); exit 1; }; }3.336 + ac_useropt_orig=$ac_useropt3.337 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`3.338 + case $ac_user_opts in3.339 + *"3.340 +"enable_$ac_useropt"3.341 +"*) ;;3.342 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"3.343 + ac_unrecognized_sep=', ';;3.344 + esac3.345 + eval enable_$ac_useropt=\$ac_optarg ;;3.347 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \3.348 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \3.349 @@ -1109,22 +1163,38 @@3.350 ac_init_version=: ;;3.352 -with-* | --with-*)3.353 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`3.354 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`3.355 # Reject names that are not valid shell variable names.3.356 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&3.357 - { echo "$as_me: error: invalid package name: $ac_package" >&23.358 - { (exit 1); exit 1; }; }3.359 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`3.360 - eval with_$ac_package=\$ac_optarg ;;3.361 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&3.362 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&23.363 + { (exit 1); exit 1; }; }3.364 + ac_useropt_orig=$ac_useropt3.365 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`3.366 + case $ac_user_opts in3.367 + *"3.368 +"with_$ac_useropt"3.369 +"*) ;;3.370 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"3.371 + ac_unrecognized_sep=', ';;3.372 + esac3.373 + eval with_$ac_useropt=\$ac_optarg ;;3.375 -without-* | --without-*)3.376 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`3.377 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`3.378 # Reject names that are not valid shell variable names.3.379 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&3.380 - { echo "$as_me: error: invalid package name: $ac_package" >&23.381 - { (exit 1); exit 1; }; }3.382 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`3.383 - eval with_$ac_package=no ;;3.384 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&3.385 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&23.386 + { (exit 1); exit 1; }; }3.387 + ac_useropt_orig=$ac_useropt3.388 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`3.389 + case $ac_user_opts in3.390 + *"3.391 +"with_$ac_useropt"3.392 +"*) ;;3.393 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"3.394 + ac_unrecognized_sep=', ';;3.395 + esac3.396 + eval with_$ac_useropt=no ;;3.398 --x)3.399 # Obsolete; use --with-x.3.400 @@ -1144,7 +1214,7 @@3.401 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)3.402 x_libraries=$ac_optarg ;;3.404 - -*) { echo "$as_me: error: unrecognized option: $ac_option3.405 + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option3.406 Try \`$0 --help' for more information." >&23.407 { (exit 1); exit 1; }; }3.408 ;;3.409 @@ -1153,16 +1223,16 @@3.410 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`3.411 # Reject names that are not valid shell variable names.3.412 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&3.413 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&23.414 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&23.415 { (exit 1); exit 1; }; }3.416 eval $ac_envvar=\$ac_optarg3.417 export $ac_envvar ;;3.419 *)3.420 # FIXME: should be removed in autoconf 3.0.3.421 - echo "$as_me: WARNING: you should use --build, --host, --target" >&23.422 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&23.423 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&3.424 - echo "$as_me: WARNING: invalid host type: $ac_option" >&23.425 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&23.426 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}3.427 ;;3.429 @@ -1171,22 +1241,38 @@3.431 if test -n "$ac_prev"; then3.432 ac_option=--`echo $ac_prev | sed 's/_/-/g'`3.433 - { echo "$as_me: error: missing argument to $ac_option" >&23.434 - { (exit 1); exit 1; }; }3.435 -fi3.436 -3.437 -# Be sure to have absolute directory names.3.438 + { $as_echo "$as_me: error: missing argument to $ac_option" >&23.439 + { (exit 1); exit 1; }; }3.440 +fi3.441 +3.442 +if test -n "$ac_unrecognized_opts"; then3.443 + case $enable_option_checking in3.444 + no) ;;3.445 + fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&23.446 + { (exit 1); exit 1; }; } ;;3.447 + *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;3.448 + esac3.449 +fi3.450 +3.451 +# Check all directory arguments for consistency.3.452 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \3.453 datadir sysconfdir sharedstatedir localstatedir includedir \3.454 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \3.455 libdir localedir mandir3.456 do3.457 eval ac_val=\$$ac_var3.458 + # Remove trailing slashes.3.459 + case $ac_val in3.460 + */ )3.461 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`3.462 + eval $ac_var=\$ac_val;;3.463 + esac3.464 + # Be sure to have absolute directory names.3.465 case $ac_val in3.466 [\\/$]* | ?:[\\/]* ) continue;;3.467 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;3.468 esac3.469 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&23.470 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&23.471 { (exit 1); exit 1; }; }3.472 done3.474 @@ -1201,7 +1287,7 @@3.475 if test "x$host_alias" != x; then3.476 if test "x$build_alias" = x; then3.477 cross_compiling=maybe3.478 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.3.479 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.3.480 If a cross compiler is detected then cross compile mode will be used." >&23.481 elif test "x$build_alias" != "x$host_alias"; then3.482 cross_compiling=yes3.483 @@ -1217,10 +1303,10 @@3.484 ac_pwd=`pwd` && test -n "$ac_pwd" &&3.485 ac_ls_di=`ls -di .` &&3.486 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||3.487 - { echo "$as_me: error: Working directory cannot be determined" >&23.488 + { $as_echo "$as_me: error: Working directory cannot be determined" >&23.489 { (exit 1); exit 1; }; }3.490 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||3.491 - { echo "$as_me: error: pwd does not report name of working directory" >&23.492 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&23.493 { (exit 1); exit 1; }; }3.496 @@ -1228,12 +1314,12 @@3.497 if test -z "$srcdir"; then3.498 ac_srcdir_defaulted=yes3.499 # Try the directory containing this script, then the parent directory.3.500 - ac_confdir=`$as_dirname -- "$0" ||3.501 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \3.502 - X"$0" : 'X\(//\)[^/]' \| \3.503 - X"$0" : 'X\(//\)$' \| \3.504 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||3.505 -echo X"$0" |3.506 + ac_confdir=`$as_dirname -- "$as_myself" ||3.507 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \3.508 + X"$as_myself" : 'X\(//\)[^/]' \| \3.509 + X"$as_myself" : 'X\(//\)$' \| \3.510 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||3.511 +$as_echo X"$as_myself" |3.512 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.513 s//\1/3.514 q3.515 @@ -1260,12 +1346,12 @@3.516 fi3.517 if test ! -r "$srcdir/$ac_unique_file"; then3.518 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."3.519 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&23.520 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&23.521 { (exit 1); exit 1; }; }3.522 fi3.523 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"3.524 ac_abs_confdir=`(3.525 - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&23.526 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&23.527 { (exit 1); exit 1; }; }3.528 pwd)`3.529 # When building in place, set srcdir=.3.530 @@ -1314,9 +1400,9 @@3.532 Installation directories:3.533 --prefix=PREFIX install architecture-independent files in PREFIX3.534 - [$ac_default_prefix]3.535 + [$ac_default_prefix]3.536 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX3.537 - [PREFIX]3.538 + [PREFIX]3.540 By default, \`make install' will install all the files in3.541 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify3.542 @@ -1326,25 +1412,25 @@3.543 For better control, use the options below.3.545 Fine tuning of the installation directories:3.546 - --bindir=DIR user executables [EPREFIX/bin]3.547 - --sbindir=DIR system admin executables [EPREFIX/sbin]3.548 - --libexecdir=DIR program executables [EPREFIX/libexec]3.549 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]3.550 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]3.551 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]3.552 - --libdir=DIR object code libraries [EPREFIX/lib]3.553 - --includedir=DIR C header files [PREFIX/include]3.554 - --oldincludedir=DIR C header files for non-gcc [/usr/include]3.555 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]3.556 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]3.557 - --infodir=DIR info documentation [DATAROOTDIR/info]3.558 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]3.559 - --mandir=DIR man documentation [DATAROOTDIR/man]3.560 - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]3.561 - --htmldir=DIR html documentation [DOCDIR]3.562 - --dvidir=DIR dvi documentation [DOCDIR]3.563 - --pdfdir=DIR pdf documentation [DOCDIR]3.564 - --psdir=DIR ps documentation [DOCDIR]3.565 + --bindir=DIR user executables [EPREFIX/bin]3.566 + --sbindir=DIR system admin executables [EPREFIX/sbin]3.567 + --libexecdir=DIR program executables [EPREFIX/libexec]3.568 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]3.569 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]3.570 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]3.571 + --libdir=DIR object code libraries [EPREFIX/lib]3.572 + --includedir=DIR C header files [PREFIX/include]3.573 + --oldincludedir=DIR C header files for non-gcc [/usr/include]3.574 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]3.575 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]3.576 + --infodir=DIR info documentation [DATAROOTDIR/info]3.577 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]3.578 + --mandir=DIR man documentation [DATAROOTDIR/man]3.579 + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]3.580 + --htmldir=DIR html documentation [DOCDIR]3.581 + --dvidir=DIR dvi documentation [DOCDIR]3.582 + --pdfdir=DIR pdf documentation [DOCDIR]3.583 + --psdir=DIR ps documentation [DOCDIR]3.584 _ACEOF3.586 cat <<\_ACEOF3.587 @@ -1365,6 +1451,7 @@3.588 cat <<\_ACEOF3.590 Optional Features:3.591 + --disable-option-checking ignore unrecognized --enable/--with options3.592 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)3.593 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]3.594 --enable-maintainer-mode enable make rules and dependencies not useful3.595 @@ -1382,6 +1469,7 @@3.596 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)3.597 --with-osmesa Build with the osmesa GL library (software3.598 rendering)3.599 + --with-gtk Build with the GTK UI. Default on X11 systems3.601 Some influential environment variables:3.602 CC C compiler command3.603 @@ -1398,6 +1486,8 @@3.604 LIBPNG_CFLAGS3.605 C compiler flags for LIBPNG, overriding pkg-config3.606 LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config3.607 + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config3.608 + GLIB_LIBS linker flags for GLIB, overriding pkg-config3.609 GTK_CFLAGS C compiler flags for GTK, overriding pkg-config3.610 GTK_LIBS linker flags for GTK, overriding pkg-config3.611 PULSE_CFLAGS3.612 @@ -1419,15 +1509,17 @@3.613 if test "$ac_init_help" = "recursive"; then3.614 # If there are subdirs, report their specific --help.3.615 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue3.616 - test -d "$ac_dir" || continue3.617 + test -d "$ac_dir" ||3.618 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||3.619 + continue3.620 ac_builddir=.3.622 case "$ac_dir" in3.623 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;3.624 *)3.625 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`3.626 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`3.627 # A ".." for each directory in $ac_dir_suffix.3.628 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`3.629 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`3.630 case $ac_top_builddir_sub in3.631 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;3.632 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;3.633 @@ -1463,7 +1555,7 @@3.634 echo &&3.635 $SHELL "$ac_srcdir/configure" --help=recursive3.636 else3.637 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&23.638 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&23.639 fi || ac_status=$?3.640 cd "$ac_pwd" || { ac_status=$?; break; }3.641 done3.642 @@ -1473,10 +1565,10 @@3.643 if $ac_init_version; then3.644 cat <<\_ACEOF3.645 configure3.646 -generated by GNU Autoconf 2.613.647 +generated by GNU Autoconf 2.623.649 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,3.650 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.3.651 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.3.652 This configure script is free software; the Free Software Foundation3.653 gives unlimited permission to copy, distribute and modify it.3.654 _ACEOF3.655 @@ -1487,7 +1579,7 @@3.656 running configure, to aid debugging if configure makes a mistake.3.658 It was created by $as_me, which was3.659 -generated by GNU Autoconf 2.61. Invocation command line was3.660 +generated by GNU Autoconf 2.62. Invocation command line was3.662 $ $0 $@3.664 @@ -1523,7 +1615,7 @@3.665 do3.666 IFS=$as_save_IFS3.667 test -z "$as_dir" && as_dir=.3.668 - echo "PATH: $as_dir"3.669 + $as_echo "PATH: $as_dir"3.670 done3.671 IFS=$as_save_IFS3.673 @@ -1558,7 +1650,7 @@3.674 | -silent | --silent | --silen | --sile | --sil)3.675 continue ;;3.676 *\'*)3.677 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;3.678 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;3.679 esac3.680 case $ac_pass in3.681 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;3.682 @@ -1610,11 +1702,12 @@3.683 case $ac_val in #(3.684 *${as_nl}*)3.685 case $ac_var in #(3.686 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&53.687 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;3.688 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&53.689 +$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;3.690 esac3.691 case $ac_var in #(3.692 _ | IFS | as_nl) ;; #(3.693 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(3.694 *) $as_unset $ac_var ;;3.695 esac ;;3.696 esac3.697 @@ -1644,9 +1737,9 @@3.698 do3.699 eval ac_val=\$$ac_var3.700 case $ac_val in3.701 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;3.702 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;3.703 esac3.704 - echo "$ac_var='\''$ac_val'\''"3.705 + $as_echo "$ac_var='\''$ac_val'\''"3.706 done | sort3.707 echo3.709 @@ -1661,9 +1754,9 @@3.710 do3.711 eval ac_val=\$$ac_var3.712 case $ac_val in3.713 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;3.714 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;3.715 esac3.716 - echo "$ac_var='\''$ac_val'\''"3.717 + $as_echo "$ac_var='\''$ac_val'\''"3.718 done | sort3.719 echo3.720 fi3.721 @@ -1679,8 +1772,8 @@3.722 echo3.723 fi3.724 test "$ac_signal" != 0 &&3.725 - echo "$as_me: caught signal $ac_signal"3.726 - echo "$as_me: exit $exit_status"3.727 + $as_echo "$as_me: caught signal $ac_signal"3.728 + $as_echo "$as_me: exit $exit_status"3.729 } >&53.730 rm -f core *.core core.conftest.* &&3.731 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&3.732 @@ -1722,21 +1815,24 @@3.735 # Let the site file select an alternate cache file if it wants to.3.736 -# Prefer explicitly selected file to automatically selected ones.3.737 +# Prefer an explicitly selected file to automatically selected ones.3.738 +ac_site_file1=NONE3.739 +ac_site_file2=NONE3.740 if test -n "$CONFIG_SITE"; then3.741 - set x "$CONFIG_SITE"3.742 + ac_site_file1=$CONFIG_SITE3.743 elif test "x$prefix" != xNONE; then3.744 - set x "$prefix/share/config.site" "$prefix/etc/config.site"3.745 -else3.746 - set x "$ac_default_prefix/share/config.site" \3.747 - "$ac_default_prefix/etc/config.site"3.748 -fi3.749 -shift3.750 -for ac_site_file3.751 -do3.752 + ac_site_file1=$prefix/share/config.site3.753 + ac_site_file2=$prefix/etc/config.site3.754 +else3.755 + ac_site_file1=$ac_default_prefix/share/config.site3.756 + ac_site_file2=$ac_default_prefix/etc/config.site3.757 +fi3.758 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"3.759 +do3.760 + test "x$ac_site_file" = xNONE && continue3.761 if test -r "$ac_site_file"; then3.762 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&53.763 -echo "$as_me: loading site script $ac_site_file" >&6;}3.764 + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&53.765 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}3.766 sed 's/^/| /' "$ac_site_file" >&53.767 . "$ac_site_file"3.768 fi3.769 @@ -1746,16 +1842,16 @@3.770 # Some versions of bash will fail to source /dev/null (special3.771 # files actually), so we avoid doing that.3.772 if test -f "$cache_file"; then3.773 - { echo "$as_me:$LINENO: loading cache $cache_file" >&53.774 -echo "$as_me: loading cache $cache_file" >&6;}3.775 + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&53.776 +$as_echo "$as_me: loading cache $cache_file" >&6;}3.777 case $cache_file in3.778 [\\/]* | ?:[\\/]* ) . "$cache_file";;3.779 *) . "./$cache_file";;3.780 esac3.781 fi3.782 else3.783 - { echo "$as_me:$LINENO: creating cache $cache_file" >&53.784 -echo "$as_me: creating cache $cache_file" >&6;}3.785 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&53.786 +$as_echo "$as_me: creating cache $cache_file" >&6;}3.787 >$cache_file3.788 fi3.790 @@ -1769,29 +1865,38 @@3.791 eval ac_new_val=\$ac_env_${ac_var}_value3.792 case $ac_old_set,$ac_new_set in3.793 set,)3.794 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&53.795 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}3.796 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&53.797 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}3.798 ac_cache_corrupted=: ;;3.799 ,set)3.800 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&53.801 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}3.802 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&53.803 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}3.804 ac_cache_corrupted=: ;;3.805 ,);;3.806 *)3.807 if test "x$ac_old_val" != "x$ac_new_val"; then3.808 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&53.809 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}3.810 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&53.811 -echo "$as_me: former value: $ac_old_val" >&2;}3.812 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&53.813 -echo "$as_me: current value: $ac_new_val" >&2;}3.814 - ac_cache_corrupted=:3.815 + # differences in whitespace do not lead to failure.3.816 + ac_old_val_w=`echo x $ac_old_val`3.817 + ac_new_val_w=`echo x $ac_new_val`3.818 + if test "$ac_old_val_w" != "$ac_new_val_w"; then3.819 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&53.820 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}3.821 + ac_cache_corrupted=:3.822 + else3.823 + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&53.824 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}3.825 + eval $ac_var=\$ac_old_val3.826 + fi3.827 + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&53.828 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}3.829 + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&53.830 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}3.831 fi;;3.832 esac3.833 # Pass precious variables to config.status.3.834 if test "$ac_new_set" = set; then3.835 case $ac_new_val in3.836 - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;3.837 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;3.838 *) ac_arg=$ac_var=$ac_new_val ;;3.839 esac3.840 case " $ac_configure_args " in3.841 @@ -1801,10 +1906,10 @@3.842 fi3.843 done3.844 if $ac_cache_corrupted; then3.845 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&53.846 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}3.847 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&53.848 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}3.849 + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&53.850 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}3.851 + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&53.852 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}3.853 { (exit 1); exit 1; }; }3.854 fi3.856 @@ -1849,8 +1954,8 @@3.857 fi3.858 done3.859 if test -z "$ac_aux_dir"; then3.860 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&53.861 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}3.862 + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&53.863 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}3.864 { (exit 1); exit 1; }; }3.865 fi3.867 @@ -1876,11 +1981,12 @@3.868 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"3.869 # OS/2's system install, which has a completely different semantic3.870 # ./install, which can be erroneously created by make from ./install.sh.3.871 -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&53.872 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }3.873 +# Reject install programs that cannot install multiple files.3.874 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&53.875 +$as_echo_n "checking for a BSD-compatible install... " >&6; }3.876 if test -z "$INSTALL"; then3.877 if test "${ac_cv_path_install+set}" = set; then3.878 - echo $ECHO_N "(cached) $ECHO_C" >&63.879 + $as_echo_n "(cached) " >&63.880 else3.881 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3.882 for as_dir in $PATH3.883 @@ -1909,17 +2015,29 @@3.884 # program-specific install script used by HP pwplus--don't use.3.885 :3.886 else3.887 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"3.888 - break 33.889 + rm -rf conftest.one conftest.two conftest.dir3.890 + echo one > conftest.one3.891 + echo two > conftest.two3.892 + mkdir conftest.dir3.893 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&3.894 + test -s conftest.one && test -s conftest.two &&3.895 + test -s conftest.dir/conftest.one &&3.896 + test -s conftest.dir/conftest.two3.897 + then3.898 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"3.899 + break 33.900 + fi3.901 fi3.902 fi3.903 done3.904 done3.905 ;;3.906 esac3.907 -done3.908 -IFS=$as_save_IFS3.909 -3.910 +3.911 +done3.912 +IFS=$as_save_IFS3.913 +3.914 +rm -rf conftest.one conftest.two conftest.dir3.916 fi3.917 if test "${ac_cv_path_install+set}" = set; then3.918 @@ -1932,8 +2050,8 @@3.919 INSTALL=$ac_install_sh3.920 fi3.921 fi3.922 -{ echo "$as_me:$LINENO: result: $INSTALL" >&53.923 -echo "${ECHO_T}$INSTALL" >&6; }3.924 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&53.925 +$as_echo "$INSTALL" >&6; }3.927 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.3.928 # It thinks the first close brace ends the variable substitution.3.929 @@ -1943,8 +2061,8 @@3.931 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'3.933 -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&53.934 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }3.935 +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&53.936 +$as_echo_n "checking whether build environment is sane... " >&6; }3.937 # Just in case3.938 sleep 13.939 echo timestamp > conftest.file3.940 @@ -1967,9 +2085,9 @@3.941 # if, for instance, CONFIG_SHELL is bash and it inherits a3.942 # broken ls alias from the environment. This has actually3.943 # happened. Such a system could not be considered "sane".3.944 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken3.945 + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken3.946 alias in your environment" >&53.947 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken3.948 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken3.949 alias in your environment" >&2;}3.950 { (exit 1); exit 1; }; }3.951 fi3.952 @@ -1980,26 +2098,23 @@3.953 # Ok.3.954 :3.955 else3.956 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!3.957 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!3.958 Check your system clock" >&53.959 -echo "$as_me: error: newly created file is older than distributed files!3.960 +$as_echo "$as_me: error: newly created file is older than distributed files!3.961 Check your system clock" >&2;}3.962 { (exit 1); exit 1; }; }3.963 fi3.964 -{ echo "$as_me:$LINENO: result: yes" >&53.965 -echo "${ECHO_T}yes" >&6; }3.966 +{ $as_echo "$as_me:$LINENO: result: yes" >&53.967 +$as_echo "yes" >&6; }3.968 test "$program_prefix" != NONE &&3.969 program_transform_name="s&^&$program_prefix&;$program_transform_name"3.970 # Use a double $ so make ignores it.3.971 test "$program_suffix" != NONE &&3.972 program_transform_name="s&\$&$program_suffix&;$program_transform_name"3.973 -# Double any \ or $. echo might interpret backslashes.3.974 +# Double any \ or $.3.975 # By default was `s,x,x', remove it if useless.3.976 -cat <<\_ACEOF >conftest.sed3.977 -s/[\\$]/&&/g;s/;s,x,x,$//3.978 -_ACEOF3.979 -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`3.980 -rm -f conftest.sed3.981 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'3.982 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`3.984 # expand $ac_aux_dir to an absolute path3.985 am_aux_dir=`cd $ac_aux_dir && pwd`3.986 @@ -2010,8 +2125,8 @@3.987 am_missing_run="$MISSING --run "3.988 else3.989 am_missing_run=3.990 - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&53.991 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}3.992 + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&53.993 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}3.994 fi3.996 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then3.997 @@ -2051,10 +2166,10 @@3.998 do3.999 # Extract the first word of "$ac_prog", so it can be a program name with args.3.1000 set dummy $ac_prog; ac_word=$23.1001 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1002 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1003 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1004 +$as_echo_n "checking for $ac_word... " >&6; }3.1005 if test "${ac_cv_prog_AWK+set}" = set; then3.1006 - echo $ECHO_N "(cached) $ECHO_C" >&63.1007 + $as_echo_n "(cached) " >&63.1008 else3.1009 if test -n "$AWK"; then3.1010 ac_cv_prog_AWK="$AWK" # Let the user override the test.3.1011 @@ -2067,7 +2182,7 @@3.1012 for ac_exec_ext in '' $ac_executable_extensions; do3.1013 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1014 ac_cv_prog_AWK="$ac_prog"3.1015 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1016 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1017 break 23.1018 fi3.1019 done3.1020 @@ -2078,22 +2193,23 @@3.1021 fi3.1022 AWK=$ac_cv_prog_AWK3.1023 if test -n "$AWK"; then3.1024 - { echo "$as_me:$LINENO: result: $AWK" >&53.1025 -echo "${ECHO_T}$AWK" >&6; }3.1026 -else3.1027 - { echo "$as_me:$LINENO: result: no" >&53.1028 -echo "${ECHO_T}no" >&6; }3.1029 + { $as_echo "$as_me:$LINENO: result: $AWK" >&53.1030 +$as_echo "$AWK" >&6; }3.1031 +else3.1032 + { $as_echo "$as_me:$LINENO: result: no" >&53.1033 +$as_echo "no" >&6; }3.1034 fi3.1037 test -n "$AWK" && break3.1038 done3.1040 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&53.1041 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }3.1042 -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`3.1043 +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&53.1044 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }3.1045 +set x ${MAKE-make}3.1046 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`3.1047 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then3.1048 - echo $ECHO_N "(cached) $ECHO_C" >&63.1049 + $as_echo_n "(cached) " >&63.1050 else3.1051 cat >conftest.make <<\_ACEOF3.1052 SHELL = /bin/sh3.1053 @@ -2110,12 +2226,12 @@3.1054 rm -f conftest.make3.1055 fi3.1056 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then3.1057 - { echo "$as_me:$LINENO: result: yes" >&53.1058 -echo "${ECHO_T}yes" >&6; }3.1059 + { $as_echo "$as_me:$LINENO: result: yes" >&53.1060 +$as_echo "yes" >&6; }3.1061 SET_MAKE=3.1062 else3.1063 - { echo "$as_me:$LINENO: result: no" >&53.1064 -echo "${ECHO_T}no" >&6; }3.1065 + { $as_echo "$as_me:$LINENO: result: no" >&53.1066 +$as_echo "no" >&6; }3.1067 SET_MAKE="MAKE=${MAKE-make}"3.1068 fi3.1070 @@ -2131,8 +2247,8 @@3.1071 # test to see if srcdir already configured3.1072 if test "`cd $srcdir && pwd`" != "`pwd`" &&3.1073 test -f $srcdir/config.status; then3.1074 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&53.1075 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}3.1076 + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&53.1077 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}3.1078 { (exit 1); exit 1; }; }3.1079 fi3.1081 @@ -2186,10 +2302,10 @@3.1082 if test -n "$ac_tool_prefix"; then3.1083 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.3.1084 set dummy ${ac_tool_prefix}strip; ac_word=$23.1085 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1086 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1087 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1088 +$as_echo_n "checking for $ac_word... " >&6; }3.1089 if test "${ac_cv_prog_STRIP+set}" = set; then3.1090 - echo $ECHO_N "(cached) $ECHO_C" >&63.1091 + $as_echo_n "(cached) " >&63.1092 else3.1093 if test -n "$STRIP"; then3.1094 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.3.1095 @@ -2202,7 +2318,7 @@3.1096 for ac_exec_ext in '' $ac_executable_extensions; do3.1097 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1098 ac_cv_prog_STRIP="${ac_tool_prefix}strip"3.1099 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1100 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1101 break 23.1102 fi3.1103 done3.1104 @@ -2213,11 +2329,11 @@3.1105 fi3.1106 STRIP=$ac_cv_prog_STRIP3.1107 if test -n "$STRIP"; then3.1108 - { echo "$as_me:$LINENO: result: $STRIP" >&53.1109 -echo "${ECHO_T}$STRIP" >&6; }3.1110 -else3.1111 - { echo "$as_me:$LINENO: result: no" >&53.1112 -echo "${ECHO_T}no" >&6; }3.1113 + { $as_echo "$as_me:$LINENO: result: $STRIP" >&53.1114 +$as_echo "$STRIP" >&6; }3.1115 +else3.1116 + { $as_echo "$as_me:$LINENO: result: no" >&53.1117 +$as_echo "no" >&6; }3.1118 fi3.1121 @@ -2226,10 +2342,10 @@3.1122 ac_ct_STRIP=$STRIP3.1123 # Extract the first word of "strip", so it can be a program name with args.3.1124 set dummy strip; ac_word=$23.1125 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1126 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1127 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1128 +$as_echo_n "checking for $ac_word... " >&6; }3.1129 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then3.1130 - echo $ECHO_N "(cached) $ECHO_C" >&63.1131 + $as_echo_n "(cached) " >&63.1132 else3.1133 if test -n "$ac_ct_STRIP"; then3.1134 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.3.1135 @@ -2242,7 +2358,7 @@3.1136 for ac_exec_ext in '' $ac_executable_extensions; do3.1137 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1138 ac_cv_prog_ac_ct_STRIP="strip"3.1139 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1140 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1141 break 23.1142 fi3.1143 done3.1144 @@ -2253,11 +2369,11 @@3.1145 fi3.1146 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP3.1147 if test -n "$ac_ct_STRIP"; then3.1148 - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&53.1149 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }3.1150 -else3.1151 - { echo "$as_me:$LINENO: result: no" >&53.1152 -echo "${ECHO_T}no" >&6; }3.1153 + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&53.1154 +$as_echo "$ac_ct_STRIP" >&6; }3.1155 +else3.1156 + { $as_echo "$as_me:$LINENO: result: no" >&53.1157 +$as_echo "no" >&6; }3.1158 fi3.1160 if test "x$ac_ct_STRIP" = x; then3.1161 @@ -2265,10 +2381,10 @@3.1162 else3.1163 case $cross_compiling:$ac_tool_warned in3.1164 yes:)3.1165 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.1166 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.1167 whose name does not start with the host triplet. If you think this3.1168 configuration is useful to you, please write to autoconf@gnu.org." >&53.1169 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.1170 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.1171 whose name does not start with the host triplet. If you think this3.1172 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.1173 ac_tool_warned=yes ;;3.1174 @@ -2294,8 +2410,8 @@3.1178 -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&53.1179 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }3.1180 +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&53.1181 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }3.1182 # Check whether --enable-maintainer-mode was given.3.1183 if test "${enable_maintainer_mode+set}" = set; then3.1184 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval3.1185 @@ -2303,8 +2419,8 @@3.1186 USE_MAINTAINER_MODE=no3.1187 fi3.1189 - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&53.1190 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }3.1191 + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&53.1192 +$as_echo "$USE_MAINTAINER_MODE" >&6; }3.1195 if test $USE_MAINTAINER_MODE = yes; then3.1196 @@ -2333,8 +2449,8 @@3.1197 .PHONY: am__doit3.1198 END3.1199 # If we don't find an include directive, just comment out the code.3.1200 -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&53.1201 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }3.1202 +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&53.1203 +$as_echo_n "checking for style of include used by $am_make... " >&6; }3.1204 am__include="#"3.1205 am__quote=3.1206 _am_result=none3.1207 @@ -2361,8 +2477,8 @@3.1208 fi3.1211 -{ echo "$as_me:$LINENO: result: $_am_result" >&53.1212 -echo "${ECHO_T}$_am_result" >&6; }3.1213 +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&53.1214 +$as_echo "$_am_result" >&6; }3.1215 rm -f confinc confmf3.1217 # Check whether --enable-dependency-tracking was given.3.1218 @@ -2394,10 +2510,10 @@3.1219 if test -n "$ac_tool_prefix"; then3.1220 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.3.1221 set dummy ${ac_tool_prefix}gcc; ac_word=$23.1222 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1223 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1224 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1225 +$as_echo_n "checking for $ac_word... " >&6; }3.1226 if test "${ac_cv_prog_CC+set}" = set; then3.1227 - echo $ECHO_N "(cached) $ECHO_C" >&63.1228 + $as_echo_n "(cached) " >&63.1229 else3.1230 if test -n "$CC"; then3.1231 ac_cv_prog_CC="$CC" # Let the user override the test.3.1232 @@ -2410,7 +2526,7 @@3.1233 for ac_exec_ext in '' $ac_executable_extensions; do3.1234 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1235 ac_cv_prog_CC="${ac_tool_prefix}gcc"3.1236 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1237 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1238 break 23.1239 fi3.1240 done3.1241 @@ -2421,11 +2537,11 @@3.1242 fi3.1243 CC=$ac_cv_prog_CC3.1244 if test -n "$CC"; then3.1245 - { echo "$as_me:$LINENO: result: $CC" >&53.1246 -echo "${ECHO_T}$CC" >&6; }3.1247 -else3.1248 - { echo "$as_me:$LINENO: result: no" >&53.1249 -echo "${ECHO_T}no" >&6; }3.1250 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.1251 +$as_echo "$CC" >&6; }3.1252 +else3.1253 + { $as_echo "$as_me:$LINENO: result: no" >&53.1254 +$as_echo "no" >&6; }3.1255 fi3.1258 @@ -2434,10 +2550,10 @@3.1259 ac_ct_CC=$CC3.1260 # Extract the first word of "gcc", so it can be a program name with args.3.1261 set dummy gcc; ac_word=$23.1262 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1263 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1264 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1265 +$as_echo_n "checking for $ac_word... " >&6; }3.1266 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then3.1267 - echo $ECHO_N "(cached) $ECHO_C" >&63.1268 + $as_echo_n "(cached) " >&63.1269 else3.1270 if test -n "$ac_ct_CC"; then3.1271 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.3.1272 @@ -2450,7 +2566,7 @@3.1273 for ac_exec_ext in '' $ac_executable_extensions; do3.1274 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1275 ac_cv_prog_ac_ct_CC="gcc"3.1276 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1277 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1278 break 23.1279 fi3.1280 done3.1281 @@ -2461,11 +2577,11 @@3.1282 fi3.1283 ac_ct_CC=$ac_cv_prog_ac_ct_CC3.1284 if test -n "$ac_ct_CC"; then3.1285 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.1286 -echo "${ECHO_T}$ac_ct_CC" >&6; }3.1287 -else3.1288 - { echo "$as_me:$LINENO: result: no" >&53.1289 -echo "${ECHO_T}no" >&6; }3.1290 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.1291 +$as_echo "$ac_ct_CC" >&6; }3.1292 +else3.1293 + { $as_echo "$as_me:$LINENO: result: no" >&53.1294 +$as_echo "no" >&6; }3.1295 fi3.1297 if test "x$ac_ct_CC" = x; then3.1298 @@ -2473,10 +2589,10 @@3.1299 else3.1300 case $cross_compiling:$ac_tool_warned in3.1301 yes:)3.1302 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.1303 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.1304 whose name does not start with the host triplet. If you think this3.1305 configuration is useful to you, please write to autoconf@gnu.org." >&53.1306 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.1307 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.1308 whose name does not start with the host triplet. If you think this3.1309 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.1310 ac_tool_warned=yes ;;3.1311 @@ -2491,10 +2607,10 @@3.1312 if test -n "$ac_tool_prefix"; then3.1313 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.3.1314 set dummy ${ac_tool_prefix}cc; ac_word=$23.1315 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1316 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1317 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1318 +$as_echo_n "checking for $ac_word... " >&6; }3.1319 if test "${ac_cv_prog_CC+set}" = set; then3.1320 - echo $ECHO_N "(cached) $ECHO_C" >&63.1321 + $as_echo_n "(cached) " >&63.1322 else3.1323 if test -n "$CC"; then3.1324 ac_cv_prog_CC="$CC" # Let the user override the test.3.1325 @@ -2507,7 +2623,7 @@3.1326 for ac_exec_ext in '' $ac_executable_extensions; do3.1327 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1328 ac_cv_prog_CC="${ac_tool_prefix}cc"3.1329 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1330 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1331 break 23.1332 fi3.1333 done3.1334 @@ -2518,11 +2634,11 @@3.1335 fi3.1336 CC=$ac_cv_prog_CC3.1337 if test -n "$CC"; then3.1338 - { echo "$as_me:$LINENO: result: $CC" >&53.1339 -echo "${ECHO_T}$CC" >&6; }3.1340 -else3.1341 - { echo "$as_me:$LINENO: result: no" >&53.1342 -echo "${ECHO_T}no" >&6; }3.1343 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.1344 +$as_echo "$CC" >&6; }3.1345 +else3.1346 + { $as_echo "$as_me:$LINENO: result: no" >&53.1347 +$as_echo "no" >&6; }3.1348 fi3.1351 @@ -2531,10 +2647,10 @@3.1352 if test -z "$CC"; then3.1353 # Extract the first word of "cc", so it can be a program name with args.3.1354 set dummy cc; ac_word=$23.1355 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1356 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1357 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1358 +$as_echo_n "checking for $ac_word... " >&6; }3.1359 if test "${ac_cv_prog_CC+set}" = set; then3.1360 - echo $ECHO_N "(cached) $ECHO_C" >&63.1361 + $as_echo_n "(cached) " >&63.1362 else3.1363 if test -n "$CC"; then3.1364 ac_cv_prog_CC="$CC" # Let the user override the test.3.1365 @@ -2552,7 +2668,7 @@3.1366 continue3.1367 fi3.1368 ac_cv_prog_CC="cc"3.1369 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1370 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1371 break 23.1372 fi3.1373 done3.1374 @@ -2575,11 +2691,11 @@3.1375 fi3.1376 CC=$ac_cv_prog_CC3.1377 if test -n "$CC"; then3.1378 - { echo "$as_me:$LINENO: result: $CC" >&53.1379 -echo "${ECHO_T}$CC" >&6; }3.1380 -else3.1381 - { echo "$as_me:$LINENO: result: no" >&53.1382 -echo "${ECHO_T}no" >&6; }3.1383 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.1384 +$as_echo "$CC" >&6; }3.1385 +else3.1386 + { $as_echo "$as_me:$LINENO: result: no" >&53.1387 +$as_echo "no" >&6; }3.1388 fi3.1391 @@ -2590,10 +2706,10 @@3.1392 do3.1393 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.3.1394 set dummy $ac_tool_prefix$ac_prog; ac_word=$23.1395 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1396 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1397 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1398 +$as_echo_n "checking for $ac_word... " >&6; }3.1399 if test "${ac_cv_prog_CC+set}" = set; then3.1400 - echo $ECHO_N "(cached) $ECHO_C" >&63.1401 + $as_echo_n "(cached) " >&63.1402 else3.1403 if test -n "$CC"; then3.1404 ac_cv_prog_CC="$CC" # Let the user override the test.3.1405 @@ -2606,7 +2722,7 @@3.1406 for ac_exec_ext in '' $ac_executable_extensions; do3.1407 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1408 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"3.1409 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1410 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1411 break 23.1412 fi3.1413 done3.1414 @@ -2617,11 +2733,11 @@3.1415 fi3.1416 CC=$ac_cv_prog_CC3.1417 if test -n "$CC"; then3.1418 - { echo "$as_me:$LINENO: result: $CC" >&53.1419 -echo "${ECHO_T}$CC" >&6; }3.1420 -else3.1421 - { echo "$as_me:$LINENO: result: no" >&53.1422 -echo "${ECHO_T}no" >&6; }3.1423 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.1424 +$as_echo "$CC" >&6; }3.1425 +else3.1426 + { $as_echo "$as_me:$LINENO: result: no" >&53.1427 +$as_echo "no" >&6; }3.1428 fi3.1431 @@ -2634,10 +2750,10 @@3.1432 do3.1433 # Extract the first word of "$ac_prog", so it can be a program name with args.3.1434 set dummy $ac_prog; ac_word=$23.1435 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.1436 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.1437 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.1438 +$as_echo_n "checking for $ac_word... " >&6; }3.1439 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then3.1440 - echo $ECHO_N "(cached) $ECHO_C" >&63.1441 + $as_echo_n "(cached) " >&63.1442 else3.1443 if test -n "$ac_ct_CC"; then3.1444 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.3.1445 @@ -2650,7 +2766,7 @@3.1446 for ac_exec_ext in '' $ac_executable_extensions; do3.1447 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.1448 ac_cv_prog_ac_ct_CC="$ac_prog"3.1449 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1450 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.1451 break 23.1452 fi3.1453 done3.1454 @@ -2661,11 +2777,11 @@3.1455 fi3.1456 ac_ct_CC=$ac_cv_prog_ac_ct_CC3.1457 if test -n "$ac_ct_CC"; then3.1458 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.1459 -echo "${ECHO_T}$ac_ct_CC" >&6; }3.1460 -else3.1461 - { echo "$as_me:$LINENO: result: no" >&53.1462 -echo "${ECHO_T}no" >&6; }3.1463 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.1464 +$as_echo "$ac_ct_CC" >&6; }3.1465 +else3.1466 + { $as_echo "$as_me:$LINENO: result: no" >&53.1467 +$as_echo "no" >&6; }3.1468 fi3.1471 @@ -2677,10 +2793,10 @@3.1472 else3.1473 case $cross_compiling:$ac_tool_warned in3.1474 yes:)3.1475 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.1476 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.1477 whose name does not start with the host triplet. If you think this3.1478 configuration is useful to you, please write to autoconf@gnu.org." >&53.1479 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.1480 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.1481 whose name does not start with the host triplet. If you think this3.1482 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.1483 ac_tool_warned=yes ;;3.1484 @@ -2692,44 +2808,48 @@3.1485 fi3.1488 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH3.1489 -See \`config.log' for more details." >&53.1490 -echo "$as_me: error: no acceptable C compiler found in \$PATH3.1491 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH3.1492 +See \`config.log' for more details." >&53.1493 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH3.1494 See \`config.log' for more details." >&2;}3.1495 { (exit 1); exit 1; }; }3.1497 # Provide some information about the compiler.3.1498 -echo "$as_me:$LINENO: checking for C compiler version" >&53.1499 -ac_compiler=`set X $ac_compile; echo $2`3.1500 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&53.1501 +set X $ac_compile3.1502 +ac_compiler=$23.1503 { (ac_try="$ac_compiler --version >&5"3.1504 case "(($ac_try" in3.1505 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1506 *) ac_try_echo=$ac_try;;3.1507 esac3.1508 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1509 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1510 +$as_echo "$ac_try_echo") >&53.1511 (eval "$ac_compiler --version >&5") 2>&53.1512 ac_status=$?3.1513 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1514 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1515 (exit $ac_status); }3.1516 { (ac_try="$ac_compiler -v >&5"3.1517 case "(($ac_try" in3.1518 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1519 *) ac_try_echo=$ac_try;;3.1520 esac3.1521 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1522 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1523 +$as_echo "$ac_try_echo") >&53.1524 (eval "$ac_compiler -v >&5") 2>&53.1525 ac_status=$?3.1526 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1527 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1528 (exit $ac_status); }3.1529 { (ac_try="$ac_compiler -V >&5"3.1530 case "(($ac_try" in3.1531 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1532 *) ac_try_echo=$ac_try;;3.1533 esac3.1534 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1535 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1536 +$as_echo "$ac_try_echo") >&53.1537 (eval "$ac_compiler -V >&5") 2>&53.1538 ac_status=$?3.1539 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1540 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1541 (exit $ac_status); }3.1543 cat >conftest.$ac_ext <<_ACEOF3.1544 @@ -2748,27 +2868,22 @@3.1545 }3.1546 _ACEOF3.1547 ac_clean_files_save=$ac_clean_files3.1548 -ac_clean_files="$ac_clean_files a.out a.exe b.out"3.1549 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"3.1550 # Try to create an executable without -o first, disregard a.out.3.1551 # It will help us diagnose broken compilers, and finding out an intuition3.1552 # of exeext.3.1553 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&53.1554 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }3.1555 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`3.1556 -#3.1557 -# List of possible output files, starting from the most likely.3.1558 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)3.1559 -# only as a last resort. b.out is created by i960 compilers.3.1560 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'3.1561 -#3.1562 -# The IRIX 6 linker writes into existing files which may not be3.1563 -# executable, retaining their permissions. Remove them first so a3.1564 -# subsequent execution test works.3.1565 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&53.1566 +$as_echo_n "checking for C compiler default output file name... " >&6; }3.1567 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`3.1568 +3.1569 +# The possible output files:3.1570 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"3.1571 +3.1572 ac_rmfiles=3.1573 for ac_file in $ac_files3.1574 do3.1575 case $ac_file in3.1576 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;3.1577 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;3.1578 * ) ac_rmfiles="$ac_rmfiles $ac_file";;3.1579 esac3.1580 done3.1581 @@ -2779,10 +2894,11 @@3.1582 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1583 *) ac_try_echo=$ac_try;;3.1584 esac3.1585 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1586 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1587 +$as_echo "$ac_try_echo") >&53.1588 (eval "$ac_link_default") 2>&53.1589 ac_status=$?3.1590 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1591 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1592 (exit $ac_status); }; then3.1593 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.3.1594 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'3.1595 @@ -2793,7 +2909,7 @@3.1596 do3.1597 test -f "$ac_file" || continue3.1598 case $ac_file in3.1599 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )3.1600 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )3.1601 ;;3.1602 [ab].out )3.1603 # We found the default executable, but exeext='' is most3.1604 @@ -2820,15 +2936,15 @@3.1605 ac_file=''3.1606 fi3.1608 -{ echo "$as_me:$LINENO: result: $ac_file" >&53.1609 -echo "${ECHO_T}$ac_file" >&6; }3.1610 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&53.1611 +$as_echo "$ac_file" >&6; }3.1612 if test -z "$ac_file"; then3.1613 - echo "$as_me: failed program was:" >&53.1614 -sed 's/^/| /' conftest.$ac_ext >&53.1615 -3.1616 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables3.1617 -See \`config.log' for more details." >&53.1618 -echo "$as_me: error: C compiler cannot create executables3.1619 + $as_echo "$as_me: failed program was:" >&53.1620 +sed 's/^/| /' conftest.$ac_ext >&53.1621 +3.1622 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables3.1623 +See \`config.log' for more details." >&53.1624 +$as_echo "$as_me: error: C compiler cannot create executables3.1625 See \`config.log' for more details." >&2;}3.1626 { (exit 77); exit 77; }; }3.1627 fi3.1628 @@ -2837,8 +2953,8 @@3.1630 # Check that the compiler produces executables we can run. If not, either3.1631 # the compiler is broken, or we cross compile.3.1632 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&53.1633 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }3.1634 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&53.1635 +$as_echo_n "checking whether the C compiler works... " >&6; }3.1636 # FIXME: These cross compiler hacks should be removed for Autoconf 3.03.1637 # If not cross compiling, check that we can run a simple program.3.1638 if test "$cross_compiling" != yes; then3.1639 @@ -2847,49 +2963,51 @@3.1640 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1641 *) ac_try_echo=$ac_try;;3.1642 esac3.1643 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1644 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1645 +$as_echo "$ac_try_echo") >&53.1646 (eval "$ac_try") 2>&53.1647 ac_status=$?3.1648 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1649 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1650 (exit $ac_status); }; }; then3.1651 cross_compiling=no3.1652 else3.1653 if test "$cross_compiling" = maybe; then3.1654 cross_compiling=yes3.1655 else3.1656 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.3.1657 + { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.3.1658 If you meant to cross compile, use \`--host'.3.1659 See \`config.log' for more details." >&53.1660 -echo "$as_me: error: cannot run C compiled programs.3.1661 +$as_echo "$as_me: error: cannot run C compiled programs.3.1662 If you meant to cross compile, use \`--host'.3.1663 See \`config.log' for more details." >&2;}3.1664 { (exit 1); exit 1; }; }3.1665 fi3.1666 fi3.1667 fi3.1668 -{ echo "$as_me:$LINENO: result: yes" >&53.1669 -echo "${ECHO_T}yes" >&6; }3.1670 -3.1671 -rm -f a.out a.exe conftest$ac_cv_exeext b.out3.1672 +{ $as_echo "$as_me:$LINENO: result: yes" >&53.1673 +$as_echo "yes" >&6; }3.1674 +3.1675 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out3.1676 ac_clean_files=$ac_clean_files_save3.1677 # Check that the compiler produces executables we can run. If not, either3.1678 # the compiler is broken, or we cross compile.3.1679 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&53.1680 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }3.1681 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&53.1682 -echo "${ECHO_T}$cross_compiling" >&6; }3.1683 -3.1684 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&53.1685 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }3.1686 -if { (ac_try="$ac_link"3.1687 -case "(($ac_try" in3.1688 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1689 - *) ac_try_echo=$ac_try;;3.1690 -esac3.1691 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1692 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&53.1693 +$as_echo_n "checking whether we are cross compiling... " >&6; }3.1694 +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&53.1695 +$as_echo "$cross_compiling" >&6; }3.1696 +3.1697 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&53.1698 +$as_echo_n "checking for suffix of executables... " >&6; }3.1699 +if { (ac_try="$ac_link"3.1700 +case "(($ac_try" in3.1701 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1702 + *) ac_try_echo=$ac_try;;3.1703 +esac3.1704 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1705 +$as_echo "$ac_try_echo") >&53.1706 (eval "$ac_link") 2>&53.1707 ac_status=$?3.1708 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1709 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1710 (exit $ac_status); }; then3.1711 # If both `conftest.exe' and `conftest' are `present' (well, observable)3.1712 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will3.1713 @@ -2898,31 +3016,31 @@3.1714 for ac_file in conftest.exe conftest conftest.*; do3.1715 test -f "$ac_file" || continue3.1716 case $ac_file in3.1717 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;3.1718 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;3.1719 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`3.1720 break;;3.1721 * ) break;;3.1722 esac3.1723 done3.1724 else3.1725 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link3.1726 -See \`config.log' for more details." >&53.1727 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link3.1728 + { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link3.1729 +See \`config.log' for more details." >&53.1730 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link3.1731 See \`config.log' for more details." >&2;}3.1732 { (exit 1); exit 1; }; }3.1733 fi3.1735 rm -f conftest$ac_cv_exeext3.1736 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&53.1737 -echo "${ECHO_T}$ac_cv_exeext" >&6; }3.1738 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&53.1739 +$as_echo "$ac_cv_exeext" >&6; }3.1741 rm -f conftest.$ac_ext3.1742 EXEEXT=$ac_cv_exeext3.1743 ac_exeext=$EXEEXT3.1744 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&53.1745 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }3.1746 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&53.1747 +$as_echo_n "checking for suffix of object files... " >&6; }3.1748 if test "${ac_cv_objext+set}" = set; then3.1749 - echo $ECHO_N "(cached) $ECHO_C" >&63.1750 + $as_echo_n "(cached) " >&63.1751 else3.1752 cat >conftest.$ac_ext <<_ACEOF3.1753 /* confdefs.h. */3.1754 @@ -2945,40 +3063,41 @@3.1755 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1756 *) ac_try_echo=$ac_try;;3.1757 esac3.1758 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1759 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1760 +$as_echo "$ac_try_echo") >&53.1761 (eval "$ac_compile") 2>&53.1762 ac_status=$?3.1763 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1764 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1765 (exit $ac_status); }; then3.1766 for ac_file in conftest.o conftest.obj conftest.*; do3.1767 test -f "$ac_file" || continue;3.1768 case $ac_file in3.1769 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;3.1770 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;3.1771 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`3.1772 break;;3.1773 esac3.1774 done3.1775 else3.1776 - echo "$as_me: failed program was:" >&53.1777 -sed 's/^/| /' conftest.$ac_ext >&53.1778 -3.1779 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile3.1780 -See \`config.log' for more details." >&53.1781 -echo "$as_me: error: cannot compute suffix of object files: cannot compile3.1782 + $as_echo "$as_me: failed program was:" >&53.1783 +sed 's/^/| /' conftest.$ac_ext >&53.1784 +3.1785 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile3.1786 +See \`config.log' for more details." >&53.1787 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile3.1788 See \`config.log' for more details." >&2;}3.1789 { (exit 1); exit 1; }; }3.1790 fi3.1792 rm -f conftest.$ac_cv_objext conftest.$ac_ext3.1793 fi3.1794 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&53.1795 -echo "${ECHO_T}$ac_cv_objext" >&6; }3.1796 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&53.1797 +$as_echo "$ac_cv_objext" >&6; }3.1798 OBJEXT=$ac_cv_objext3.1799 ac_objext=$OBJEXT3.1800 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&53.1801 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }3.1802 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&53.1803 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }3.1804 if test "${ac_cv_c_compiler_gnu+set}" = set; then3.1805 - echo $ECHO_N "(cached) $ECHO_C" >&63.1806 + $as_echo_n "(cached) " >&63.1807 else3.1808 cat >conftest.$ac_ext <<_ACEOF3.1809 /* confdefs.h. */3.1810 @@ -3004,20 +3123,21 @@3.1811 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1812 *) ac_try_echo=$ac_try;;3.1813 esac3.1814 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1815 - (eval "$ac_compile") 2>conftest.er13.1816 - ac_status=$?3.1817 - grep -v '^ *+' conftest.er1 >conftest.err3.1818 - rm -f conftest.er13.1819 - cat conftest.err >&53.1820 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1821 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1822 +$as_echo "$ac_try_echo") >&53.1823 + (eval "$ac_compile") 2>conftest.er13.1824 + ac_status=$?3.1825 + grep -v '^ *+' conftest.er1 >conftest.err3.1826 + rm -f conftest.er13.1827 + cat conftest.err >&53.1828 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1829 (exit $ac_status); } && {3.1830 test -z "$ac_c_werror_flag" ||3.1831 test ! -s conftest.err3.1832 } && test -s conftest.$ac_objext; then3.1833 ac_compiler_gnu=yes3.1834 else3.1835 - echo "$as_me: failed program was:" >&53.1836 + $as_echo "$as_me: failed program was:" >&53.1837 sed 's/^/| /' conftest.$ac_ext >&53.1839 ac_compiler_gnu=no3.1840 @@ -3027,15 +3147,19 @@3.1841 ac_cv_c_compiler_gnu=$ac_compiler_gnu3.1843 fi3.1844 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&53.1845 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }3.1846 -GCC=`test $ac_compiler_gnu = yes && echo yes`3.1847 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&53.1848 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }3.1849 +if test $ac_compiler_gnu = yes; then3.1850 + GCC=yes3.1851 +else3.1852 + GCC=3.1853 +fi3.1854 ac_test_CFLAGS=${CFLAGS+set}3.1855 ac_save_CFLAGS=$CFLAGS3.1856 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&53.1857 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }3.1858 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&53.1859 +$as_echo_n "checking whether $CC accepts -g... " >&6; }3.1860 if test "${ac_cv_prog_cc_g+set}" = set; then3.1861 - echo $ECHO_N "(cached) $ECHO_C" >&63.1862 + $as_echo_n "(cached) " >&63.1863 else3.1864 ac_save_c_werror_flag=$ac_c_werror_flag3.1865 ac_c_werror_flag=yes3.1866 @@ -3062,20 +3186,21 @@3.1867 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1868 *) ac_try_echo=$ac_try;;3.1869 esac3.1870 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1871 - (eval "$ac_compile") 2>conftest.er13.1872 - ac_status=$?3.1873 - grep -v '^ *+' conftest.er1 >conftest.err3.1874 - rm -f conftest.er13.1875 - cat conftest.err >&53.1876 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1877 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1878 +$as_echo "$ac_try_echo") >&53.1879 + (eval "$ac_compile") 2>conftest.er13.1880 + ac_status=$?3.1881 + grep -v '^ *+' conftest.er1 >conftest.err3.1882 + rm -f conftest.er13.1883 + cat conftest.err >&53.1884 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1885 (exit $ac_status); } && {3.1886 test -z "$ac_c_werror_flag" ||3.1887 test ! -s conftest.err3.1888 } && test -s conftest.$ac_objext; then3.1889 ac_cv_prog_cc_g=yes3.1890 else3.1891 - echo "$as_me: failed program was:" >&53.1892 + $as_echo "$as_me: failed program was:" >&53.1893 sed 's/^/| /' conftest.$ac_ext >&53.1895 CFLAGS=""3.1896 @@ -3100,20 +3225,21 @@3.1897 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1898 *) ac_try_echo=$ac_try;;3.1899 esac3.1900 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1901 - (eval "$ac_compile") 2>conftest.er13.1902 - ac_status=$?3.1903 - grep -v '^ *+' conftest.er1 >conftest.err3.1904 - rm -f conftest.er13.1905 - cat conftest.err >&53.1906 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1907 - (exit $ac_status); } && {3.1908 - test -z "$ac_c_werror_flag" ||3.1909 - test ! -s conftest.err3.1910 - } && test -s conftest.$ac_objext; then3.1911 - :3.1912 -else3.1913 - echo "$as_me: failed program was:" >&53.1914 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1915 +$as_echo "$ac_try_echo") >&53.1916 + (eval "$ac_compile") 2>conftest.er13.1917 + ac_status=$?3.1918 + grep -v '^ *+' conftest.er1 >conftest.err3.1919 + rm -f conftest.er13.1920 + cat conftest.err >&53.1921 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1922 + (exit $ac_status); } && {3.1923 + test -z "$ac_c_werror_flag" ||3.1924 + test ! -s conftest.err3.1925 + } && test -s conftest.$ac_objext; then3.1926 + :3.1927 +else3.1928 + $as_echo "$as_me: failed program was:" >&53.1929 sed 's/^/| /' conftest.$ac_ext >&53.1931 ac_c_werror_flag=$ac_save_c_werror_flag3.1932 @@ -3139,20 +3265,21 @@3.1933 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1934 *) ac_try_echo=$ac_try;;3.1935 esac3.1936 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1937 - (eval "$ac_compile") 2>conftest.er13.1938 - ac_status=$?3.1939 - grep -v '^ *+' conftest.er1 >conftest.err3.1940 - rm -f conftest.er13.1941 - cat conftest.err >&53.1942 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1943 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1944 +$as_echo "$ac_try_echo") >&53.1945 + (eval "$ac_compile") 2>conftest.er13.1946 + ac_status=$?3.1947 + grep -v '^ *+' conftest.er1 >conftest.err3.1948 + rm -f conftest.er13.1949 + cat conftest.err >&53.1950 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.1951 (exit $ac_status); } && {3.1952 test -z "$ac_c_werror_flag" ||3.1953 test ! -s conftest.err3.1954 } && test -s conftest.$ac_objext; then3.1955 ac_cv_prog_cc_g=yes3.1956 else3.1957 - echo "$as_me: failed program was:" >&53.1958 + $as_echo "$as_me: failed program was:" >&53.1959 sed 's/^/| /' conftest.$ac_ext >&53.1962 @@ -3167,8 +3294,8 @@3.1963 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.1964 ac_c_werror_flag=$ac_save_c_werror_flag3.1965 fi3.1966 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&53.1967 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }3.1968 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&53.1969 +$as_echo "$ac_cv_prog_cc_g" >&6; }3.1970 if test "$ac_test_CFLAGS" = set; then3.1971 CFLAGS=$ac_save_CFLAGS3.1972 elif test $ac_cv_prog_cc_g = yes; then3.1973 @@ -3184,10 +3311,10 @@3.1974 CFLAGS=3.1975 fi3.1976 fi3.1977 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&53.1978 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }3.1979 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&53.1980 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }3.1981 if test "${ac_cv_prog_cc_c89+set}" = set; then3.1982 - echo $ECHO_N "(cached) $ECHO_C" >&63.1983 + $as_echo_n "(cached) " >&63.1984 else3.1985 ac_cv_prog_cc_c89=no3.1986 ac_save_CC=$CC3.1987 @@ -3258,20 +3385,21 @@3.1988 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.1989 *) ac_try_echo=$ac_try;;3.1990 esac3.1991 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.1992 - (eval "$ac_compile") 2>conftest.er13.1993 - ac_status=$?3.1994 - grep -v '^ *+' conftest.er1 >conftest.err3.1995 - rm -f conftest.er13.1996 - cat conftest.err >&53.1997 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.1998 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.1999 +$as_echo "$ac_try_echo") >&53.2000 + (eval "$ac_compile") 2>conftest.er13.2001 + ac_status=$?3.2002 + grep -v '^ *+' conftest.er1 >conftest.err3.2003 + rm -f conftest.er13.2004 + cat conftest.err >&53.2005 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2006 (exit $ac_status); } && {3.2007 test -z "$ac_c_werror_flag" ||3.2008 test ! -s conftest.err3.2009 } && test -s conftest.$ac_objext; then3.2010 ac_cv_prog_cc_c89=$ac_arg3.2011 else3.2012 - echo "$as_me: failed program was:" >&53.2013 + $as_echo "$as_me: failed program was:" >&53.2014 sed 's/^/| /' conftest.$ac_ext >&53.2017 @@ -3287,15 +3415,15 @@3.2018 # AC_CACHE_VAL3.2019 case "x$ac_cv_prog_cc_c89" in3.2020 x)3.2021 - { echo "$as_me:$LINENO: result: none needed" >&53.2022 -echo "${ECHO_T}none needed" >&6; } ;;3.2023 + { $as_echo "$as_me:$LINENO: result: none needed" >&53.2024 +$as_echo "none needed" >&6; } ;;3.2025 xno)3.2026 - { echo "$as_me:$LINENO: result: unsupported" >&53.2027 -echo "${ECHO_T}unsupported" >&6; } ;;3.2028 + { $as_echo "$as_me:$LINENO: result: unsupported" >&53.2029 +$as_echo "unsupported" >&6; } ;;3.2030 *)3.2031 CC="$CC $ac_cv_prog_cc_c89"3.2032 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&53.2033 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;3.2034 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&53.2035 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;3.2036 esac3.2039 @@ -3307,10 +3435,10 @@3.2041 depcc="$CC" am_compiler_list=3.2043 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&53.2044 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }3.2045 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&53.2046 +$as_echo_n "checking dependency style of $depcc... " >&6; }3.2047 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then3.2048 - echo $ECHO_N "(cached) $ECHO_C" >&63.2049 + $as_echo_n "(cached) " >&63.2050 else3.2051 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then3.2052 # We make a subdir and do the tests there. Otherwise we can end up3.2053 @@ -3397,8 +3525,8 @@3.2054 fi3.2056 fi3.2057 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&53.2058 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }3.2059 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&53.2060 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }3.2061 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type3.2064 @@ -3416,10 +3544,10 @@3.2068 - { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&53.2069 -echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }3.2070 + { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&53.2071 +$as_echo_n "checking for strerror in -lcposix... " >&6; }3.2072 if test "${ac_cv_lib_cposix_strerror+set}" = set; then3.2073 - echo $ECHO_N "(cached) $ECHO_C" >&63.2074 + $as_echo_n "(cached) " >&63.2075 else3.2076 ac_check_lib_save_LIBS=$LIBS3.2077 LIBS="-lcposix $LIBS"3.2078 @@ -3451,32 +3579,36 @@3.2079 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2080 *) ac_try_echo=$ac_try;;3.2081 esac3.2082 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2083 - (eval "$ac_link") 2>conftest.er13.2084 - ac_status=$?3.2085 - grep -v '^ *+' conftest.er1 >conftest.err3.2086 - rm -f conftest.er13.2087 - cat conftest.err >&53.2088 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2089 - (exit $ac_status); } && {3.2090 - test -z "$ac_c_werror_flag" ||3.2091 - test ! -s conftest.err3.2092 - } && test -s conftest$ac_exeext &&3.2093 - $as_test_x conftest$ac_exeext; then3.2094 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2095 +$as_echo "$ac_try_echo") >&53.2096 + (eval "$ac_link") 2>conftest.er13.2097 + ac_status=$?3.2098 + grep -v '^ *+' conftest.er1 >conftest.err3.2099 + rm -f conftest.er13.2100 + cat conftest.err >&53.2101 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2102 + (exit $ac_status); } && {3.2103 + test -z "$ac_c_werror_flag" ||3.2104 + test ! -s conftest.err3.2105 + } && test -s conftest$ac_exeext && {3.2106 + test "$cross_compiling" = yes ||3.2107 + $as_test_x conftest$ac_exeext3.2108 + }; then3.2109 ac_cv_lib_cposix_strerror=yes3.2110 else3.2111 - echo "$as_me: failed program was:" >&53.2112 + $as_echo "$as_me: failed program was:" >&53.2113 sed 's/^/| /' conftest.$ac_ext >&53.2115 ac_cv_lib_cposix_strerror=no3.2116 fi3.2118 +rm -rf conftest.dSYM3.2119 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.2120 conftest$ac_exeext conftest.$ac_ext3.2121 LIBS=$ac_check_lib_save_LIBS3.2122 fi3.2123 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&53.2124 -echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }3.2125 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&53.2126 +$as_echo "$ac_cv_lib_cposix_strerror" >&6; }3.2127 if test $ac_cv_lib_cposix_strerror = yes; then3.2128 LIBS="$LIBS -lcposix"3.2129 fi3.2130 @@ -3491,10 +3623,10 @@3.2131 if test -n "$ac_tool_prefix"; then3.2132 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.3.2133 set dummy ${ac_tool_prefix}gcc; ac_word=$23.2134 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2135 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2136 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2137 +$as_echo_n "checking for $ac_word... " >&6; }3.2138 if test "${ac_cv_prog_CC+set}" = set; then3.2139 - echo $ECHO_N "(cached) $ECHO_C" >&63.2140 + $as_echo_n "(cached) " >&63.2141 else3.2142 if test -n "$CC"; then3.2143 ac_cv_prog_CC="$CC" # Let the user override the test.3.2144 @@ -3507,7 +3639,7 @@3.2145 for ac_exec_ext in '' $ac_executable_extensions; do3.2146 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2147 ac_cv_prog_CC="${ac_tool_prefix}gcc"3.2148 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2149 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2150 break 23.2151 fi3.2152 done3.2153 @@ -3518,11 +3650,11 @@3.2154 fi3.2155 CC=$ac_cv_prog_CC3.2156 if test -n "$CC"; then3.2157 - { echo "$as_me:$LINENO: result: $CC" >&53.2158 -echo "${ECHO_T}$CC" >&6; }3.2159 -else3.2160 - { echo "$as_me:$LINENO: result: no" >&53.2161 -echo "${ECHO_T}no" >&6; }3.2162 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2163 +$as_echo "$CC" >&6; }3.2164 +else3.2165 + { $as_echo "$as_me:$LINENO: result: no" >&53.2166 +$as_echo "no" >&6; }3.2167 fi3.2170 @@ -3531,10 +3663,10 @@3.2171 ac_ct_CC=$CC3.2172 # Extract the first word of "gcc", so it can be a program name with args.3.2173 set dummy gcc; ac_word=$23.2174 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2175 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2176 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2177 +$as_echo_n "checking for $ac_word... " >&6; }3.2178 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then3.2179 - echo $ECHO_N "(cached) $ECHO_C" >&63.2180 + $as_echo_n "(cached) " >&63.2181 else3.2182 if test -n "$ac_ct_CC"; then3.2183 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.3.2184 @@ -3547,7 +3679,7 @@3.2185 for ac_exec_ext in '' $ac_executable_extensions; do3.2186 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2187 ac_cv_prog_ac_ct_CC="gcc"3.2188 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2189 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2190 break 23.2191 fi3.2192 done3.2193 @@ -3558,11 +3690,11 @@3.2194 fi3.2195 ac_ct_CC=$ac_cv_prog_ac_ct_CC3.2196 if test -n "$ac_ct_CC"; then3.2197 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2198 -echo "${ECHO_T}$ac_ct_CC" >&6; }3.2199 -else3.2200 - { echo "$as_me:$LINENO: result: no" >&53.2201 -echo "${ECHO_T}no" >&6; }3.2202 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2203 +$as_echo "$ac_ct_CC" >&6; }3.2204 +else3.2205 + { $as_echo "$as_me:$LINENO: result: no" >&53.2206 +$as_echo "no" >&6; }3.2207 fi3.2209 if test "x$ac_ct_CC" = x; then3.2210 @@ -3570,10 +3702,10 @@3.2211 else3.2212 case $cross_compiling:$ac_tool_warned in3.2213 yes:)3.2214 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2215 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2216 whose name does not start with the host triplet. If you think this3.2217 configuration is useful to you, please write to autoconf@gnu.org." >&53.2218 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2219 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2220 whose name does not start with the host triplet. If you think this3.2221 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.2222 ac_tool_warned=yes ;;3.2223 @@ -3588,10 +3720,10 @@3.2224 if test -n "$ac_tool_prefix"; then3.2225 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.3.2226 set dummy ${ac_tool_prefix}cc; ac_word=$23.2227 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2228 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2229 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2230 +$as_echo_n "checking for $ac_word... " >&6; }3.2231 if test "${ac_cv_prog_CC+set}" = set; then3.2232 - echo $ECHO_N "(cached) $ECHO_C" >&63.2233 + $as_echo_n "(cached) " >&63.2234 else3.2235 if test -n "$CC"; then3.2236 ac_cv_prog_CC="$CC" # Let the user override the test.3.2237 @@ -3604,7 +3736,7 @@3.2238 for ac_exec_ext in '' $ac_executable_extensions; do3.2239 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2240 ac_cv_prog_CC="${ac_tool_prefix}cc"3.2241 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2242 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2243 break 23.2244 fi3.2245 done3.2246 @@ -3615,11 +3747,11 @@3.2247 fi3.2248 CC=$ac_cv_prog_CC3.2249 if test -n "$CC"; then3.2250 - { echo "$as_me:$LINENO: result: $CC" >&53.2251 -echo "${ECHO_T}$CC" >&6; }3.2252 -else3.2253 - { echo "$as_me:$LINENO: result: no" >&53.2254 -echo "${ECHO_T}no" >&6; }3.2255 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2256 +$as_echo "$CC" >&6; }3.2257 +else3.2258 + { $as_echo "$as_me:$LINENO: result: no" >&53.2259 +$as_echo "no" >&6; }3.2260 fi3.2263 @@ -3628,10 +3760,10 @@3.2264 if test -z "$CC"; then3.2265 # Extract the first word of "cc", so it can be a program name with args.3.2266 set dummy cc; ac_word=$23.2267 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2268 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2269 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2270 +$as_echo_n "checking for $ac_word... " >&6; }3.2271 if test "${ac_cv_prog_CC+set}" = set; then3.2272 - echo $ECHO_N "(cached) $ECHO_C" >&63.2273 + $as_echo_n "(cached) " >&63.2274 else3.2275 if test -n "$CC"; then3.2276 ac_cv_prog_CC="$CC" # Let the user override the test.3.2277 @@ -3649,7 +3781,7 @@3.2278 continue3.2279 fi3.2280 ac_cv_prog_CC="cc"3.2281 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2282 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2283 break 23.2284 fi3.2285 done3.2286 @@ -3672,11 +3804,11 @@3.2287 fi3.2288 CC=$ac_cv_prog_CC3.2289 if test -n "$CC"; then3.2290 - { echo "$as_me:$LINENO: result: $CC" >&53.2291 -echo "${ECHO_T}$CC" >&6; }3.2292 -else3.2293 - { echo "$as_me:$LINENO: result: no" >&53.2294 -echo "${ECHO_T}no" >&6; }3.2295 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2296 +$as_echo "$CC" >&6; }3.2297 +else3.2298 + { $as_echo "$as_me:$LINENO: result: no" >&53.2299 +$as_echo "no" >&6; }3.2300 fi3.2303 @@ -3687,10 +3819,10 @@3.2304 do3.2305 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.3.2306 set dummy $ac_tool_prefix$ac_prog; ac_word=$23.2307 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2308 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2309 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2310 +$as_echo_n "checking for $ac_word... " >&6; }3.2311 if test "${ac_cv_prog_CC+set}" = set; then3.2312 - echo $ECHO_N "(cached) $ECHO_C" >&63.2313 + $as_echo_n "(cached) " >&63.2314 else3.2315 if test -n "$CC"; then3.2316 ac_cv_prog_CC="$CC" # Let the user override the test.3.2317 @@ -3703,7 +3835,7 @@3.2318 for ac_exec_ext in '' $ac_executable_extensions; do3.2319 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2320 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"3.2321 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2322 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2323 break 23.2324 fi3.2325 done3.2326 @@ -3714,11 +3846,11 @@3.2327 fi3.2328 CC=$ac_cv_prog_CC3.2329 if test -n "$CC"; then3.2330 - { echo "$as_me:$LINENO: result: $CC" >&53.2331 -echo "${ECHO_T}$CC" >&6; }3.2332 -else3.2333 - { echo "$as_me:$LINENO: result: no" >&53.2334 -echo "${ECHO_T}no" >&6; }3.2335 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2336 +$as_echo "$CC" >&6; }3.2337 +else3.2338 + { $as_echo "$as_me:$LINENO: result: no" >&53.2339 +$as_echo "no" >&6; }3.2340 fi3.2343 @@ -3731,10 +3863,10 @@3.2344 do3.2345 # Extract the first word of "$ac_prog", so it can be a program name with args.3.2346 set dummy $ac_prog; ac_word=$23.2347 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2348 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2349 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2350 +$as_echo_n "checking for $ac_word... " >&6; }3.2351 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then3.2352 - echo $ECHO_N "(cached) $ECHO_C" >&63.2353 + $as_echo_n "(cached) " >&63.2354 else3.2355 if test -n "$ac_ct_CC"; then3.2356 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.3.2357 @@ -3747,7 +3879,7 @@3.2358 for ac_exec_ext in '' $ac_executable_extensions; do3.2359 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2360 ac_cv_prog_ac_ct_CC="$ac_prog"3.2361 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2362 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2363 break 23.2364 fi3.2365 done3.2366 @@ -3758,11 +3890,11 @@3.2367 fi3.2368 ac_ct_CC=$ac_cv_prog_ac_ct_CC3.2369 if test -n "$ac_ct_CC"; then3.2370 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2371 -echo "${ECHO_T}$ac_ct_CC" >&6; }3.2372 -else3.2373 - { echo "$as_me:$LINENO: result: no" >&53.2374 -echo "${ECHO_T}no" >&6; }3.2375 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2376 +$as_echo "$ac_ct_CC" >&6; }3.2377 +else3.2378 + { $as_echo "$as_me:$LINENO: result: no" >&53.2379 +$as_echo "no" >&6; }3.2380 fi3.2383 @@ -3774,10 +3906,10 @@3.2384 else3.2385 case $cross_compiling:$ac_tool_warned in3.2386 yes:)3.2387 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2388 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2389 whose name does not start with the host triplet. If you think this3.2390 configuration is useful to you, please write to autoconf@gnu.org." >&53.2391 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2392 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2393 whose name does not start with the host triplet. If you think this3.2394 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.2395 ac_tool_warned=yes ;;3.2396 @@ -3789,50 +3921,54 @@3.2397 fi3.2400 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH3.2401 -See \`config.log' for more details." >&53.2402 -echo "$as_me: error: no acceptable C compiler found in \$PATH3.2403 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH3.2404 +See \`config.log' for more details." >&53.2405 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH3.2406 See \`config.log' for more details." >&2;}3.2407 { (exit 1); exit 1; }; }3.2409 # Provide some information about the compiler.3.2410 -echo "$as_me:$LINENO: checking for C compiler version" >&53.2411 -ac_compiler=`set X $ac_compile; echo $2`3.2412 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&53.2413 +set X $ac_compile3.2414 +ac_compiler=$23.2415 { (ac_try="$ac_compiler --version >&5"3.2416 case "(($ac_try" in3.2417 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2418 *) ac_try_echo=$ac_try;;3.2419 esac3.2420 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2421 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2422 +$as_echo "$ac_try_echo") >&53.2423 (eval "$ac_compiler --version >&5") 2>&53.2424 ac_status=$?3.2425 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2426 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2427 (exit $ac_status); }3.2428 { (ac_try="$ac_compiler -v >&5"3.2429 case "(($ac_try" in3.2430 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2431 *) ac_try_echo=$ac_try;;3.2432 esac3.2433 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2434 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2435 +$as_echo "$ac_try_echo") >&53.2436 (eval "$ac_compiler -v >&5") 2>&53.2437 ac_status=$?3.2438 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2439 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2440 (exit $ac_status); }3.2441 { (ac_try="$ac_compiler -V >&5"3.2442 case "(($ac_try" in3.2443 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2444 *) ac_try_echo=$ac_try;;3.2445 esac3.2446 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2447 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2448 +$as_echo "$ac_try_echo") >&53.2449 (eval "$ac_compiler -V >&5") 2>&53.2450 ac_status=$?3.2451 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2452 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2453 (exit $ac_status); }3.2455 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&53.2456 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }3.2457 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&53.2458 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }3.2459 if test "${ac_cv_c_compiler_gnu+set}" = set; then3.2460 - echo $ECHO_N "(cached) $ECHO_C" >&63.2461 + $as_echo_n "(cached) " >&63.2462 else3.2463 cat >conftest.$ac_ext <<_ACEOF3.2464 /* confdefs.h. */3.2465 @@ -3858,20 +3994,21 @@3.2466 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2467 *) ac_try_echo=$ac_try;;3.2468 esac3.2469 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2470 - (eval "$ac_compile") 2>conftest.er13.2471 - ac_status=$?3.2472 - grep -v '^ *+' conftest.er1 >conftest.err3.2473 - rm -f conftest.er13.2474 - cat conftest.err >&53.2475 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2476 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2477 +$as_echo "$ac_try_echo") >&53.2478 + (eval "$ac_compile") 2>conftest.er13.2479 + ac_status=$?3.2480 + grep -v '^ *+' conftest.er1 >conftest.err3.2481 + rm -f conftest.er13.2482 + cat conftest.err >&53.2483 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2484 (exit $ac_status); } && {3.2485 test -z "$ac_c_werror_flag" ||3.2486 test ! -s conftest.err3.2487 } && test -s conftest.$ac_objext; then3.2488 ac_compiler_gnu=yes3.2489 else3.2490 - echo "$as_me: failed program was:" >&53.2491 + $as_echo "$as_me: failed program was:" >&53.2492 sed 's/^/| /' conftest.$ac_ext >&53.2494 ac_compiler_gnu=no3.2495 @@ -3881,15 +4018,19 @@3.2496 ac_cv_c_compiler_gnu=$ac_compiler_gnu3.2498 fi3.2499 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&53.2500 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }3.2501 -GCC=`test $ac_compiler_gnu = yes && echo yes`3.2502 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&53.2503 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }3.2504 +if test $ac_compiler_gnu = yes; then3.2505 + GCC=yes3.2506 +else3.2507 + GCC=3.2508 +fi3.2509 ac_test_CFLAGS=${CFLAGS+set}3.2510 ac_save_CFLAGS=$CFLAGS3.2511 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&53.2512 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }3.2513 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&53.2514 +$as_echo_n "checking whether $CC accepts -g... " >&6; }3.2515 if test "${ac_cv_prog_cc_g+set}" = set; then3.2516 - echo $ECHO_N "(cached) $ECHO_C" >&63.2517 + $as_echo_n "(cached) " >&63.2518 else3.2519 ac_save_c_werror_flag=$ac_c_werror_flag3.2520 ac_c_werror_flag=yes3.2521 @@ -3916,20 +4057,21 @@3.2522 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2523 *) ac_try_echo=$ac_try;;3.2524 esac3.2525 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2526 - (eval "$ac_compile") 2>conftest.er13.2527 - ac_status=$?3.2528 - grep -v '^ *+' conftest.er1 >conftest.err3.2529 - rm -f conftest.er13.2530 - cat conftest.err >&53.2531 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2532 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2533 +$as_echo "$ac_try_echo") >&53.2534 + (eval "$ac_compile") 2>conftest.er13.2535 + ac_status=$?3.2536 + grep -v '^ *+' conftest.er1 >conftest.err3.2537 + rm -f conftest.er13.2538 + cat conftest.err >&53.2539 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2540 (exit $ac_status); } && {3.2541 test -z "$ac_c_werror_flag" ||3.2542 test ! -s conftest.err3.2543 } && test -s conftest.$ac_objext; then3.2544 ac_cv_prog_cc_g=yes3.2545 else3.2546 - echo "$as_me: failed program was:" >&53.2547 + $as_echo "$as_me: failed program was:" >&53.2548 sed 's/^/| /' conftest.$ac_ext >&53.2550 CFLAGS=""3.2551 @@ -3954,20 +4096,21 @@3.2552 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2553 *) ac_try_echo=$ac_try;;3.2554 esac3.2555 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2556 - (eval "$ac_compile") 2>conftest.er13.2557 - ac_status=$?3.2558 - grep -v '^ *+' conftest.er1 >conftest.err3.2559 - rm -f conftest.er13.2560 - cat conftest.err >&53.2561 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2562 - (exit $ac_status); } && {3.2563 - test -z "$ac_c_werror_flag" ||3.2564 - test ! -s conftest.err3.2565 - } && test -s conftest.$ac_objext; then3.2566 - :3.2567 -else3.2568 - echo "$as_me: failed program was:" >&53.2569 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2570 +$as_echo "$ac_try_echo") >&53.2571 + (eval "$ac_compile") 2>conftest.er13.2572 + ac_status=$?3.2573 + grep -v '^ *+' conftest.er1 >conftest.err3.2574 + rm -f conftest.er13.2575 + cat conftest.err >&53.2576 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2577 + (exit $ac_status); } && {3.2578 + test -z "$ac_c_werror_flag" ||3.2579 + test ! -s conftest.err3.2580 + } && test -s conftest.$ac_objext; then3.2581 + :3.2582 +else3.2583 + $as_echo "$as_me: failed program was:" >&53.2584 sed 's/^/| /' conftest.$ac_ext >&53.2586 ac_c_werror_flag=$ac_save_c_werror_flag3.2587 @@ -3993,20 +4136,21 @@3.2588 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2589 *) ac_try_echo=$ac_try;;3.2590 esac3.2591 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2592 - (eval "$ac_compile") 2>conftest.er13.2593 - ac_status=$?3.2594 - grep -v '^ *+' conftest.er1 >conftest.err3.2595 - rm -f conftest.er13.2596 - cat conftest.err >&53.2597 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2598 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2599 +$as_echo "$ac_try_echo") >&53.2600 + (eval "$ac_compile") 2>conftest.er13.2601 + ac_status=$?3.2602 + grep -v '^ *+' conftest.er1 >conftest.err3.2603 + rm -f conftest.er13.2604 + cat conftest.err >&53.2605 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2606 (exit $ac_status); } && {3.2607 test -z "$ac_c_werror_flag" ||3.2608 test ! -s conftest.err3.2609 } && test -s conftest.$ac_objext; then3.2610 ac_cv_prog_cc_g=yes3.2611 else3.2612 - echo "$as_me: failed program was:" >&53.2613 + $as_echo "$as_me: failed program was:" >&53.2614 sed 's/^/| /' conftest.$ac_ext >&53.2617 @@ -4021,8 +4165,8 @@3.2618 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.2619 ac_c_werror_flag=$ac_save_c_werror_flag3.2620 fi3.2621 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&53.2622 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }3.2623 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&53.2624 +$as_echo "$ac_cv_prog_cc_g" >&6; }3.2625 if test "$ac_test_CFLAGS" = set; then3.2626 CFLAGS=$ac_save_CFLAGS3.2627 elif test $ac_cv_prog_cc_g = yes; then3.2628 @@ -4038,10 +4182,10 @@3.2629 CFLAGS=3.2630 fi3.2631 fi3.2632 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&53.2633 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }3.2634 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&53.2635 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }3.2636 if test "${ac_cv_prog_cc_c89+set}" = set; then3.2637 - echo $ECHO_N "(cached) $ECHO_C" >&63.2638 + $as_echo_n "(cached) " >&63.2639 else3.2640 ac_cv_prog_cc_c89=no3.2641 ac_save_CC=$CC3.2642 @@ -4112,20 +4256,21 @@3.2643 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.2644 *) ac_try_echo=$ac_try;;3.2645 esac3.2646 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.2647 - (eval "$ac_compile") 2>conftest.er13.2648 - ac_status=$?3.2649 - grep -v '^ *+' conftest.er1 >conftest.err3.2650 - rm -f conftest.er13.2651 - cat conftest.err >&53.2652 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.2653 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.2654 +$as_echo "$ac_try_echo") >&53.2655 + (eval "$ac_compile") 2>conftest.er13.2656 + ac_status=$?3.2657 + grep -v '^ *+' conftest.er1 >conftest.err3.2658 + rm -f conftest.er13.2659 + cat conftest.err >&53.2660 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.2661 (exit $ac_status); } && {3.2662 test -z "$ac_c_werror_flag" ||3.2663 test ! -s conftest.err3.2664 } && test -s conftest.$ac_objext; then3.2665 ac_cv_prog_cc_c89=$ac_arg3.2666 else3.2667 - echo "$as_me: failed program was:" >&53.2668 + $as_echo "$as_me: failed program was:" >&53.2669 sed 's/^/| /' conftest.$ac_ext >&53.2672 @@ -4141,15 +4286,15 @@3.2673 # AC_CACHE_VAL3.2674 case "x$ac_cv_prog_cc_c89" in3.2675 x)3.2676 - { echo "$as_me:$LINENO: result: none needed" >&53.2677 -echo "${ECHO_T}none needed" >&6; } ;;3.2678 + { $as_echo "$as_me:$LINENO: result: none needed" >&53.2679 +$as_echo "none needed" >&6; } ;;3.2680 xno)3.2681 - { echo "$as_me:$LINENO: result: unsupported" >&53.2682 -echo "${ECHO_T}unsupported" >&6; } ;;3.2683 + { $as_echo "$as_me:$LINENO: result: unsupported" >&53.2684 +$as_echo "unsupported" >&6; } ;;3.2685 *)3.2686 CC="$CC $ac_cv_prog_cc_c89"3.2687 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&53.2688 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;3.2689 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&53.2690 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;3.2691 esac3.2694 @@ -4161,10 +4306,10 @@3.2696 depcc="$CC" am_compiler_list=3.2698 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&53.2699 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }3.2700 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&53.2701 +$as_echo_n "checking dependency style of $depcc... " >&6; }3.2702 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then3.2703 - echo $ECHO_N "(cached) $ECHO_C" >&63.2704 + $as_echo_n "(cached) " >&63.2705 else3.2706 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then3.2707 # We make a subdir and do the tests there. Otherwise we can end up3.2708 @@ -4251,8 +4396,8 @@3.2709 fi3.2711 fi3.2712 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&53.2713 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }3.2714 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&53.2715 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }3.2716 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type3.2719 @@ -4276,10 +4421,10 @@3.2720 if test -n "$ac_tool_prefix"; then3.2721 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.3.2722 set dummy ${ac_tool_prefix}gcc; ac_word=$23.2723 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2724 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2725 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2726 +$as_echo_n "checking for $ac_word... " >&6; }3.2727 if test "${ac_cv_prog_CC+set}" = set; then3.2728 - echo $ECHO_N "(cached) $ECHO_C" >&63.2729 + $as_echo_n "(cached) " >&63.2730 else3.2731 if test -n "$CC"; then3.2732 ac_cv_prog_CC="$CC" # Let the user override the test.3.2733 @@ -4292,7 +4437,7 @@3.2734 for ac_exec_ext in '' $ac_executable_extensions; do3.2735 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2736 ac_cv_prog_CC="${ac_tool_prefix}gcc"3.2737 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2738 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2739 break 23.2740 fi3.2741 done3.2742 @@ -4303,11 +4448,11 @@3.2743 fi3.2744 CC=$ac_cv_prog_CC3.2745 if test -n "$CC"; then3.2746 - { echo "$as_me:$LINENO: result: $CC" >&53.2747 -echo "${ECHO_T}$CC" >&6; }3.2748 -else3.2749 - { echo "$as_me:$LINENO: result: no" >&53.2750 -echo "${ECHO_T}no" >&6; }3.2751 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2752 +$as_echo "$CC" >&6; }3.2753 +else3.2754 + { $as_echo "$as_me:$LINENO: result: no" >&53.2755 +$as_echo "no" >&6; }3.2756 fi3.2759 @@ -4316,10 +4461,10 @@3.2760 ac_ct_CC=$CC3.2761 # Extract the first word of "gcc", so it can be a program name with args.3.2762 set dummy gcc; ac_word=$23.2763 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2764 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2765 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2766 +$as_echo_n "checking for $ac_word... " >&6; }3.2767 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then3.2768 - echo $ECHO_N "(cached) $ECHO_C" >&63.2769 + $as_echo_n "(cached) " >&63.2770 else3.2771 if test -n "$ac_ct_CC"; then3.2772 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.3.2773 @@ -4332,7 +4477,7 @@3.2774 for ac_exec_ext in '' $ac_executable_extensions; do3.2775 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2776 ac_cv_prog_ac_ct_CC="gcc"3.2777 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2778 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2779 break 23.2780 fi3.2781 done3.2782 @@ -4343,11 +4488,11 @@3.2783 fi3.2784 ac_ct_CC=$ac_cv_prog_ac_ct_CC3.2785 if test -n "$ac_ct_CC"; then3.2786 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2787 -echo "${ECHO_T}$ac_ct_CC" >&6; }3.2788 -else3.2789 - { echo "$as_me:$LINENO: result: no" >&53.2790 -echo "${ECHO_T}no" >&6; }3.2791 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2792 +$as_echo "$ac_ct_CC" >&6; }3.2793 +else3.2794 + { $as_echo "$as_me:$LINENO: result: no" >&53.2795 +$as_echo "no" >&6; }3.2796 fi3.2798 if test "x$ac_ct_CC" = x; then3.2799 @@ -4355,10 +4500,10 @@3.2800 else3.2801 case $cross_compiling:$ac_tool_warned in3.2802 yes:)3.2803 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2804 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2805 whose name does not start with the host triplet. If you think this3.2806 configuration is useful to you, please write to autoconf@gnu.org." >&53.2807 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2808 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2809 whose name does not start with the host triplet. If you think this3.2810 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.2811 ac_tool_warned=yes ;;3.2812 @@ -4373,10 +4518,10 @@3.2813 if test -n "$ac_tool_prefix"; then3.2814 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.3.2815 set dummy ${ac_tool_prefix}cc; ac_word=$23.2816 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2817 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2818 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2819 +$as_echo_n "checking for $ac_word... " >&6; }3.2820 if test "${ac_cv_prog_CC+set}" = set; then3.2821 - echo $ECHO_N "(cached) $ECHO_C" >&63.2822 + $as_echo_n "(cached) " >&63.2823 else3.2824 if test -n "$CC"; then3.2825 ac_cv_prog_CC="$CC" # Let the user override the test.3.2826 @@ -4389,7 +4534,7 @@3.2827 for ac_exec_ext in '' $ac_executable_extensions; do3.2828 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2829 ac_cv_prog_CC="${ac_tool_prefix}cc"3.2830 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2831 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2832 break 23.2833 fi3.2834 done3.2835 @@ -4400,11 +4545,11 @@3.2836 fi3.2837 CC=$ac_cv_prog_CC3.2838 if test -n "$CC"; then3.2839 - { echo "$as_me:$LINENO: result: $CC" >&53.2840 -echo "${ECHO_T}$CC" >&6; }3.2841 -else3.2842 - { echo "$as_me:$LINENO: result: no" >&53.2843 -echo "${ECHO_T}no" >&6; }3.2844 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2845 +$as_echo "$CC" >&6; }3.2846 +else3.2847 + { $as_echo "$as_me:$LINENO: result: no" >&53.2848 +$as_echo "no" >&6; }3.2849 fi3.2852 @@ -4413,10 +4558,10 @@3.2853 if test -z "$CC"; then3.2854 # Extract the first word of "cc", so it can be a program name with args.3.2855 set dummy cc; ac_word=$23.2856 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2857 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2858 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2859 +$as_echo_n "checking for $ac_word... " >&6; }3.2860 if test "${ac_cv_prog_CC+set}" = set; then3.2861 - echo $ECHO_N "(cached) $ECHO_C" >&63.2862 + $as_echo_n "(cached) " >&63.2863 else3.2864 if test -n "$CC"; then3.2865 ac_cv_prog_CC="$CC" # Let the user override the test.3.2866 @@ -4434,7 +4579,7 @@3.2867 continue3.2868 fi3.2869 ac_cv_prog_CC="cc"3.2870 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2871 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2872 break 23.2873 fi3.2874 done3.2875 @@ -4457,11 +4602,11 @@3.2876 fi3.2877 CC=$ac_cv_prog_CC3.2878 if test -n "$CC"; then3.2879 - { echo "$as_me:$LINENO: result: $CC" >&53.2880 -echo "${ECHO_T}$CC" >&6; }3.2881 -else3.2882 - { echo "$as_me:$LINENO: result: no" >&53.2883 -echo "${ECHO_T}no" >&6; }3.2884 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2885 +$as_echo "$CC" >&6; }3.2886 +else3.2887 + { $as_echo "$as_me:$LINENO: result: no" >&53.2888 +$as_echo "no" >&6; }3.2889 fi3.2892 @@ -4472,10 +4617,10 @@3.2893 do3.2894 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.3.2895 set dummy $ac_tool_prefix$ac_prog; ac_word=$23.2896 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2897 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2898 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2899 +$as_echo_n "checking for $ac_word... " >&6; }3.2900 if test "${ac_cv_prog_CC+set}" = set; then3.2901 - echo $ECHO_N "(cached) $ECHO_C" >&63.2902 + $as_echo_n "(cached) " >&63.2903 else3.2904 if test -n "$CC"; then3.2905 ac_cv_prog_CC="$CC" # Let the user override the test.3.2906 @@ -4488,7 +4633,7 @@3.2907 for ac_exec_ext in '' $ac_executable_extensions; do3.2908 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2909 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"3.2910 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2911 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2912 break 23.2913 fi3.2914 done3.2915 @@ -4499,11 +4644,11 @@3.2916 fi3.2917 CC=$ac_cv_prog_CC3.2918 if test -n "$CC"; then3.2919 - { echo "$as_me:$LINENO: result: $CC" >&53.2920 -echo "${ECHO_T}$CC" >&6; }3.2921 -else3.2922 - { echo "$as_me:$LINENO: result: no" >&53.2923 -echo "${ECHO_T}no" >&6; }3.2924 + { $as_echo "$as_me:$LINENO: result: $CC" >&53.2925 +$as_echo "$CC" >&6; }3.2926 +else3.2927 + { $as_echo "$as_me:$LINENO: result: no" >&53.2928 +$as_echo "no" >&6; }3.2929 fi3.2932 @@ -4516,10 +4661,10 @@3.2933 do3.2934 # Extract the first word of "$ac_prog", so it can be a program name with args.3.2935 set dummy $ac_prog; ac_word=$23.2936 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.2937 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.2938 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.2939 +$as_echo_n "checking for $ac_word... " >&6; }3.2940 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then3.2941 - echo $ECHO_N "(cached) $ECHO_C" >&63.2942 + $as_echo_n "(cached) " >&63.2943 else3.2944 if test -n "$ac_ct_CC"; then3.2945 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.3.2946 @@ -4532,7 +4677,7 @@3.2947 for ac_exec_ext in '' $ac_executable_extensions; do3.2948 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.2949 ac_cv_prog_ac_ct_CC="$ac_prog"3.2950 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2951 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.2952 break 23.2953 fi3.2954 done3.2955 @@ -4543,11 +4688,11 @@3.2956 fi3.2957 ac_ct_CC=$ac_cv_prog_ac_ct_CC3.2958 if test -n "$ac_ct_CC"; then3.2959 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2960 -echo "${ECHO_T}$ac_ct_CC" >&6; }3.2961 -else3.2962 - { echo "$as_me:$LINENO: result: no" >&53.2963 -echo "${ECHO_T}no" >&6; }3.2964 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&53.2965 +$as_echo "$ac_ct_CC" >&6; }3.2966 +else3.2967 + { $as_echo "$as_me:$LINENO: result: no" >&53.2968 +$as_echo "no" >&6; }3.2969 fi3.2972 @@ -4559,10 +4704,10 @@3.2973 else3.2974 case $cross_compiling:$ac_tool_warned in3.2975 yes:)3.2976 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2977 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.2978 whose name does not start with the host triplet. If you think this3.2979 configuration is useful to you, please write to autoconf@gnu.org." >&53.2980 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2981 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.2982 whose name does not start with the host triplet. If you think this3.2983 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.2984 ac_tool_warned=yes ;;3.2985 @@ -4574,50 +4719,54 @@3.2986 fi3.2989 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH3.2990 -See \`config.log' for more details." >&53.2991 -echo "$as_me: error: no acceptable C compiler found in \$PATH3.2992 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH3.2993 +See \`config.log' for more details." >&53.2994 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH3.2995 See \`config.log' for more details." >&2;}3.2996 { (exit 1); exit 1; }; }3.2998 # Provide some information about the compiler.3.2999 -echo "$as_me:$LINENO: checking for C compiler version" >&53.3000 -ac_compiler=`set X $ac_compile; echo $2`3.3001 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&53.3002 +set X $ac_compile3.3003 +ac_compiler=$23.3004 { (ac_try="$ac_compiler --version >&5"3.3005 case "(($ac_try" in3.3006 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3007 *) ac_try_echo=$ac_try;;3.3008 esac3.3009 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3010 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3011 +$as_echo "$ac_try_echo") >&53.3012 (eval "$ac_compiler --version >&5") 2>&53.3013 ac_status=$?3.3014 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3015 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3016 (exit $ac_status); }3.3017 { (ac_try="$ac_compiler -v >&5"3.3018 case "(($ac_try" in3.3019 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3020 *) ac_try_echo=$ac_try;;3.3021 esac3.3022 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3023 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3024 +$as_echo "$ac_try_echo") >&53.3025 (eval "$ac_compiler -v >&5") 2>&53.3026 ac_status=$?3.3027 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3028 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3029 (exit $ac_status); }3.3030 { (ac_try="$ac_compiler -V >&5"3.3031 case "(($ac_try" in3.3032 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3033 *) ac_try_echo=$ac_try;;3.3034 esac3.3035 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3036 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3037 +$as_echo "$ac_try_echo") >&53.3038 (eval "$ac_compiler -V >&5") 2>&53.3039 ac_status=$?3.3040 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3041 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3042 (exit $ac_status); }3.3044 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&53.3045 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }3.3046 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&53.3047 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }3.3048 if test "${ac_cv_c_compiler_gnu+set}" = set; then3.3049 - echo $ECHO_N "(cached) $ECHO_C" >&63.3050 + $as_echo_n "(cached) " >&63.3051 else3.3052 cat >conftest.$ac_ext <<_ACEOF3.3053 /* confdefs.h. */3.3054 @@ -4643,20 +4792,21 @@3.3055 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3056 *) ac_try_echo=$ac_try;;3.3057 esac3.3058 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3059 - (eval "$ac_compile") 2>conftest.er13.3060 - ac_status=$?3.3061 - grep -v '^ *+' conftest.er1 >conftest.err3.3062 - rm -f conftest.er13.3063 - cat conftest.err >&53.3064 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3065 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3066 +$as_echo "$ac_try_echo") >&53.3067 + (eval "$ac_compile") 2>conftest.er13.3068 + ac_status=$?3.3069 + grep -v '^ *+' conftest.er1 >conftest.err3.3070 + rm -f conftest.er13.3071 + cat conftest.err >&53.3072 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3073 (exit $ac_status); } && {3.3074 test -z "$ac_c_werror_flag" ||3.3075 test ! -s conftest.err3.3076 } && test -s conftest.$ac_objext; then3.3077 ac_compiler_gnu=yes3.3078 else3.3079 - echo "$as_me: failed program was:" >&53.3080 + $as_echo "$as_me: failed program was:" >&53.3081 sed 's/^/| /' conftest.$ac_ext >&53.3083 ac_compiler_gnu=no3.3084 @@ -4666,15 +4816,19 @@3.3085 ac_cv_c_compiler_gnu=$ac_compiler_gnu3.3087 fi3.3088 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&53.3089 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }3.3090 -GCC=`test $ac_compiler_gnu = yes && echo yes`3.3091 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&53.3092 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }3.3093 +if test $ac_compiler_gnu = yes; then3.3094 + GCC=yes3.3095 +else3.3096 + GCC=3.3097 +fi3.3098 ac_test_CFLAGS=${CFLAGS+set}3.3099 ac_save_CFLAGS=$CFLAGS3.3100 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&53.3101 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }3.3102 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&53.3103 +$as_echo_n "checking whether $CC accepts -g... " >&6; }3.3104 if test "${ac_cv_prog_cc_g+set}" = set; then3.3105 - echo $ECHO_N "(cached) $ECHO_C" >&63.3106 + $as_echo_n "(cached) " >&63.3107 else3.3108 ac_save_c_werror_flag=$ac_c_werror_flag3.3109 ac_c_werror_flag=yes3.3110 @@ -4701,20 +4855,21 @@3.3111 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3112 *) ac_try_echo=$ac_try;;3.3113 esac3.3114 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3115 - (eval "$ac_compile") 2>conftest.er13.3116 - ac_status=$?3.3117 - grep -v '^ *+' conftest.er1 >conftest.err3.3118 - rm -f conftest.er13.3119 - cat conftest.err >&53.3120 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3121 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3122 +$as_echo "$ac_try_echo") >&53.3123 + (eval "$ac_compile") 2>conftest.er13.3124 + ac_status=$?3.3125 + grep -v '^ *+' conftest.er1 >conftest.err3.3126 + rm -f conftest.er13.3127 + cat conftest.err >&53.3128 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3129 (exit $ac_status); } && {3.3130 test -z "$ac_c_werror_flag" ||3.3131 test ! -s conftest.err3.3132 } && test -s conftest.$ac_objext; then3.3133 ac_cv_prog_cc_g=yes3.3134 else3.3135 - echo "$as_me: failed program was:" >&53.3136 + $as_echo "$as_me: failed program was:" >&53.3137 sed 's/^/| /' conftest.$ac_ext >&53.3139 CFLAGS=""3.3140 @@ -4739,20 +4894,21 @@3.3141 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3142 *) ac_try_echo=$ac_try;;3.3143 esac3.3144 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3145 - (eval "$ac_compile") 2>conftest.er13.3146 - ac_status=$?3.3147 - grep -v '^ *+' conftest.er1 >conftest.err3.3148 - rm -f conftest.er13.3149 - cat conftest.err >&53.3150 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3151 - (exit $ac_status); } && {3.3152 - test -z "$ac_c_werror_flag" ||3.3153 - test ! -s conftest.err3.3154 - } && test -s conftest.$ac_objext; then3.3155 - :3.3156 -else3.3157 - echo "$as_me: failed program was:" >&53.3158 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3159 +$as_echo "$ac_try_echo") >&53.3160 + (eval "$ac_compile") 2>conftest.er13.3161 + ac_status=$?3.3162 + grep -v '^ *+' conftest.er1 >conftest.err3.3163 + rm -f conftest.er13.3164 + cat conftest.err >&53.3165 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3166 + (exit $ac_status); } && {3.3167 + test -z "$ac_c_werror_flag" ||3.3168 + test ! -s conftest.err3.3169 + } && test -s conftest.$ac_objext; then3.3170 + :3.3171 +else3.3172 + $as_echo "$as_me: failed program was:" >&53.3173 sed 's/^/| /' conftest.$ac_ext >&53.3175 ac_c_werror_flag=$ac_save_c_werror_flag3.3176 @@ -4778,20 +4934,21 @@3.3177 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3178 *) ac_try_echo=$ac_try;;3.3179 esac3.3180 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3181 - (eval "$ac_compile") 2>conftest.er13.3182 - ac_status=$?3.3183 - grep -v '^ *+' conftest.er1 >conftest.err3.3184 - rm -f conftest.er13.3185 - cat conftest.err >&53.3186 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3187 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3188 +$as_echo "$ac_try_echo") >&53.3189 + (eval "$ac_compile") 2>conftest.er13.3190 + ac_status=$?3.3191 + grep -v '^ *+' conftest.er1 >conftest.err3.3192 + rm -f conftest.er13.3193 + cat conftest.err >&53.3194 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3195 (exit $ac_status); } && {3.3196 test -z "$ac_c_werror_flag" ||3.3197 test ! -s conftest.err3.3198 } && test -s conftest.$ac_objext; then3.3199 ac_cv_prog_cc_g=yes3.3200 else3.3201 - echo "$as_me: failed program was:" >&53.3202 + $as_echo "$as_me: failed program was:" >&53.3203 sed 's/^/| /' conftest.$ac_ext >&53.3206 @@ -4806,8 +4963,8 @@3.3207 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.3208 ac_c_werror_flag=$ac_save_c_werror_flag3.3209 fi3.3210 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&53.3211 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }3.3212 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&53.3213 +$as_echo "$ac_cv_prog_cc_g" >&6; }3.3214 if test "$ac_test_CFLAGS" = set; then3.3215 CFLAGS=$ac_save_CFLAGS3.3216 elif test $ac_cv_prog_cc_g = yes; then3.3217 @@ -4823,10 +4980,10 @@3.3218 CFLAGS=3.3219 fi3.3220 fi3.3221 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&53.3222 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }3.3223 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&53.3224 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }3.3225 if test "${ac_cv_prog_cc_c89+set}" = set; then3.3226 - echo $ECHO_N "(cached) $ECHO_C" >&63.3227 + $as_echo_n "(cached) " >&63.3228 else3.3229 ac_cv_prog_cc_c89=no3.3230 ac_save_CC=$CC3.3231 @@ -4897,20 +5054,21 @@3.3232 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3233 *) ac_try_echo=$ac_try;;3.3234 esac3.3235 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3236 - (eval "$ac_compile") 2>conftest.er13.3237 - ac_status=$?3.3238 - grep -v '^ *+' conftest.er1 >conftest.err3.3239 - rm -f conftest.er13.3240 - cat conftest.err >&53.3241 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3242 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3243 +$as_echo "$ac_try_echo") >&53.3244 + (eval "$ac_compile") 2>conftest.er13.3245 + ac_status=$?3.3246 + grep -v '^ *+' conftest.er1 >conftest.err3.3247 + rm -f conftest.er13.3248 + cat conftest.err >&53.3249 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3250 (exit $ac_status); } && {3.3251 test -z "$ac_c_werror_flag" ||3.3252 test ! -s conftest.err3.3253 } && test -s conftest.$ac_objext; then3.3254 ac_cv_prog_cc_c89=$ac_arg3.3255 else3.3256 - echo "$as_me: failed program was:" >&53.3257 + $as_echo "$as_me: failed program was:" >&53.3258 sed 's/^/| /' conftest.$ac_ext >&53.3261 @@ -4926,15 +5084,15 @@3.3262 # AC_CACHE_VAL3.3263 case "x$ac_cv_prog_cc_c89" in3.3264 x)3.3265 - { echo "$as_me:$LINENO: result: none needed" >&53.3266 -echo "${ECHO_T}none needed" >&6; } ;;3.3267 + { $as_echo "$as_me:$LINENO: result: none needed" >&53.3268 +$as_echo "none needed" >&6; } ;;3.3269 xno)3.3270 - { echo "$as_me:$LINENO: result: unsupported" >&53.3271 -echo "${ECHO_T}unsupported" >&6; } ;;3.3272 + { $as_echo "$as_me:$LINENO: result: unsupported" >&53.3273 +$as_echo "unsupported" >&6; } ;;3.3274 *)3.3275 CC="$CC $ac_cv_prog_cc_c89"3.3276 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&53.3277 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;3.3278 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&53.3279 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;3.3280 esac3.3283 @@ -4946,10 +5104,10 @@3.3285 depcc="$CC" am_compiler_list=3.3287 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&53.3288 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }3.3289 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&53.3290 +$as_echo_n "checking dependency style of $depcc... " >&6; }3.3291 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then3.3292 - echo $ECHO_N "(cached) $ECHO_C" >&63.3293 + $as_echo_n "(cached) " >&63.3294 else3.3295 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then3.3296 # We make a subdir and do the tests there. Otherwise we can end up3.3297 @@ -5036,8 +5194,8 @@3.3298 fi3.3300 fi3.3301 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&53.3302 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }3.3303 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&53.3304 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }3.3305 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type3.3308 @@ -5068,15 +5226,15 @@3.3309 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'3.3310 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'3.3311 ac_compiler_gnu=$ac_cv_c_compiler_gnu3.3312 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&53.3313 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }3.3314 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&53.3315 +$as_echo_n "checking how to run the C preprocessor... " >&6; }3.3316 # On Suns, sometimes $CPP names a directory.3.3317 if test -n "$CPP" && test -d "$CPP"; then3.3318 CPP=3.3319 fi3.3320 if test -z "$CPP"; then3.3321 if test "${ac_cv_prog_CPP+set}" = set; then3.3322 - echo $ECHO_N "(cached) $ECHO_C" >&63.3323 + $as_echo_n "(cached) " >&63.3324 else3.3325 # Double quotes because CPP needs to be expanded3.3326 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"3.3327 @@ -5108,20 +5266,21 @@3.3328 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3329 *) ac_try_echo=$ac_try;;3.3330 esac3.3331 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3332 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3333 +$as_echo "$ac_try_echo") >&53.3334 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.3335 ac_status=$?3.3336 grep -v '^ *+' conftest.er1 >conftest.err3.3337 rm -f conftest.er13.3338 cat conftest.err >&53.3339 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3340 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3341 (exit $ac_status); } >/dev/null && {3.3342 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.3343 test ! -s conftest.err3.3344 }; then3.3345 :3.3346 else3.3347 - echo "$as_me: failed program was:" >&53.3348 + $as_echo "$as_me: failed program was:" >&53.3349 sed 's/^/| /' conftest.$ac_ext >&53.3351 # Broken: fails on valid input.3.3352 @@ -5145,13 +5304,14 @@3.3353 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3354 *) ac_try_echo=$ac_try;;3.3355 esac3.3356 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3357 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3358 +$as_echo "$ac_try_echo") >&53.3359 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.3360 ac_status=$?3.3361 grep -v '^ *+' conftest.er1 >conftest.err3.3362 rm -f conftest.er13.3363 cat conftest.err >&53.3364 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3365 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3366 (exit $ac_status); } >/dev/null && {3.3367 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.3368 test ! -s conftest.err3.3369 @@ -5159,7 +5319,7 @@3.3370 # Broken: success on invalid input.3.3371 continue3.3372 else3.3373 - echo "$as_me: failed program was:" >&53.3374 + $as_echo "$as_me: failed program was:" >&53.3375 sed 's/^/| /' conftest.$ac_ext >&53.3377 # Passes both tests.3.3378 @@ -5184,8 +5344,8 @@3.3379 else3.3380 ac_cv_prog_CPP=$CPP3.3381 fi3.3382 -{ echo "$as_me:$LINENO: result: $CPP" >&53.3383 -echo "${ECHO_T}$CPP" >&6; }3.3384 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&53.3385 +$as_echo "$CPP" >&6; }3.3386 ac_preproc_ok=false3.3387 for ac_c_preproc_warn_flag in '' yes3.3388 do3.3389 @@ -5213,20 +5373,21 @@3.3390 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3391 *) ac_try_echo=$ac_try;;3.3392 esac3.3393 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3394 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3395 +$as_echo "$ac_try_echo") >&53.3396 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.3397 ac_status=$?3.3398 grep -v '^ *+' conftest.er1 >conftest.err3.3399 rm -f conftest.er13.3400 cat conftest.err >&53.3401 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3402 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3403 (exit $ac_status); } >/dev/null && {3.3404 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.3405 test ! -s conftest.err3.3406 }; then3.3407 :3.3408 else3.3409 - echo "$as_me: failed program was:" >&53.3410 + $as_echo "$as_me: failed program was:" >&53.3411 sed 's/^/| /' conftest.$ac_ext >&53.3413 # Broken: fails on valid input.3.3414 @@ -5250,13 +5411,14 @@3.3415 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3416 *) ac_try_echo=$ac_try;;3.3417 esac3.3418 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3419 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3420 +$as_echo "$ac_try_echo") >&53.3421 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.3422 ac_status=$?3.3423 grep -v '^ *+' conftest.er1 >conftest.err3.3424 rm -f conftest.er13.3425 cat conftest.err >&53.3426 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3427 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3428 (exit $ac_status); } >/dev/null && {3.3429 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.3430 test ! -s conftest.err3.3431 @@ -5264,7 +5426,7 @@3.3432 # Broken: success on invalid input.3.3433 continue3.3434 else3.3435 - echo "$as_me: failed program was:" >&53.3436 + $as_echo "$as_me: failed program was:" >&53.3437 sed 's/^/| /' conftest.$ac_ext >&53.3439 # Passes both tests.3.3440 @@ -5280,9 +5442,9 @@3.3441 if $ac_preproc_ok; then3.3442 :3.3443 else3.3444 - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check3.3445 -See \`config.log' for more details." >&53.3446 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check3.3447 + { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check3.3448 +See \`config.log' for more details." >&53.3449 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check3.3450 See \`config.log' for more details." >&2;}3.3451 { (exit 1); exit 1; }; }3.3452 fi3.3453 @@ -5294,42 +5456,37 @@3.3454 ac_compiler_gnu=$ac_cv_c_compiler_gnu3.3457 -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&53.3458 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }3.3459 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&53.3460 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }3.3461 if test "${ac_cv_path_GREP+set}" = set; then3.3462 - echo $ECHO_N "(cached) $ECHO_C" >&63.3463 -else3.3464 - # Extract the first word of "grep ggrep" to use in msg output3.3465 -if test -z "$GREP"; then3.3466 -set dummy grep ggrep; ac_prog_name=$23.3467 -if test "${ac_cv_path_GREP+set}" = set; then3.3468 - echo $ECHO_N "(cached) $ECHO_C" >&63.3469 -else3.3470 + $as_echo_n "(cached) " >&63.3471 +else3.3472 + if test -z "$GREP"; then3.3473 ac_path_GREP_found=false3.3474 -# Loop through the user's path and test for each of PROGNAME-LIST3.3475 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3.3476 + # Loop through the user's path and test for each of PROGNAME-LIST3.3477 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3.3478 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin3.3479 do3.3480 IFS=$as_save_IFS3.3481 test -z "$as_dir" && as_dir=.3.3482 for ac_prog in grep ggrep; do3.3483 - for ac_exec_ext in '' $ac_executable_extensions; do3.3484 - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"3.3485 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue3.3486 - # Check for GNU ac_path_GREP and select it if it is found.3.3487 + for ac_exec_ext in '' $ac_executable_extensions; do3.3488 + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"3.3489 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue3.3490 +# Check for GNU ac_path_GREP and select it if it is found.3.3491 # Check for GNU $ac_path_GREP3.3492 case `"$ac_path_GREP" --version 2>&1` in3.3493 *GNU*)3.3494 ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;3.3495 *)3.3496 ac_count=03.3497 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"3.3498 + $as_echo_n 0123456789 >"conftest.in"3.3499 while :3.3500 do3.3501 cat "conftest.in" "conftest.in" >"conftest.tmp"3.3502 mv "conftest.tmp" "conftest.in"3.3503 cp "conftest.in" "conftest.nl"3.3504 - echo 'GREP' >> "conftest.nl"3.3505 + $as_echo 'GREP' >> "conftest.nl"3.3506 "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break3.3507 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break3.3508 ac_count=`expr $ac_count + 1`3.3509 @@ -5344,74 +5501,60 @@3.3510 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;3.3511 esac3.3513 -3.3514 - $ac_path_GREP_found && break 33.3515 - done3.3516 -done3.3517 -3.3518 -done3.3519 -IFS=$as_save_IFS3.3520 -3.3521 -3.3522 -fi3.3523 -3.3524 -GREP="$ac_cv_path_GREP"3.3525 -if test -z "$GREP"; then3.3526 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&53.3527 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}3.3528 - { (exit 1); exit 1; }; }3.3529 -fi3.3530 -3.3531 + $ac_path_GREP_found && break 33.3532 + done3.3533 + done3.3534 +done3.3535 +IFS=$as_save_IFS3.3536 + if test -z "$ac_cv_path_GREP"; then3.3537 + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&53.3538 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}3.3539 + { (exit 1); exit 1; }; }3.3540 + fi3.3541 else3.3542 ac_cv_path_GREP=$GREP3.3543 fi3.3545 -3.3546 -fi3.3547 -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&53.3548 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; }3.3549 +fi3.3550 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&53.3551 +$as_echo "$ac_cv_path_GREP" >&6; }3.3552 GREP="$ac_cv_path_GREP"3.3555 -{ echo "$as_me:$LINENO: checking for egrep" >&53.3556 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }3.3557 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&53.3558 +$as_echo_n "checking for egrep... " >&6; }3.3559 if test "${ac_cv_path_EGREP+set}" = set; then3.3560 - echo $ECHO_N "(cached) $ECHO_C" >&63.3561 + $as_echo_n "(cached) " >&63.3562 else3.3563 if echo a | $GREP -E '(a|b)' >/dev/null 2>&13.3564 then ac_cv_path_EGREP="$GREP -E"3.3565 else3.3566 - # Extract the first word of "egrep" to use in msg output3.3567 -if test -z "$EGREP"; then3.3568 -set dummy egrep; ac_prog_name=$23.3569 -if test "${ac_cv_path_EGREP+set}" = set; then3.3570 - echo $ECHO_N "(cached) $ECHO_C" >&63.3571 -else3.3572 + if test -z "$EGREP"; then3.3573 ac_path_EGREP_found=false3.3574 -# Loop through the user's path and test for each of PROGNAME-LIST3.3575 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3.3576 + # Loop through the user's path and test for each of PROGNAME-LIST3.3577 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR3.3578 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin3.3579 do3.3580 IFS=$as_save_IFS3.3581 test -z "$as_dir" && as_dir=.3.3582 for ac_prog in egrep; do3.3583 - for ac_exec_ext in '' $ac_executable_extensions; do3.3584 - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"3.3585 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue3.3586 - # Check for GNU ac_path_EGREP and select it if it is found.3.3587 + for ac_exec_ext in '' $ac_executable_extensions; do3.3588 + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"3.3589 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue3.3590 +# Check for GNU ac_path_EGREP and select it if it is found.3.3591 # Check for GNU $ac_path_EGREP3.3592 case `"$ac_path_EGREP" --version 2>&1` in3.3593 *GNU*)3.3594 ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;3.3595 *)3.3596 ac_count=03.3597 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"3.3598 + $as_echo_n 0123456789 >"conftest.in"3.3599 while :3.3600 do3.3601 cat "conftest.in" "conftest.in" >"conftest.tmp"3.3602 mv "conftest.tmp" "conftest.in"3.3603 cp "conftest.in" "conftest.nl"3.3604 - echo 'EGREP' >> "conftest.nl"3.3605 + $as_echo 'EGREP' >> "conftest.nl"3.3606 "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break3.3607 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break3.3608 ac_count=`expr $ac_count + 1`3.3609 @@ -5426,40 +5569,31 @@3.3610 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;3.3611 esac3.3613 -3.3614 - $ac_path_EGREP_found && break 33.3615 - done3.3616 -done3.3617 -3.3618 -done3.3619 -IFS=$as_save_IFS3.3620 -3.3621 -3.3622 -fi3.3623 -3.3624 -EGREP="$ac_cv_path_EGREP"3.3625 -if test -z "$EGREP"; then3.3626 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&53.3627 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}3.3628 - { (exit 1); exit 1; }; }3.3629 -fi3.3630 -3.3631 + $ac_path_EGREP_found && break 33.3632 + done3.3633 + done3.3634 +done3.3635 +IFS=$as_save_IFS3.3636 + if test -z "$ac_cv_path_EGREP"; then3.3637 + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&53.3638 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}3.3639 + { (exit 1); exit 1; }; }3.3640 + fi3.3641 else3.3642 ac_cv_path_EGREP=$EGREP3.3643 fi3.3645 -3.3646 - fi3.3647 -fi3.3648 -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&53.3649 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }3.3650 + fi3.3651 +fi3.3652 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&53.3653 +$as_echo "$ac_cv_path_EGREP" >&6; }3.3654 EGREP="$ac_cv_path_EGREP"3.3657 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&53.3658 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }3.3659 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&53.3660 +$as_echo_n "checking for ANSI C header files... " >&6; }3.3661 if test "${ac_cv_header_stdc+set}" = set; then3.3662 - echo $ECHO_N "(cached) $ECHO_C" >&63.3663 + $as_echo_n "(cached) " >&63.3664 else3.3665 cat >conftest.$ac_ext <<_ACEOF3.3666 /* confdefs.h. */3.3667 @@ -5486,20 +5620,21 @@3.3668 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3669 *) ac_try_echo=$ac_try;;3.3670 esac3.3671 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3672 - (eval "$ac_compile") 2>conftest.er13.3673 - ac_status=$?3.3674 - grep -v '^ *+' conftest.er1 >conftest.err3.3675 - rm -f conftest.er13.3676 - cat conftest.err >&53.3677 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3678 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3679 +$as_echo "$ac_try_echo") >&53.3680 + (eval "$ac_compile") 2>conftest.er13.3681 + ac_status=$?3.3682 + grep -v '^ *+' conftest.er1 >conftest.err3.3683 + rm -f conftest.er13.3684 + cat conftest.err >&53.3685 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3686 (exit $ac_status); } && {3.3687 test -z "$ac_c_werror_flag" ||3.3688 test ! -s conftest.err3.3689 } && test -s conftest.$ac_objext; then3.3690 ac_cv_header_stdc=yes3.3691 else3.3692 - echo "$as_me: failed program was:" >&53.3693 + $as_echo "$as_me: failed program was:" >&53.3694 sed 's/^/| /' conftest.$ac_ext >&53.3696 ac_cv_header_stdc=no3.3697 @@ -5591,37 +5726,40 @@3.3698 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3699 *) ac_try_echo=$ac_try;;3.3700 esac3.3701 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3702 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3703 +$as_echo "$ac_try_echo") >&53.3704 (eval "$ac_link") 2>&53.3705 ac_status=$?3.3706 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3707 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3708 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'3.3709 { (case "(($ac_try" in3.3710 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3711 *) ac_try_echo=$ac_try;;3.3712 esac3.3713 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3714 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3715 +$as_echo "$ac_try_echo") >&53.3716 (eval "$ac_try") 2>&53.3717 ac_status=$?3.3718 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3719 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3720 (exit $ac_status); }; }; then3.3721 :3.3722 else3.3723 - echo "$as_me: program exited with status $ac_status" >&53.3724 -echo "$as_me: failed program was:" >&53.3725 + $as_echo "$as_me: program exited with status $ac_status" >&53.3726 +$as_echo "$as_me: failed program was:" >&53.3727 sed 's/^/| /' conftest.$ac_ext >&53.3729 ( exit $ac_status )3.3730 ac_cv_header_stdc=no3.3731 fi3.3732 +rm -rf conftest.dSYM3.3733 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext3.3734 fi3.3737 fi3.3738 fi3.3739 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&53.3740 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }3.3741 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&53.3742 +$as_echo "$ac_cv_header_stdc" >&6; }3.3743 if test $ac_cv_header_stdc = yes; then3.3745 cat >>confdefs.h <<\_ACEOF3.3746 @@ -5643,11 +5781,11 @@3.3747 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \3.3748 inttypes.h stdint.h unistd.h3.3749 do3.3750 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`3.3751 -{ echo "$as_me:$LINENO: checking for $ac_header" >&53.3752 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }3.3753 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`3.3754 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&53.3755 +$as_echo_n "checking for $ac_header... " >&6; }3.3756 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then3.3757 - echo $ECHO_N "(cached) $ECHO_C" >&63.3758 + $as_echo_n "(cached) " >&63.3759 else3.3760 cat >conftest.$ac_ext <<_ACEOF3.3761 /* confdefs.h. */3.3762 @@ -5665,20 +5803,21 @@3.3763 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3764 *) ac_try_echo=$ac_try;;3.3765 esac3.3766 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3767 - (eval "$ac_compile") 2>conftest.er13.3768 - ac_status=$?3.3769 - grep -v '^ *+' conftest.er1 >conftest.err3.3770 - rm -f conftest.er13.3771 - cat conftest.err >&53.3772 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3773 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3774 +$as_echo "$ac_try_echo") >&53.3775 + (eval "$ac_compile") 2>conftest.er13.3776 + ac_status=$?3.3777 + grep -v '^ *+' conftest.er1 >conftest.err3.3778 + rm -f conftest.er13.3779 + cat conftest.err >&53.3780 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3781 (exit $ac_status); } && {3.3782 test -z "$ac_c_werror_flag" ||3.3783 test ! -s conftest.err3.3784 } && test -s conftest.$ac_objext; then3.3785 eval "$as_ac_Header=yes"3.3786 else3.3787 - echo "$as_me: failed program was:" >&53.3788 + $as_echo "$as_me: failed program was:" >&53.3789 sed 's/^/| /' conftest.$ac_ext >&53.3791 eval "$as_ac_Header=no"3.3792 @@ -5686,81 +5825,29 @@3.3794 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.3795 fi3.3796 -ac_res=`eval echo '${'$as_ac_Header'}'`3.3797 - { echo "$as_me:$LINENO: result: $ac_res" >&53.3798 -echo "${ECHO_T}$ac_res" >&6; }3.3799 -if test `eval echo '${'$as_ac_Header'}'` = yes; then3.3800 +ac_res=`eval 'as_val=${'$as_ac_Header'}3.3801 + $as_echo "$as_val"'`3.3802 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&53.3803 +$as_echo "$ac_res" >&6; }3.3804 +if test `eval 'as_val=${'$as_ac_Header'}3.3805 + $as_echo "$as_val"'` = yes; then3.3806 cat >>confdefs.h <<_ACEOF3.3807 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 13.3808 -_ACEOF3.3809 -3.3810 -fi3.3811 -3.3812 -done3.3813 -3.3814 -3.3815 -{ echo "$as_me:$LINENO: checking for void *" >&53.3816 -echo $ECHO_N "checking for void *... $ECHO_C" >&6; }3.3817 -if test "${ac_cv_type_void_p+set}" = set; then3.3818 - echo $ECHO_N "(cached) $ECHO_C" >&63.3819 -else3.3820 - cat >conftest.$ac_ext <<_ACEOF3.3821 -/* confdefs.h. */3.3822 -_ACEOF3.3823 -cat confdefs.h >>conftest.$ac_ext3.3824 -cat >>conftest.$ac_ext <<_ACEOF3.3825 -/* end confdefs.h. */3.3826 -$ac_includes_default3.3827 -typedef void * ac__type_new_;3.3828 -int3.3829 -main ()3.3830 -{3.3831 -if ((ac__type_new_ *) 0)3.3832 - return 0;3.3833 -if (sizeof (ac__type_new_))3.3834 - return 0;3.3835 - ;3.3836 - return 0;3.3837 -}3.3838 -_ACEOF3.3839 -rm -f conftest.$ac_objext3.3840 -if { (ac_try="$ac_compile"3.3841 -case "(($ac_try" in3.3842 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3843 - *) ac_try_echo=$ac_try;;3.3844 -esac3.3845 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3846 - (eval "$ac_compile") 2>conftest.er13.3847 - ac_status=$?3.3848 - grep -v '^ *+' conftest.er1 >conftest.err3.3849 - rm -f conftest.er13.3850 - cat conftest.err >&53.3851 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3852 - (exit $ac_status); } && {3.3853 - test -z "$ac_c_werror_flag" ||3.3854 - test ! -s conftest.err3.3855 - } && test -s conftest.$ac_objext; then3.3856 - ac_cv_type_void_p=yes3.3857 -else3.3858 - echo "$as_me: failed program was:" >&53.3859 -sed 's/^/| /' conftest.$ac_ext >&53.3860 -3.3861 - ac_cv_type_void_p=no3.3862 -fi3.3863 -3.3864 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.3865 -fi3.3866 -{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&53.3867 -echo "${ECHO_T}$ac_cv_type_void_p" >&6; }3.3868 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 13.3869 +_ACEOF3.3870 +3.3871 +fi3.3872 +3.3873 +done3.3874 +3.3876 # The cast to long int works around a bug in the HP C Compiler3.3877 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects3.3878 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.3.3879 # This bug is HP SR number 8606223364.3.3880 -{ echo "$as_me:$LINENO: checking size of void *" >&53.3881 -echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }3.3882 +{ $as_echo "$as_me:$LINENO: checking size of void *" >&53.3883 +$as_echo_n "checking size of void *... " >&6; }3.3884 if test "${ac_cv_sizeof_void_p+set}" = set; then3.3885 - echo $ECHO_N "(cached) $ECHO_C" >&63.3886 + $as_echo_n "(cached) " >&63.3887 else3.3888 if test "$cross_compiling" = yes; then3.3889 # Depending upon the size, compute the lo and hi bounds.3.3890 @@ -5771,11 +5858,10 @@3.3891 cat >>conftest.$ac_ext <<_ACEOF3.3892 /* end confdefs.h. */3.3893 $ac_includes_default3.3894 - typedef void * ac__type_sizeof_;3.3895 -int3.3896 -main ()3.3897 -{3.3898 -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];3.3899 +int3.3900 +main ()3.3901 +{3.3902 +static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];3.3903 test_array [0] = 03.3905 ;3.3906 @@ -5788,13 +5874,14 @@3.3907 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3908 *) ac_try_echo=$ac_try;;3.3909 esac3.3910 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3911 - (eval "$ac_compile") 2>conftest.er13.3912 - ac_status=$?3.3913 - grep -v '^ *+' conftest.er1 >conftest.err3.3914 - rm -f conftest.er13.3915 - cat conftest.err >&53.3916 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3917 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3918 +$as_echo "$ac_try_echo") >&53.3919 + (eval "$ac_compile") 2>conftest.er13.3920 + ac_status=$?3.3921 + grep -v '^ *+' conftest.er1 >conftest.err3.3922 + rm -f conftest.er13.3923 + cat conftest.err >&53.3924 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3925 (exit $ac_status); } && {3.3926 test -z "$ac_c_werror_flag" ||3.3927 test ! -s conftest.err3.3928 @@ -5808,11 +5895,10 @@3.3929 cat >>conftest.$ac_ext <<_ACEOF3.3930 /* end confdefs.h. */3.3931 $ac_includes_default3.3932 - typedef void * ac__type_sizeof_;3.3933 -int3.3934 -main ()3.3935 -{3.3936 -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];3.3937 +int3.3938 +main ()3.3939 +{3.3940 +static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];3.3941 test_array [0] = 03.3943 ;3.3944 @@ -5825,20 +5911,21 @@3.3945 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.3946 *) ac_try_echo=$ac_try;;3.3947 esac3.3948 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.3949 - (eval "$ac_compile") 2>conftest.er13.3950 - ac_status=$?3.3951 - grep -v '^ *+' conftest.er1 >conftest.err3.3952 - rm -f conftest.er13.3953 - cat conftest.err >&53.3954 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.3955 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.3956 +$as_echo "$ac_try_echo") >&53.3957 + (eval "$ac_compile") 2>conftest.er13.3958 + ac_status=$?3.3959 + grep -v '^ *+' conftest.er1 >conftest.err3.3960 + rm -f conftest.er13.3961 + cat conftest.err >&53.3962 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.3963 (exit $ac_status); } && {3.3964 test -z "$ac_c_werror_flag" ||3.3965 test ! -s conftest.err3.3966 } && test -s conftest.$ac_objext; then3.3967 ac_hi=$ac_mid; break3.3968 else3.3969 - echo "$as_me: failed program was:" >&53.3970 + $as_echo "$as_me: failed program was:" >&53.3971 sed 's/^/| /' conftest.$ac_ext >&53.3973 ac_lo=`expr $ac_mid + 1`3.3974 @@ -5852,7 +5939,7 @@3.3975 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.3976 done3.3977 else3.3978 - echo "$as_me: failed program was:" >&53.3979 + $as_echo "$as_me: failed program was:" >&53.3980 sed 's/^/| /' conftest.$ac_ext >&53.3982 cat >conftest.$ac_ext <<_ACEOF3.3983 @@ -5862,11 +5949,10 @@3.3984 cat >>conftest.$ac_ext <<_ACEOF3.3985 /* end confdefs.h. */3.3986 $ac_includes_default3.3987 - typedef void * ac__type_sizeof_;3.3988 -int3.3989 -main ()3.3990 -{3.3991 -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];3.3992 +int3.3993 +main ()3.3994 +{3.3995 +static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];3.3996 test_array [0] = 03.3998 ;3.3999 @@ -5879,13 +5965,14 @@3.4000 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4001 *) ac_try_echo=$ac_try;;3.4002 esac3.4003 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4004 - (eval "$ac_compile") 2>conftest.er13.4005 - ac_status=$?3.4006 - grep -v '^ *+' conftest.er1 >conftest.err3.4007 - rm -f conftest.er13.4008 - cat conftest.err >&53.4009 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4010 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4011 +$as_echo "$ac_try_echo") >&53.4012 + (eval "$ac_compile") 2>conftest.er13.4013 + ac_status=$?3.4014 + grep -v '^ *+' conftest.er1 >conftest.err3.4015 + rm -f conftest.er13.4016 + cat conftest.err >&53.4017 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4018 (exit $ac_status); } && {3.4019 test -z "$ac_c_werror_flag" ||3.4020 test ! -s conftest.err3.4021 @@ -5899,11 +5986,10 @@3.4022 cat >>conftest.$ac_ext <<_ACEOF3.4023 /* end confdefs.h. */3.4024 $ac_includes_default3.4025 - typedef void * ac__type_sizeof_;3.4026 -int3.4027 -main ()3.4028 -{3.4029 -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];3.4030 +int3.4031 +main ()3.4032 +{3.4033 +static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];3.4034 test_array [0] = 03.4036 ;3.4037 @@ -5916,20 +6002,21 @@3.4038 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4039 *) ac_try_echo=$ac_try;;3.4040 esac3.4041 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4042 - (eval "$ac_compile") 2>conftest.er13.4043 - ac_status=$?3.4044 - grep -v '^ *+' conftest.er1 >conftest.err3.4045 - rm -f conftest.er13.4046 - cat conftest.err >&53.4047 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4048 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4049 +$as_echo "$ac_try_echo") >&53.4050 + (eval "$ac_compile") 2>conftest.er13.4051 + ac_status=$?3.4052 + grep -v '^ *+' conftest.er1 >conftest.err3.4053 + rm -f conftest.er13.4054 + cat conftest.err >&53.4055 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4056 (exit $ac_status); } && {3.4057 test -z "$ac_c_werror_flag" ||3.4058 test ! -s conftest.err3.4059 } && test -s conftest.$ac_objext; then3.4060 ac_lo=$ac_mid; break3.4061 else3.4062 - echo "$as_me: failed program was:" >&53.4063 + $as_echo "$as_me: failed program was:" >&53.4064 sed 's/^/| /' conftest.$ac_ext >&53.4066 ac_hi=`expr '(' $ac_mid ')' - 1`3.4067 @@ -5943,7 +6030,7 @@3.4068 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.4069 done3.4070 else3.4071 - echo "$as_me: failed program was:" >&53.4072 + $as_echo "$as_me: failed program was:" >&53.4073 sed 's/^/| /' conftest.$ac_ext >&53.4075 ac_lo= ac_hi=3.4076 @@ -5963,11 +6050,10 @@3.4077 cat >>conftest.$ac_ext <<_ACEOF3.4078 /* end confdefs.h. */3.4079 $ac_includes_default3.4080 - typedef void * ac__type_sizeof_;3.4081 -int3.4082 -main ()3.4083 -{3.4084 -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];3.4085 +int3.4086 +main ()3.4087 +{3.4088 +static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];3.4089 test_array [0] = 03.4091 ;3.4092 @@ -5980,20 +6066,21 @@3.4093 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4094 *) ac_try_echo=$ac_try;;3.4095 esac3.4096 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4097 - (eval "$ac_compile") 2>conftest.er13.4098 - ac_status=$?3.4099 - grep -v '^ *+' conftest.er1 >conftest.err3.4100 - rm -f conftest.er13.4101 - cat conftest.err >&53.4102 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4103 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4104 +$as_echo "$ac_try_echo") >&53.4105 + (eval "$ac_compile") 2>conftest.er13.4106 + ac_status=$?3.4107 + grep -v '^ *+' conftest.er1 >conftest.err3.4108 + rm -f conftest.er13.4109 + cat conftest.err >&53.4110 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4111 (exit $ac_status); } && {3.4112 test -z "$ac_c_werror_flag" ||3.4113 test ! -s conftest.err3.4114 } && test -s conftest.$ac_objext; then3.4115 ac_hi=$ac_mid3.4116 else3.4117 - echo "$as_me: failed program was:" >&53.4118 + $as_echo "$as_me: failed program was:" >&53.4119 sed 's/^/| /' conftest.$ac_ext >&53.4121 ac_lo=`expr '(' $ac_mid ')' + 1`3.4122 @@ -6004,9 +6091,9 @@3.4123 case $ac_lo in3.4124 ?*) ac_cv_sizeof_void_p=$ac_lo;;3.4125 '') if test "$ac_cv_type_void_p" = yes; then3.4126 - { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)3.4127 -See \`config.log' for more details." >&53.4128 -echo "$as_me: error: cannot compute sizeof (void *)3.4129 + { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)3.4130 +See \`config.log' for more details." >&53.4131 +$as_echo "$as_me: error: cannot compute sizeof (void *)3.4132 See \`config.log' for more details." >&2;}3.4133 { (exit 77); exit 77; }; }3.4134 else3.4135 @@ -6021,9 +6108,8 @@3.4136 cat >>conftest.$ac_ext <<_ACEOF3.4137 /* end confdefs.h. */3.4138 $ac_includes_default3.4139 - typedef void * ac__type_sizeof_;3.4140 -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }3.4141 -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }3.4142 +static long int longval () { return (long int) (sizeof (void *)); }3.4143 +static unsigned long int ulongval () { return (long int) (sizeof (void *)); }3.4144 #include <stdio.h>3.4145 #include <stdlib.h>3.4146 int3.4147 @@ -6033,20 +6119,22 @@3.4148 FILE *f = fopen ("conftest.val", "w");3.4149 if (! f)3.4150 return 1;3.4151 - if (((long int) (sizeof (ac__type_sizeof_))) < 0)3.4152 + if (((long int) (sizeof (void *))) < 0)3.4153 {3.4154 long int i = longval ();3.4155 - if (i != ((long int) (sizeof (ac__type_sizeof_))))3.4156 + if (i != ((long int) (sizeof (void *))))3.4157 return 1;3.4158 - fprintf (f, "%ld\n", i);3.4159 + fprintf (f, "%ld", i);3.4160 }3.4161 else3.4162 {3.4163 unsigned long int i = ulongval ();3.4164 - if (i != ((long int) (sizeof (ac__type_sizeof_))))3.4165 + if (i != ((long int) (sizeof (void *))))3.4166 return 1;3.4167 - fprintf (f, "%lu\n", i);3.4168 + fprintf (f, "%lu", i);3.4169 }3.4170 + /* Do not output a trailing newline, as this causes \r\n confusion3.4171 + on some platforms. */3.4172 return ferror (f) || fclose (f) != 0;3.4174 ;3.4175 @@ -6059,43 +6147,46 @@3.4176 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4177 *) ac_try_echo=$ac_try;;3.4178 esac3.4179 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4180 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4181 +$as_echo "$ac_try_echo") >&53.4182 (eval "$ac_link") 2>&53.4183 ac_status=$?3.4184 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4185 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4186 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'3.4187 { (case "(($ac_try" in3.4188 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4189 *) ac_try_echo=$ac_try;;3.4190 esac3.4191 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4192 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4193 +$as_echo "$ac_try_echo") >&53.4194 (eval "$ac_try") 2>&53.4195 ac_status=$?3.4196 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4197 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4198 (exit $ac_status); }; }; then3.4199 ac_cv_sizeof_void_p=`cat conftest.val`3.4200 else3.4201 - echo "$as_me: program exited with status $ac_status" >&53.4202 -echo "$as_me: failed program was:" >&53.4203 + $as_echo "$as_me: program exited with status $ac_status" >&53.4204 +$as_echo "$as_me: failed program was:" >&53.4205 sed 's/^/| /' conftest.$ac_ext >&53.4207 ( exit $ac_status )3.4208 if test "$ac_cv_type_void_p" = yes; then3.4209 - { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)3.4210 -See \`config.log' for more details." >&53.4211 -echo "$as_me: error: cannot compute sizeof (void *)3.4212 + { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)3.4213 +See \`config.log' for more details." >&53.4214 +$as_echo "$as_me: error: cannot compute sizeof (void *)3.4215 See \`config.log' for more details." >&2;}3.4216 { (exit 77); exit 77; }; }3.4217 else3.4218 ac_cv_sizeof_void_p=03.4219 fi3.4220 fi3.4221 +rm -rf conftest.dSYM3.4222 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext3.4223 fi3.4224 rm -f conftest.val3.4225 fi3.4226 -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&53.4227 -echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }3.4228 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&53.4229 +$as_echo "$ac_cv_sizeof_void_p" >&6; }3.4233 @@ -6104,10 +6195,10 @@3.4234 _ACEOF3.4237 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&53.4238 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }3.4239 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&53.4240 +$as_echo_n "checking for ANSI C header files... " >&6; }3.4241 if test "${ac_cv_header_stdc+set}" = set; then3.4242 - echo $ECHO_N "(cached) $ECHO_C" >&63.4243 + $as_echo_n "(cached) " >&63.4244 else3.4245 cat >conftest.$ac_ext <<_ACEOF3.4246 /* confdefs.h. */3.4247 @@ -6134,20 +6225,21 @@3.4248 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4249 *) ac_try_echo=$ac_try;;3.4250 esac3.4251 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4252 - (eval "$ac_compile") 2>conftest.er13.4253 - ac_status=$?3.4254 - grep -v '^ *+' conftest.er1 >conftest.err3.4255 - rm -f conftest.er13.4256 - cat conftest.err >&53.4257 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4258 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4259 +$as_echo "$ac_try_echo") >&53.4260 + (eval "$ac_compile") 2>conftest.er13.4261 + ac_status=$?3.4262 + grep -v '^ *+' conftest.er1 >conftest.err3.4263 + rm -f conftest.er13.4264 + cat conftest.err >&53.4265 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4266 (exit $ac_status); } && {3.4267 test -z "$ac_c_werror_flag" ||3.4268 test ! -s conftest.err3.4269 } && test -s conftest.$ac_objext; then3.4270 ac_cv_header_stdc=yes3.4271 else3.4272 - echo "$as_me: failed program was:" >&53.4273 + $as_echo "$as_me: failed program was:" >&53.4274 sed 's/^/| /' conftest.$ac_ext >&53.4276 ac_cv_header_stdc=no3.4277 @@ -6239,37 +6331,40 @@3.4278 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4279 *) ac_try_echo=$ac_try;;3.4280 esac3.4281 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4282 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4283 +$as_echo "$ac_try_echo") >&53.4284 (eval "$ac_link") 2>&53.4285 ac_status=$?3.4286 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4287 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4288 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'3.4289 { (case "(($ac_try" in3.4290 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4291 *) ac_try_echo=$ac_try;;3.4292 esac3.4293 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4294 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4295 +$as_echo "$ac_try_echo") >&53.4296 (eval "$ac_try") 2>&53.4297 ac_status=$?3.4298 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4299 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4300 (exit $ac_status); }; }; then3.4301 :3.4302 else3.4303 - echo "$as_me: program exited with status $ac_status" >&53.4304 -echo "$as_me: failed program was:" >&53.4305 + $as_echo "$as_me: program exited with status $ac_status" >&53.4306 +$as_echo "$as_me: failed program was:" >&53.4307 sed 's/^/| /' conftest.$ac_ext >&53.4309 ( exit $ac_status )3.4310 ac_cv_header_stdc=no3.4311 fi3.4312 +rm -rf conftest.dSYM3.4313 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext3.4314 fi3.4317 fi3.4318 fi3.4319 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&53.4320 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }3.4321 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&53.4322 +$as_echo "$ac_cv_header_stdc" >&6; }3.4323 if test $ac_cv_header_stdc = yes; then3.4325 cat >>confdefs.h <<\_ACEOF3.4326 @@ -6280,34 +6375,34 @@3.4328 # Make sure we can run config.sub.3.4329 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||3.4330 - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&53.4331 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}3.4332 - { (exit 1); exit 1; }; }3.4333 -3.4334 -{ echo "$as_me:$LINENO: checking build system type" >&53.4335 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; }3.4336 + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&53.4337 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}3.4338 + { (exit 1); exit 1; }; }3.4339 +3.4340 +{ $as_echo "$as_me:$LINENO: checking build system type" >&53.4341 +$as_echo_n "checking build system type... " >&6; }3.4342 if test "${ac_cv_build+set}" = set; then3.4343 - echo $ECHO_N "(cached) $ECHO_C" >&63.4344 + $as_echo_n "(cached) " >&63.4345 else3.4346 ac_build_alias=$build_alias3.4347 test "x$ac_build_alias" = x &&3.4348 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`3.4349 test "x$ac_build_alias" = x &&3.4350 - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&53.4351 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}3.4352 + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&53.4353 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}3.4354 { (exit 1); exit 1; }; }3.4355 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||3.4356 - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&53.4357 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}3.4358 - { (exit 1); exit 1; }; }3.4359 -3.4360 -fi3.4361 -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&53.4362 -echo "${ECHO_T}$ac_cv_build" >&6; }3.4363 + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&53.4364 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}3.4365 + { (exit 1); exit 1; }; }3.4366 +3.4367 +fi3.4368 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&53.4369 +$as_echo "$ac_cv_build" >&6; }3.4370 case $ac_cv_build in3.4371 *-*-*) ;;3.4372 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&53.4373 -echo "$as_me: error: invalid value of canonical build" >&2;}3.4374 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&53.4375 +$as_echo "$as_me: error: invalid value of canonical build" >&2;}3.4376 { (exit 1); exit 1; }; };;3.4377 esac3.4378 build=$ac_cv_build3.4379 @@ -6324,27 +6419,27 @@3.4380 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac3.4383 -{ echo "$as_me:$LINENO: checking host system type" >&53.4384 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; }3.4385 +{ $as_echo "$as_me:$LINENO: checking host system type" >&53.4386 +$as_echo_n "checking host system type... " >&6; }3.4387 if test "${ac_cv_host+set}" = set; then3.4388 - echo $ECHO_N "(cached) $ECHO_C" >&63.4389 + $as_echo_n "(cached) " >&63.4390 else3.4391 if test "x$host_alias" = x; then3.4392 ac_cv_host=$ac_cv_build3.4393 else3.4394 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||3.4395 - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&53.4396 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}3.4397 - { (exit 1); exit 1; }; }3.4398 -fi3.4399 -3.4400 -fi3.4401 -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&53.4402 -echo "${ECHO_T}$ac_cv_host" >&6; }3.4403 + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&53.4404 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}3.4405 + { (exit 1); exit 1; }; }3.4406 +fi3.4407 +3.4408 +fi3.4409 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&53.4410 +$as_echo "$ac_cv_host" >&6; }3.4411 case $ac_cv_host in3.4412 *-*-*) ;;3.4413 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&53.4414 -echo "$as_me: error: invalid value of canonical host" >&2;}3.4415 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&53.4416 +$as_echo "$as_me: error: invalid value of canonical host" >&2;}3.4417 { (exit 1); exit 1; }; };;3.4418 esac3.4419 host=$ac_cv_host3.4420 @@ -6403,6 +6498,13 @@3.4421 fi3.4424 +# Check whether --with-gtk was given.3.4425 +if test "${with_gtk+set}" = set; then3.4426 + withval=$with_gtk; with_gtk=yes3.4427 +else3.4428 + with_gtk=x113.4429 +fi3.4430 +3.4433 lxdream_save_cppflags="$CPPFLAGS"3.4434 @@ -6428,13 +6530,14 @@3.4435 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4436 *) ac_try_echo=$ac_try;;3.4437 esac3.4438 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4439 - (eval "$ac_compile") 2>conftest.er13.4440 - ac_status=$?3.4441 - grep -v '^ *+' conftest.er1 >conftest.err3.4442 - rm -f conftest.er13.4443 - cat conftest.err >&53.4444 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4445 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4446 +$as_echo "$ac_try_echo") >&53.4447 + (eval "$ac_compile") 2>conftest.er13.4448 + ac_status=$?3.4449 + grep -v '^ *+' conftest.er1 >conftest.err3.4450 + rm -f conftest.er13.4451 + cat conftest.err >&53.4452 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4453 (exit $ac_status); } && {3.4454 test -z "$ac_c_werror_flag" ||3.4455 test ! -s conftest.err3.4456 @@ -6442,17 +6545,17 @@3.4459 if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then3.4460 - { echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&53.4461 -echo $ECHO_N "checking for Cocoa/Cocoa.h... $ECHO_C" >&6; }3.4462 + { $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&53.4463 +$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }3.4464 if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then3.4465 - echo $ECHO_N "(cached) $ECHO_C" >&63.4466 -fi3.4467 -{ echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&53.4468 -echo "${ECHO_T}$ac_cv_header_Cocoa_Cocoa_h" >&6; }3.4469 + $as_echo_n "(cached) " >&63.4470 +fi3.4471 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&53.4472 +$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }3.4473 else3.4474 # Is the header compilable?3.4475 -{ echo "$as_me:$LINENO: checking Cocoa/Cocoa.h usability" >&53.4476 -echo $ECHO_N "checking Cocoa/Cocoa.h usability... $ECHO_C" >&6; }3.4477 +{ $as_echo "$as_me:$LINENO: checking Cocoa/Cocoa.h usability" >&53.4478 +$as_echo_n "checking Cocoa/Cocoa.h usability... " >&6; }3.4479 cat >conftest.$ac_ext <<_ACEOF3.4480 /* confdefs.h. */3.4481 _ACEOF3.4482 @@ -6468,32 +6571,33 @@3.4483 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4484 *) ac_try_echo=$ac_try;;3.4485 esac3.4486 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4487 - (eval "$ac_compile") 2>conftest.er13.4488 - ac_status=$?3.4489 - grep -v '^ *+' conftest.er1 >conftest.err3.4490 - rm -f conftest.er13.4491 - cat conftest.err >&53.4492 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4493 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4494 +$as_echo "$ac_try_echo") >&53.4495 + (eval "$ac_compile") 2>conftest.er13.4496 + ac_status=$?3.4497 + grep -v '^ *+' conftest.er1 >conftest.err3.4498 + rm -f conftest.er13.4499 + cat conftest.err >&53.4500 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4501 (exit $ac_status); } && {3.4502 test -z "$ac_c_werror_flag" ||3.4503 test ! -s conftest.err3.4504 } && test -s conftest.$ac_objext; then3.4505 ac_header_compiler=yes3.4506 else3.4507 - echo "$as_me: failed program was:" >&53.4508 + $as_echo "$as_me: failed program was:" >&53.4509 sed 's/^/| /' conftest.$ac_ext >&53.4511 ac_header_compiler=no3.4512 fi3.4514 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.4515 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.4516 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.4517 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.4518 +$as_echo "$ac_header_compiler" >&6; }3.4520 # Is the header present?3.4521 -{ echo "$as_me:$LINENO: checking Cocoa/Cocoa.h presence" >&53.4522 -echo $ECHO_N "checking Cocoa/Cocoa.h presence... $ECHO_C" >&6; }3.4523 +{ $as_echo "$as_me:$LINENO: checking Cocoa/Cocoa.h presence" >&53.4524 +$as_echo_n "checking Cocoa/Cocoa.h presence... " >&6; }3.4525 cat >conftest.$ac_ext <<_ACEOF3.4526 /* confdefs.h. */3.4527 _ACEOF3.4528 @@ -6507,63 +6611,64 @@3.4529 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4530 *) ac_try_echo=$ac_try;;3.4531 esac3.4532 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4533 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4534 +$as_echo "$ac_try_echo") >&53.4535 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.4536 ac_status=$?3.4537 grep -v '^ *+' conftest.er1 >conftest.err3.4538 rm -f conftest.er13.4539 cat conftest.err >&53.4540 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4541 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4542 (exit $ac_status); } >/dev/null && {3.4543 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.4544 test ! -s conftest.err3.4545 }; then3.4546 ac_header_preproc=yes3.4547 else3.4548 - echo "$as_me: failed program was:" >&53.4549 + $as_echo "$as_me: failed program was:" >&53.4550 sed 's/^/| /' conftest.$ac_ext >&53.4552 ac_header_preproc=no3.4553 fi3.4555 rm -f conftest.err conftest.$ac_ext3.4556 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.4557 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.4558 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.4559 +$as_echo "$ac_header_preproc" >&6; }3.4561 # So? What about this header?3.4562 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.4563 yes:no: )3.4564 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&53.4565 -echo "$as_me: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.4566 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&53.4567 -echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&2;}3.4568 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&53.4569 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.4570 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&53.4571 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&2;}3.4572 ac_header_preproc=yes3.4573 ;;3.4574 no:yes:* )3.4575 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&53.4576 -echo "$as_me: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&2;}3.4577 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&53.4578 -echo "$as_me: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&2;}3.4579 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&53.4580 -echo "$as_me: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&2;}3.4581 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&53.4582 -echo "$as_me: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&2;}3.4583 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&53.4584 -echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&2;}3.4585 - { echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&53.4586 -echo "$as_me: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&2;}3.4587 -3.4588 - ;;3.4589 -esac3.4590 -{ echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&53.4591 -echo $ECHO_N "checking for Cocoa/Cocoa.h... $ECHO_C" >&6; }3.4592 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&53.4593 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&2;}3.4594 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&53.4595 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&2;}3.4596 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&53.4597 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&2;}3.4598 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&53.4599 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&2;}3.4600 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&53.4601 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&2;}3.4602 + { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&53.4603 +$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&2;}3.4604 +3.4605 + ;;3.4606 +esac3.4607 +{ $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&53.4608 +$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }3.4609 if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then3.4610 - echo $ECHO_N "(cached) $ECHO_C" >&63.4611 + $as_echo_n "(cached) " >&63.4612 else3.4613 ac_cv_header_Cocoa_Cocoa_h=$ac_header_preproc3.4614 fi3.4615 -{ echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&53.4616 -echo "${ECHO_T}$ac_cv_header_Cocoa_Cocoa_h" >&6; }3.4617 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&53.4618 +$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }3.4620 fi3.4621 if test $ac_cv_header_Cocoa_Cocoa_h = yes; then3.4622 @@ -6587,9 +6692,13 @@3.4626 -3.4627 -else3.4628 - echo "$as_me: failed program was:" >&53.4629 + if test "x$with_gtk" = "xx11"; then3.4630 + with_gtk=no3.4631 + fi3.4632 +3.4633 +3.4634 +else3.4635 + $as_echo "$as_me: failed program was:" >&53.4636 sed 's/^/| /' conftest.$ac_ext >&53.4638 CPPFLAGS="$lxdream_save_cppflags"3.4639 @@ -6598,7 +6707,7 @@3.4640 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.4643 -if test "$HAVE_COCOA" = 'yes'; then3.4644 +if test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"; then3.4645 GUI_COCOA_TRUE=3.4646 GUI_COCOA_FALSE='#'3.4647 else3.4648 @@ -6613,10 +6722,10 @@3.4649 if test -n "$ac_tool_prefix"; then3.4650 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.3.4651 set dummy ${ac_tool_prefix}pkg-config; ac_word=$23.4652 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.4653 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.4654 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.4655 +$as_echo_n "checking for $ac_word... " >&6; }3.4656 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then3.4657 - echo $ECHO_N "(cached) $ECHO_C" >&63.4658 + $as_echo_n "(cached) " >&63.4659 else3.4660 case $PKG_CONFIG in3.4661 [\\/]* | ?:[\\/]*)3.4662 @@ -6631,7 +6740,7 @@3.4663 for ac_exec_ext in '' $ac_executable_extensions; do3.4664 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.4665 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"3.4666 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.4667 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.4668 break 23.4669 fi3.4670 done3.4671 @@ -6643,11 +6752,11 @@3.4672 fi3.4673 PKG_CONFIG=$ac_cv_path_PKG_CONFIG3.4674 if test -n "$PKG_CONFIG"; then3.4675 - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&53.4676 -echo "${ECHO_T}$PKG_CONFIG" >&6; }3.4677 -else3.4678 - { echo "$as_me:$LINENO: result: no" >&53.4679 -echo "${ECHO_T}no" >&6; }3.4680 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&53.4681 +$as_echo "$PKG_CONFIG" >&6; }3.4682 +else3.4683 + { $as_echo "$as_me:$LINENO: result: no" >&53.4684 +$as_echo "no" >&6; }3.4685 fi3.4688 @@ -6656,10 +6765,10 @@3.4689 ac_pt_PKG_CONFIG=$PKG_CONFIG3.4690 # Extract the first word of "pkg-config", so it can be a program name with args.3.4691 set dummy pkg-config; ac_word=$23.4692 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.4693 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.4694 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.4695 +$as_echo_n "checking for $ac_word... " >&6; }3.4696 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then3.4697 - echo $ECHO_N "(cached) $ECHO_C" >&63.4698 + $as_echo_n "(cached) " >&63.4699 else3.4700 case $ac_pt_PKG_CONFIG in3.4701 [\\/]* | ?:[\\/]*)3.4702 @@ -6674,7 +6783,7 @@3.4703 for ac_exec_ext in '' $ac_executable_extensions; do3.4704 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.4705 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"3.4706 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.4707 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.4708 break 23.4709 fi3.4710 done3.4711 @@ -6686,11 +6795,11 @@3.4712 fi3.4713 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG3.4714 if test -n "$ac_pt_PKG_CONFIG"; then3.4715 - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&53.4716 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }3.4717 -else3.4718 - { echo "$as_me:$LINENO: result: no" >&53.4719 -echo "${ECHO_T}no" >&6; }3.4720 + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&53.4721 +$as_echo "$ac_pt_PKG_CONFIG" >&6; }3.4722 +else3.4723 + { $as_echo "$as_me:$LINENO: result: no" >&53.4724 +$as_echo "no" >&6; }3.4725 fi3.4727 if test "x$ac_pt_PKG_CONFIG" = x; then3.4728 @@ -6698,10 +6807,10 @@3.4729 else3.4730 case $cross_compiling:$ac_tool_warned in3.4731 yes:)3.4732 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.4733 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools3.4734 whose name does not start with the host triplet. If you think this3.4735 configuration is useful to you, please write to autoconf@gnu.org." >&53.4736 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.4737 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools3.4738 whose name does not start with the host triplet. If you think this3.4739 configuration is useful to you, please write to autoconf@gnu.org." >&2;}3.4740 ac_tool_warned=yes ;;3.4741 @@ -6715,32 +6824,32 @@3.4742 fi3.4743 if test -n "$PKG_CONFIG"; then3.4744 _pkg_min_version=0.9.03.4745 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&53.4746 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }3.4747 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&53.4748 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }3.4749 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then3.4750 - { echo "$as_me:$LINENO: result: yes" >&53.4751 -echo "${ECHO_T}yes" >&6; }3.4752 + { $as_echo "$as_me:$LINENO: result: yes" >&53.4753 +$as_echo "yes" >&6; }3.4754 else3.4755 - { echo "$as_me:$LINENO: result: no" >&53.4756 -echo "${ECHO_T}no" >&6; }3.4757 + { $as_echo "$as_me:$LINENO: result: no" >&53.4758 +$as_echo "no" >&6; }3.4759 PKG_CONFIG=""3.4760 fi3.4762 fi3.4764 pkg_failed=no3.4765 -{ echo "$as_me:$LINENO: checking for LIBPNG" >&53.4766 -echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; }3.4767 +{ $as_echo "$as_me:$LINENO: checking for LIBPNG" >&53.4768 +$as_echo_n "checking for LIBPNG... " >&6; }3.4770 if test -n "$PKG_CONFIG"; then3.4771 if test -n "$LIBPNG_CFLAGS"; then3.4772 pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"3.4773 else3.4774 if test -n "$PKG_CONFIG" && \3.4775 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&53.4776 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&53.4777 ($PKG_CONFIG --exists --print-errors "libpng ") 2>&53.4778 ac_status=$?3.4779 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4780 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4781 (exit $ac_status); }; then3.4782 pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng " 2>/dev/null`3.4783 else3.4784 @@ -6755,10 +6864,10 @@3.4785 pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"3.4786 else3.4787 if test -n "$PKG_CONFIG" && \3.4788 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&53.4789 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&53.4790 ($PKG_CONFIG --exists --print-errors "libpng ") 2>&53.4791 ac_status=$?3.4792 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4793 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4794 (exit $ac_status); }; then3.4795 pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng " 2>/dev/null`3.4796 else3.4797 @@ -6786,7 +6895,7 @@3.4798 # Put the nasty error message in config.log where it belongs3.4799 echo "$LIBPNG_PKG_ERRORS" >&53.4801 - { { echo "$as_me:$LINENO: error: Package requirements (libpng ) were not met:3.4802 + { { $as_echo "$as_me:$LINENO: error: Package requirements (libpng ) were not met:3.4804 $LIBPNG_PKG_ERRORS3.4806 @@ -6797,7 +6906,7 @@3.4807 and LIBPNG_LIBS to avoid the need to call pkg-config.3.4808 See the pkg-config man page for more details.3.4809 " >&53.4810 -echo "$as_me: error: Package requirements (libpng ) were not met:3.4811 +$as_echo "$as_me: error: Package requirements (libpng ) were not met:3.4813 $LIBPNG_PKG_ERRORS3.4815 @@ -6810,7 +6919,7 @@3.4816 " >&2;}3.4817 { (exit 1); exit 1; }; }3.4818 elif test $pkg_failed = untried; then3.4819 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it3.4820 + { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it3.4821 is in your PATH or set the PKG_CONFIG environment variable to the full3.4822 path to pkg-config.3.4824 @@ -6820,7 +6929,7 @@3.4826 To get pkg-config, see <http://pkg-config.freedesktop.org/>.3.4827 See \`config.log' for more details." >&53.4828 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it3.4829 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it3.4830 is in your PATH or set the PKG_CONFIG environment variable to the full3.4831 path to pkg-config.3.4833 @@ -6834,16 +6943,16 @@3.4834 else3.4835 LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS3.4836 LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS3.4837 - { echo "$as_me:$LINENO: result: yes" >&53.4838 -echo "${ECHO_T}yes" >&6; }3.4839 + { $as_echo "$as_me:$LINENO: result: yes" >&53.4840 +$as_echo "yes" >&6; }3.4841 :3.4842 fi3.4845 -{ echo "$as_me:$LINENO: checking for uncompress in -lz" >&53.4846 -echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6; }3.4847 +{ $as_echo "$as_me:$LINENO: checking for uncompress in -lz" >&53.4848 +$as_echo_n "checking for uncompress in -lz... " >&6; }3.4849 if test "${ac_cv_lib_z_uncompress+set}" = set; then3.4850 - echo $ECHO_N "(cached) $ECHO_C" >&63.4851 + $as_echo_n "(cached) " >&63.4852 else3.4853 ac_check_lib_save_LIBS=$LIBS3.4854 LIBS="-lz $LIBS"3.4855 @@ -6875,32 +6984,36 @@3.4856 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.4857 *) ac_try_echo=$ac_try;;3.4858 esac3.4859 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.4860 - (eval "$ac_link") 2>conftest.er13.4861 - ac_status=$?3.4862 - grep -v '^ *+' conftest.er1 >conftest.err3.4863 - rm -f conftest.er13.4864 - cat conftest.err >&53.4865 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.4866 - (exit $ac_status); } && {3.4867 - test -z "$ac_c_werror_flag" ||3.4868 - test ! -s conftest.err3.4869 - } && test -s conftest$ac_exeext &&3.4870 - $as_test_x conftest$ac_exeext; then3.4871 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.4872 +$as_echo "$ac_try_echo") >&53.4873 + (eval "$ac_link") 2>conftest.er13.4874 + ac_status=$?3.4875 + grep -v '^ *+' conftest.er1 >conftest.err3.4876 + rm -f conftest.er13.4877 + cat conftest.err >&53.4878 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4879 + (exit $ac_status); } && {3.4880 + test -z "$ac_c_werror_flag" ||3.4881 + test ! -s conftest.err3.4882 + } && test -s conftest$ac_exeext && {3.4883 + test "$cross_compiling" = yes ||3.4884 + $as_test_x conftest$ac_exeext3.4885 + }; then3.4886 ac_cv_lib_z_uncompress=yes3.4887 else3.4888 - echo "$as_me: failed program was:" >&53.4889 + $as_echo "$as_me: failed program was:" >&53.4890 sed 's/^/| /' conftest.$ac_ext >&53.4892 ac_cv_lib_z_uncompress=no3.4893 fi3.4895 +rm -rf conftest.dSYM3.4896 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.4897 conftest$ac_exeext conftest.$ac_ext3.4898 LIBS=$ac_check_lib_save_LIBS3.4899 fi3.4900 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&53.4901 -echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6; }3.4902 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&53.4903 +$as_echo "$ac_cv_lib_z_uncompress" >&6; }3.4904 if test $ac_cv_lib_z_uncompress = yes; then3.4905 cat >>confdefs.h <<_ACEOF3.4906 #define HAVE_LIBZ 13.4907 @@ -6915,21 +7028,133 @@3.4908 fi3.4911 -3.4912 +if test "x$with_gtk" = "xno"; then3.4914 pkg_failed=no3.4915 -{ echo "$as_me:$LINENO: checking for GTK" >&53.4916 -echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }3.4917 +{ $as_echo "$as_me:$LINENO: checking for GLIB" >&53.4918 +$as_echo_n "checking for GLIB... " >&6; }3.4919 +3.4920 +if test -n "$PKG_CONFIG"; then3.4921 + if test -n "$GLIB_CFLAGS"; then3.4922 + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"3.4923 + else3.4924 + if test -n "$PKG_CONFIG" && \3.4925 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&53.4926 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&53.4927 + ac_status=$?3.4928 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4929 + (exit $ac_status); }; then3.4930 + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`3.4931 +else3.4932 + pkg_failed=yes3.4933 +fi3.4934 + fi3.4935 +else3.4936 + pkg_failed=untried3.4937 +fi3.4938 +if test -n "$PKG_CONFIG"; then3.4939 + if test -n "$GLIB_LIBS"; then3.4940 + pkg_cv_GLIB_LIBS="$GLIB_LIBS"3.4941 + else3.4942 + if test -n "$PKG_CONFIG" && \3.4943 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&53.4944 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&53.4945 + ac_status=$?3.4946 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.4947 + (exit $ac_status); }; then3.4948 + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`3.4949 +else3.4950 + pkg_failed=yes3.4951 +fi3.4952 + fi3.4953 +else3.4954 + pkg_failed=untried3.4955 +fi3.4956 +3.4957 +3.4958 +3.4959 +if test $pkg_failed = yes; then3.4960 +3.4961 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then3.4962 + _pkg_short_errors_supported=yes3.4963 +else3.4964 + _pkg_short_errors_supported=no3.4965 +fi3.4966 + if test $_pkg_short_errors_supported = yes; then3.4967 + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`3.4968 + else3.4969 + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`3.4970 + fi3.4971 + # Put the nasty error message in config.log where it belongs3.4972 + echo "$GLIB_PKG_ERRORS" >&53.4973 +3.4974 + { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0) were not met:3.4975 +3.4976 +$GLIB_PKG_ERRORS3.4977 +3.4978 +Consider adjusting the PKG_CONFIG_PATH environment variable if you3.4979 +installed software in a non-standard prefix.3.4980 +3.4981 +Alternatively, you may set the environment variables GLIB_CFLAGS3.4982 +and GLIB_LIBS to avoid the need to call pkg-config.3.4983 +See the pkg-config man page for more details.3.4984 +" >&53.4985 +$as_echo "$as_me: error: Package requirements (glib-2.0) were not met:3.4986 +3.4987 +$GLIB_PKG_ERRORS3.4988 +3.4989 +Consider adjusting the PKG_CONFIG_PATH environment variable if you3.4990 +installed software in a non-standard prefix.3.4991 +3.4992 +Alternatively, you may set the environment variables GLIB_CFLAGS3.4993 +and GLIB_LIBS to avoid the need to call pkg-config.3.4994 +See the pkg-config man page for more details.3.4995 +" >&2;}3.4996 + { (exit 1); exit 1; }; }3.4997 +elif test $pkg_failed = untried; then3.4998 + { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it3.4999 +is in your PATH or set the PKG_CONFIG environment variable to the full3.5000 +path to pkg-config.3.5001 +3.5002 +Alternatively, you may set the environment variables GLIB_CFLAGS3.5003 +and GLIB_LIBS to avoid the need to call pkg-config.3.5004 +See the pkg-config man page for more details.3.5005 +3.5006 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.3.5007 +See \`config.log' for more details." >&53.5008 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it3.5009 +is in your PATH or set the PKG_CONFIG environment variable to the full3.5010 +path to pkg-config.3.5011 +3.5012 +Alternatively, you may set the environment variables GLIB_CFLAGS3.5013 +and GLIB_LIBS to avoid the need to call pkg-config.3.5014 +See the pkg-config man page for more details.3.5015 +3.5016 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.3.5017 +See \`config.log' for more details." >&2;}3.5018 + { (exit 1); exit 1; }; }3.5019 +else3.5020 + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS3.5021 + GLIB_LIBS=$pkg_cv_GLIB_LIBS3.5022 + { $as_echo "$as_me:$LINENO: result: yes" >&53.5023 +$as_echo "yes" >&6; }3.5024 + :3.5025 +fi3.5026 +else3.5027 +3.5028 +pkg_failed=no3.5029 +{ $as_echo "$as_me:$LINENO: checking for GTK" >&53.5030 +$as_echo_n "checking for GTK... " >&6; }3.5032 if test -n "$PKG_CONFIG"; then3.5033 if test -n "$GTK_CFLAGS"; then3.5034 pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"3.5035 else3.5036 if test -n "$PKG_CONFIG" && \3.5037 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&53.5038 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&53.5039 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&53.5040 ac_status=$?3.5041 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5042 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5043 (exit $ac_status); }; then3.5044 pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`3.5045 else3.5046 @@ -6944,10 +7169,10 @@3.5047 pkg_cv_GTK_LIBS="$GTK_LIBS"3.5048 else3.5049 if test -n "$PKG_CONFIG" && \3.5050 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&53.5051 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&53.5052 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&53.5053 ac_status=$?3.5054 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5055 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5056 (exit $ac_status); }; then3.5057 pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`3.5058 else3.5059 @@ -6975,7 +7200,7 @@3.5060 # Put the nasty error message in config.log where it belongs3.5061 echo "$GTK_PKG_ERRORS" >&53.5063 - { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:3.5064 + { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:3.5066 $GTK_PKG_ERRORS3.5068 @@ -6986,7 +7211,7 @@3.5069 and GTK_LIBS to avoid the need to call pkg-config.3.5070 See the pkg-config man page for more details.3.5071 " >&53.5072 -echo "$as_me: error: Package requirements (gtk+-2.0) were not met:3.5073 +$as_echo "$as_me: error: Package requirements (gtk+-2.0) were not met:3.5075 $GTK_PKG_ERRORS3.5077 @@ -6999,7 +7224,7 @@3.5078 " >&2;}3.5079 { (exit 1); exit 1; }; }3.5080 elif test $pkg_failed = untried; then3.5081 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it3.5082 + { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it3.5083 is in your PATH or set the PKG_CONFIG environment variable to the full3.5084 path to pkg-config.3.5086 @@ -7009,7 +7234,7 @@3.5088 To get pkg-config, see <http://pkg-config.freedesktop.org/>.3.5089 See \`config.log' for more details." >&53.5090 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it3.5091 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it3.5092 is in your PATH or set the PKG_CONFIG environment variable to the full3.5093 path to pkg-config.3.5095 @@ -7023,10 +7248,10 @@3.5096 else3.5097 GTK_CFLAGS=$pkg_cv_GTK_CFLAGS3.5098 GTK_LIBS=$pkg_cv_GTK_LIBS3.5099 - { echo "$as_me:$LINENO: result: yes" >&53.5100 -echo "${ECHO_T}yes" >&6; }3.5101 -3.5102 - HAVE_GTK='yes'3.5103 + { $as_echo "$as_me:$LINENO: result: yes" >&53.5104 +$as_echo "yes" >&6; }3.5105 +3.5106 + HAVE_GTK='yes'3.5108 cat >>confdefs.h <<\_ACEOF3.5109 #define HAVE_GTK 13.5110 @@ -7035,21 +7260,11 @@3.5112 fi3.5114 -3.5115 -if test "$HAVE_GTK" = 'yes'; then3.5116 - GUI_GTK_TRUE=3.5117 - GUI_GTK_FALSE='#'3.5118 -else3.5119 - GUI_GTK_TRUE='#'3.5120 - GUI_GTK_FALSE=3.5121 -fi3.5122 -3.5123 -3.5124 -LIBS="$LIBS $GTK_LIBS"3.5125 -{ echo "$as_me:$LINENO: checking for gdk_x11_display_get_xdisplay" >&53.5126 -echo $ECHO_N "checking for gdk_x11_display_get_xdisplay... $ECHO_C" >&6; }3.5127 + LIBS="$LIBS $GTK_LIBS"3.5128 + { $as_echo "$as_me:$LINENO: checking for gdk_x11_display_get_xdisplay" >&53.5129 +$as_echo_n "checking for gdk_x11_display_get_xdisplay... " >&6; }3.5130 if test "${ac_cv_func_gdk_x11_display_get_xdisplay+set}" = set; then3.5131 - echo $ECHO_N "(cached) $ECHO_C" >&63.5132 + $as_echo_n "(cached) " >&63.5133 else3.5134 cat >conftest.$ac_ext <<_ACEOF3.5135 /* confdefs.h. */3.5136 @@ -7102,34 +7317,38 @@3.5137 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5138 *) ac_try_echo=$ac_try;;3.5139 esac3.5140 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5141 - (eval "$ac_link") 2>conftest.er13.5142 - ac_status=$?3.5143 - grep -v '^ *+' conftest.er1 >conftest.err3.5144 - rm -f conftest.er13.5145 - cat conftest.err >&53.5146 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5147 - (exit $ac_status); } && {3.5148 - test -z "$ac_c_werror_flag" ||3.5149 - test ! -s conftest.err3.5150 - } && test -s conftest$ac_exeext &&3.5151 - $as_test_x conftest$ac_exeext; then3.5152 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5153 +$as_echo "$ac_try_echo") >&53.5154 + (eval "$ac_link") 2>conftest.er13.5155 + ac_status=$?3.5156 + grep -v '^ *+' conftest.er1 >conftest.err3.5157 + rm -f conftest.er13.5158 + cat conftest.err >&53.5159 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5160 + (exit $ac_status); } && {3.5161 + test -z "$ac_c_werror_flag" ||3.5162 + test ! -s conftest.err3.5163 + } && test -s conftest$ac_exeext && {3.5164 + test "$cross_compiling" = yes ||3.5165 + $as_test_x conftest$ac_exeext3.5166 + }; then3.5167 ac_cv_func_gdk_x11_display_get_xdisplay=yes3.5168 else3.5169 - echo "$as_me: failed program was:" >&53.5170 + $as_echo "$as_me: failed program was:" >&53.5171 sed 's/^/| /' conftest.$ac_ext >&53.5173 ac_cv_func_gdk_x11_display_get_xdisplay=no3.5174 fi3.5176 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5177 - conftest$ac_exeext conftest.$ac_ext3.5178 -fi3.5179 -{ echo "$as_me:$LINENO: result: $ac_cv_func_gdk_x11_display_get_xdisplay" >&53.5180 -echo "${ECHO_T}$ac_cv_func_gdk_x11_display_get_xdisplay" >&6; }3.5181 +rm -rf conftest.dSYM3.5182 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5183 + conftest$ac_exeext conftest.$ac_ext3.5184 +fi3.5185 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gdk_x11_display_get_xdisplay" >&53.5186 +$as_echo "$ac_cv_func_gdk_x11_display_get_xdisplay" >&6; }3.5187 if test $ac_cv_func_gdk_x11_display_get_xdisplay = yes; then3.5189 - HAVE_GTK_X11='yes'3.5190 + HAVE_GTK_X11='yes'3.5192 cat >>confdefs.h <<\_ACEOF3.5193 #define HAVE_GTK_X11 13.5194 @@ -7137,10 +7356,10 @@3.5196 fi3.5198 -{ echo "$as_me:$LINENO: checking for gdk_quartz_window_get_nsview" >&53.5199 -echo $ECHO_N "checking for gdk_quartz_window_get_nsview... $ECHO_C" >&6; }3.5200 + { $as_echo "$as_me:$LINENO: checking for gdk_quartz_window_get_nsview" >&53.5201 +$as_echo_n "checking for gdk_quartz_window_get_nsview... " >&6; }3.5202 if test "${ac_cv_func_gdk_quartz_window_get_nsview+set}" = set; then3.5203 - echo $ECHO_N "(cached) $ECHO_C" >&63.5204 + $as_echo_n "(cached) " >&63.5205 else3.5206 cat >conftest.$ac_ext <<_ACEOF3.5207 /* confdefs.h. */3.5208 @@ -7193,34 +7412,38 @@3.5209 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5210 *) ac_try_echo=$ac_try;;3.5211 esac3.5212 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5213 - (eval "$ac_link") 2>conftest.er13.5214 - ac_status=$?3.5215 - grep -v '^ *+' conftest.er1 >conftest.err3.5216 - rm -f conftest.er13.5217 - cat conftest.err >&53.5218 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5219 - (exit $ac_status); } && {3.5220 - test -z "$ac_c_werror_flag" ||3.5221 - test ! -s conftest.err3.5222 - } && test -s conftest$ac_exeext &&3.5223 - $as_test_x conftest$ac_exeext; then3.5224 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5225 +$as_echo "$ac_try_echo") >&53.5226 + (eval "$ac_link") 2>conftest.er13.5227 + ac_status=$?3.5228 + grep -v '^ *+' conftest.er1 >conftest.err3.5229 + rm -f conftest.er13.5230 + cat conftest.err >&53.5231 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5232 + (exit $ac_status); } && {3.5233 + test -z "$ac_c_werror_flag" ||3.5234 + test ! -s conftest.err3.5235 + } && test -s conftest$ac_exeext && {3.5236 + test "$cross_compiling" = yes ||3.5237 + $as_test_x conftest$ac_exeext3.5238 + }; then3.5239 ac_cv_func_gdk_quartz_window_get_nsview=yes3.5240 else3.5241 - echo "$as_me: failed program was:" >&53.5242 + $as_echo "$as_me: failed program was:" >&53.5243 sed 's/^/| /' conftest.$ac_ext >&53.5245 ac_cv_func_gdk_quartz_window_get_nsview=no3.5246 fi3.5248 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5249 - conftest$ac_exeext conftest.$ac_ext3.5250 -fi3.5251 -{ echo "$as_me:$LINENO: result: $ac_cv_func_gdk_quartz_window_get_nsview" >&53.5252 -echo "${ECHO_T}$ac_cv_func_gdk_quartz_window_get_nsview" >&6; }3.5253 +rm -rf conftest.dSYM3.5254 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5255 + conftest$ac_exeext conftest.$ac_ext3.5256 +fi3.5257 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gdk_quartz_window_get_nsview" >&53.5258 +$as_echo "$ac_cv_func_gdk_quartz_window_get_nsview" >&6; }3.5259 if test $ac_cv_func_gdk_quartz_window_get_nsview = yes; then3.5261 - HAVE_GTK_OSX='yes'3.5262 + HAVE_GTK_OSX='yes'3.5264 cat >>confdefs.h <<\_ACEOF3.5265 #define HAVE_GTK_OSX 13.5266 @@ -7228,15 +7451,27 @@3.5268 fi3.5270 +fi3.5271 +3.5272 +3.5273 +3.5274 +if test "$HAVE_GTK" = 'yes'; then3.5275 + GUI_GTK_TRUE=3.5276 + GUI_GTK_FALSE='#'3.5277 +else3.5278 + GUI_GTK_TRUE='#'3.5279 + GUI_GTK_FALSE=3.5280 +fi3.5281 +3.5283 if test "x$with_osmesa" != xno; then3.5287 -{ echo "$as_me:$LINENO: checking for OSMesaCreateContext in -lOSMesa" >&53.5288 -echo $ECHO_N "checking for OSMesaCreateContext in -lOSMesa... $ECHO_C" >&6; }3.5289 +{ $as_echo "$as_me:$LINENO: checking for OSMesaCreateContext in -lOSMesa" >&53.5290 +$as_echo_n "checking for OSMesaCreateContext in -lOSMesa... " >&6; }3.5291 if test "${ac_cv_lib_OSMesa_OSMesaCreateContext+set}" = set; then3.5292 - echo $ECHO_N "(cached) $ECHO_C" >&63.5293 + $as_echo_n "(cached) " >&63.5294 else3.5295 ac_check_lib_save_LIBS=$LIBS3.5296 LIBS="-lOSMesa $LIBS"3.5297 @@ -7268,32 +7503,36 @@3.5298 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5299 *) ac_try_echo=$ac_try;;3.5300 esac3.5301 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5302 - (eval "$ac_link") 2>conftest.er13.5303 - ac_status=$?3.5304 - grep -v '^ *+' conftest.er1 >conftest.err3.5305 - rm -f conftest.er13.5306 - cat conftest.err >&53.5307 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5308 - (exit $ac_status); } && {3.5309 - test -z "$ac_c_werror_flag" ||3.5310 - test ! -s conftest.err3.5311 - } && test -s conftest$ac_exeext &&3.5312 - $as_test_x conftest$ac_exeext; then3.5313 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5314 +$as_echo "$ac_try_echo") >&53.5315 + (eval "$ac_link") 2>conftest.er13.5316 + ac_status=$?3.5317 + grep -v '^ *+' conftest.er1 >conftest.err3.5318 + rm -f conftest.er13.5319 + cat conftest.err >&53.5320 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5321 + (exit $ac_status); } && {3.5322 + test -z "$ac_c_werror_flag" ||3.5323 + test ! -s conftest.err3.5324 + } && test -s conftest$ac_exeext && {3.5325 + test "$cross_compiling" = yes ||3.5326 + $as_test_x conftest$ac_exeext3.5327 + }; then3.5328 ac_cv_lib_OSMesa_OSMesaCreateContext=yes3.5329 else3.5330 - echo "$as_me: failed program was:" >&53.5331 + $as_echo "$as_me: failed program was:" >&53.5332 sed 's/^/| /' conftest.$ac_ext >&53.5334 ac_cv_lib_OSMesa_OSMesaCreateContext=no3.5335 fi3.5337 +rm -rf conftest.dSYM3.5338 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5339 conftest$ac_exeext conftest.$ac_ext3.5340 LIBS=$ac_check_lib_save_LIBS3.5341 fi3.5342 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&53.5343 -echo "${ECHO_T}$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; }3.5344 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&53.5345 +$as_echo "$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; }3.5346 if test $ac_cv_lib_OSMesa_OSMesaCreateContext = yes; then3.5347 cat >>confdefs.h <<_ACEOF3.5348 #define HAVE_LIBOSMESA 13.5349 @@ -7302,25 +7541,25 @@3.5350 LIBS="-lOSMesa $LIBS"3.5352 else3.5353 - { { echo "$as_me:$LINENO: error: --with-osmesa was given, but OSMesa library could not be found3.5354 -See \`config.log' for more details." >&53.5355 -echo "$as_me: error: --with-osmesa was given, but OSMesa library could not be found3.5356 + { { $as_echo "$as_me:$LINENO: error: --with-osmesa was given, but OSMesa library could not be found3.5357 +See \`config.log' for more details." >&53.5358 +$as_echo "$as_me: error: --with-osmesa was given, but OSMesa library could not be found3.5359 See \`config.log' for more details." >&2;}3.5360 { (exit 1); exit 1; }; }3.5361 fi3.5363 if test "${ac_cv_header_GL_osmesa_h+set}" = set; then3.5364 - { echo "$as_me:$LINENO: checking for GL/osmesa.h" >&53.5365 -echo $ECHO_N "checking for GL/osmesa.h... $ECHO_C" >&6; }3.5366 + { $as_echo "$as_me:$LINENO: checking for GL/osmesa.h" >&53.5367 +$as_echo_n "checking for GL/osmesa.h... " >&6; }3.5368 if test "${ac_cv_header_GL_osmesa_h+set}" = set; then3.5369 - echo $ECHO_N "(cached) $ECHO_C" >&63.5370 -fi3.5371 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&53.5372 -echo "${ECHO_T}$ac_cv_header_GL_osmesa_h" >&6; }3.5373 + $as_echo_n "(cached) " >&63.5374 +fi3.5375 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&53.5376 +$as_echo "$ac_cv_header_GL_osmesa_h" >&6; }3.5377 else3.5378 # Is the header compilable?3.5379 -{ echo "$as_me:$LINENO: checking GL/osmesa.h usability" >&53.5380 -echo $ECHO_N "checking GL/osmesa.h usability... $ECHO_C" >&6; }3.5381 +{ $as_echo "$as_me:$LINENO: checking GL/osmesa.h usability" >&53.5382 +$as_echo_n "checking GL/osmesa.h usability... " >&6; }3.5383 cat >conftest.$ac_ext <<_ACEOF3.5384 /* confdefs.h. */3.5385 _ACEOF3.5386 @@ -7336,32 +7575,33 @@3.5387 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5388 *) ac_try_echo=$ac_try;;3.5389 esac3.5390 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5391 - (eval "$ac_compile") 2>conftest.er13.5392 - ac_status=$?3.5393 - grep -v '^ *+' conftest.er1 >conftest.err3.5394 - rm -f conftest.er13.5395 - cat conftest.err >&53.5396 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5397 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5398 +$as_echo "$ac_try_echo") >&53.5399 + (eval "$ac_compile") 2>conftest.er13.5400 + ac_status=$?3.5401 + grep -v '^ *+' conftest.er1 >conftest.err3.5402 + rm -f conftest.er13.5403 + cat conftest.err >&53.5404 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5405 (exit $ac_status); } && {3.5406 test -z "$ac_c_werror_flag" ||3.5407 test ! -s conftest.err3.5408 } && test -s conftest.$ac_objext; then3.5409 ac_header_compiler=yes3.5410 else3.5411 - echo "$as_me: failed program was:" >&53.5412 + $as_echo "$as_me: failed program was:" >&53.5413 sed 's/^/| /' conftest.$ac_ext >&53.5415 ac_header_compiler=no3.5416 fi3.5418 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.5419 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.5420 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.5421 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.5422 +$as_echo "$ac_header_compiler" >&6; }3.5424 # Is the header present?3.5425 -{ echo "$as_me:$LINENO: checking GL/osmesa.h presence" >&53.5426 -echo $ECHO_N "checking GL/osmesa.h presence... $ECHO_C" >&6; }3.5427 +{ $as_echo "$as_me:$LINENO: checking GL/osmesa.h presence" >&53.5428 +$as_echo_n "checking GL/osmesa.h presence... " >&6; }3.5429 cat >conftest.$ac_ext <<_ACEOF3.5430 /* confdefs.h. */3.5431 _ACEOF3.5432 @@ -7375,71 +7615,72 @@3.5433 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5434 *) ac_try_echo=$ac_try;;3.5435 esac3.5436 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5437 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5438 +$as_echo "$ac_try_echo") >&53.5439 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.5440 ac_status=$?3.5441 grep -v '^ *+' conftest.er1 >conftest.err3.5442 rm -f conftest.er13.5443 cat conftest.err >&53.5444 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5445 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5446 (exit $ac_status); } >/dev/null && {3.5447 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.5448 test ! -s conftest.err3.5449 }; then3.5450 ac_header_preproc=yes3.5451 else3.5452 - echo "$as_me: failed program was:" >&53.5453 + $as_echo "$as_me: failed program was:" >&53.5454 sed 's/^/| /' conftest.$ac_ext >&53.5456 ac_header_preproc=no3.5457 fi3.5459 rm -f conftest.err conftest.$ac_ext3.5460 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.5461 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.5462 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.5463 +$as_echo "$ac_header_preproc" >&6; }3.5465 # So? What about this header?3.5466 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.5467 yes:no: )3.5468 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&53.5469 -echo "$as_me: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.5470 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&53.5471 -echo "$as_me: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&2;}3.5472 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&53.5473 +$as_echo "$as_me: WARNING: GL/osmesa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.5474 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&53.5475 +$as_echo "$as_me: WARNING: GL/osmesa.h: proceeding with the compiler's result" >&2;}3.5476 ac_header_preproc=yes3.5477 ;;3.5478 no:yes:* )3.5479 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: present but cannot be compiled" >&53.5480 -echo "$as_me: WARNING: GL/osmesa.h: present but cannot be compiled" >&2;}3.5481 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&53.5482 -echo "$as_me: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&2;}3.5483 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: see the Autoconf documentation" >&53.5484 -echo "$as_me: WARNING: GL/osmesa.h: see the Autoconf documentation" >&2;}3.5485 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&53.5486 -echo "$as_me: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&2;}3.5487 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&53.5488 -echo "$as_me: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&2;}3.5489 - { echo "$as_me:$LINENO: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&53.5490 -echo "$as_me: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&2;}3.5491 -3.5492 - ;;3.5493 -esac3.5494 -{ echo "$as_me:$LINENO: checking for GL/osmesa.h" >&53.5495 -echo $ECHO_N "checking for GL/osmesa.h... $ECHO_C" >&6; }3.5496 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: present but cannot be compiled" >&53.5497 +$as_echo "$as_me: WARNING: GL/osmesa.h: present but cannot be compiled" >&2;}3.5498 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&53.5499 +$as_echo "$as_me: WARNING: GL/osmesa.h: check for missing prerequisite headers?" >&2;}3.5500 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: see the Autoconf documentation" >&53.5501 +$as_echo "$as_me: WARNING: GL/osmesa.h: see the Autoconf documentation" >&2;}3.5502 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&53.5503 +$as_echo "$as_me: WARNING: GL/osmesa.h: section \"Present But Cannot Be Compiled\"" >&2;}3.5504 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&53.5505 +$as_echo "$as_me: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&2;}3.5506 + { $as_echo "$as_me:$LINENO: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&53.5507 +$as_echo "$as_me: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&2;}3.5508 +3.5509 + ;;3.5510 +esac3.5511 +{ $as_echo "$as_me:$LINENO: checking for GL/osmesa.h" >&53.5512 +$as_echo_n "checking for GL/osmesa.h... " >&6; }3.5513 if test "${ac_cv_header_GL_osmesa_h+set}" = set; then3.5514 - echo $ECHO_N "(cached) $ECHO_C" >&63.5515 + $as_echo_n "(cached) " >&63.5516 else3.5517 ac_cv_header_GL_osmesa_h=$ac_header_preproc3.5518 fi3.5519 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&53.5520 -echo "${ECHO_T}$ac_cv_header_GL_osmesa_h" >&6; }3.5521 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_osmesa_h" >&53.5522 +$as_echo "$ac_cv_header_GL_osmesa_h" >&6; }3.5524 fi3.5525 if test $ac_cv_header_GL_osmesa_h = yes; then3.5526 :3.5527 else3.5528 - { { echo "$as_me:$LINENO: error: --with-osmesa was given, but osmesa.h could not be found3.5529 -See \`config.log' for more details." >&53.5530 -echo "$as_me: error: --with-osmesa was given, but osmesa.h could not be found3.5531 + { { $as_echo "$as_me:$LINENO: error: --with-osmesa was given, but osmesa.h could not be found3.5532 +See \`config.log' for more details." >&53.5533 +$as_echo "$as_me: error: --with-osmesa was given, but osmesa.h could not be found3.5534 See \`config.log' for more details." >&2;}3.5535 { (exit 1); exit 1; }; }3.5536 fi3.5537 @@ -7456,10 +7697,10 @@3.5539 if test "x$APPLE_BUILD" != 'xyes'; then3.5541 -{ echo "$as_me:$LINENO: checking for glVertex3f in -lGL" >&53.5542 -echo $ECHO_N "checking for glVertex3f in -lGL... $ECHO_C" >&6; }3.5543 +{ $as_echo "$as_me:$LINENO: checking for glVertex3f in -lGL" >&53.5544 +$as_echo_n "checking for glVertex3f in -lGL... " >&6; }3.5545 if test "${ac_cv_lib_GL_glVertex3f+set}" = set; then3.5546 - echo $ECHO_N "(cached) $ECHO_C" >&63.5547 + $as_echo_n "(cached) " >&63.5548 else3.5549 ac_check_lib_save_LIBS=$LIBS3.5550 LIBS="-lGL $LIBS"3.5551 @@ -7491,32 +7732,36 @@3.5552 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5553 *) ac_try_echo=$ac_try;;3.5554 esac3.5555 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5556 - (eval "$ac_link") 2>conftest.er13.5557 - ac_status=$?3.5558 - grep -v '^ *+' conftest.er1 >conftest.err3.5559 - rm -f conftest.er13.5560 - cat conftest.err >&53.5561 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5562 - (exit $ac_status); } && {3.5563 - test -z "$ac_c_werror_flag" ||3.5564 - test ! -s conftest.err3.5565 - } && test -s conftest$ac_exeext &&3.5566 - $as_test_x conftest$ac_exeext; then3.5567 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5568 +$as_echo "$ac_try_echo") >&53.5569 + (eval "$ac_link") 2>conftest.er13.5570 + ac_status=$?3.5571 + grep -v '^ *+' conftest.er1 >conftest.err3.5572 + rm -f conftest.er13.5573 + cat conftest.err >&53.5574 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5575 + (exit $ac_status); } && {3.5576 + test -z "$ac_c_werror_flag" ||3.5577 + test ! -s conftest.err3.5578 + } && test -s conftest$ac_exeext && {3.5579 + test "$cross_compiling" = yes ||3.5580 + $as_test_x conftest$ac_exeext3.5581 + }; then3.5582 ac_cv_lib_GL_glVertex3f=yes3.5583 else3.5584 - echo "$as_me: failed program was:" >&53.5585 + $as_echo "$as_me: failed program was:" >&53.5586 sed 's/^/| /' conftest.$ac_ext >&53.5588 ac_cv_lib_GL_glVertex3f=no3.5589 fi3.5591 +rm -rf conftest.dSYM3.5592 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5593 conftest$ac_exeext conftest.$ac_ext3.5594 LIBS=$ac_check_lib_save_LIBS3.5595 fi3.5596 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glVertex3f" >&53.5597 -echo "${ECHO_T}$ac_cv_lib_GL_glVertex3f" >&6; }3.5598 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glVertex3f" >&53.5599 +$as_echo "$ac_cv_lib_GL_glVertex3f" >&6; }3.5600 if test $ac_cv_lib_GL_glVertex3f = yes; then3.5601 cat >>confdefs.h <<_ACEOF3.5602 #define HAVE_LIBGL 13.5603 @@ -7526,25 +7771,25 @@3.5605 else3.5607 - { { echo "$as_me:$LINENO: error: \"The OpenGL library (libGL.so) could not be found, but is required.\"3.5608 -See \`config.log' for more details." >&53.5609 -echo "$as_me: error: \"The OpenGL library (libGL.so) could not be found, but is required.\"3.5610 + { { $as_echo "$as_me:$LINENO: error: \"The OpenGL library (libGL.so) could not be found, but is required.\"3.5611 +See \`config.log' for more details." >&53.5612 +$as_echo "$as_me: error: \"The OpenGL library (libGL.so) could not be found, but is required.\"3.5613 See \`config.log' for more details." >&2;}3.5614 { (exit 1); exit 1; }; }3.5615 fi3.5617 if test "${ac_cv_header_GL_gl_h+set}" = set; then3.5618 - { echo "$as_me:$LINENO: checking for GL/gl.h" >&53.5619 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }3.5620 + { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&53.5621 +$as_echo_n "checking for GL/gl.h... " >&6; }3.5622 if test "${ac_cv_header_GL_gl_h+set}" = set; then3.5623 - echo $ECHO_N "(cached) $ECHO_C" >&63.5624 -fi3.5625 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&53.5626 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }3.5627 + $as_echo_n "(cached) " >&63.5628 +fi3.5629 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&53.5630 +$as_echo "$ac_cv_header_GL_gl_h" >&6; }3.5631 else3.5632 # Is the header compilable?3.5633 -{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&53.5634 -echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; }3.5635 +{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&53.5636 +$as_echo_n "checking GL/gl.h usability... " >&6; }3.5637 cat >conftest.$ac_ext <<_ACEOF3.5638 /* confdefs.h. */3.5639 _ACEOF3.5640 @@ -7560,32 +7805,33 @@3.5641 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5642 *) ac_try_echo=$ac_try;;3.5643 esac3.5644 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5645 - (eval "$ac_compile") 2>conftest.er13.5646 - ac_status=$?3.5647 - grep -v '^ *+' conftest.er1 >conftest.err3.5648 - rm -f conftest.er13.5649 - cat conftest.err >&53.5650 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5651 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5652 +$as_echo "$ac_try_echo") >&53.5653 + (eval "$ac_compile") 2>conftest.er13.5654 + ac_status=$?3.5655 + grep -v '^ *+' conftest.er1 >conftest.err3.5656 + rm -f conftest.er13.5657 + cat conftest.err >&53.5658 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5659 (exit $ac_status); } && {3.5660 test -z "$ac_c_werror_flag" ||3.5661 test ! -s conftest.err3.5662 } && test -s conftest.$ac_objext; then3.5663 ac_header_compiler=yes3.5664 else3.5665 - echo "$as_me: failed program was:" >&53.5666 + $as_echo "$as_me: failed program was:" >&53.5667 sed 's/^/| /' conftest.$ac_ext >&53.5669 ac_header_compiler=no3.5670 fi3.5672 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.5673 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.5674 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.5675 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.5676 +$as_echo "$ac_header_compiler" >&6; }3.5678 # Is the header present?3.5679 -{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&53.5680 -echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; }3.5681 +{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&53.5682 +$as_echo_n "checking GL/gl.h presence... " >&6; }3.5683 cat >conftest.$ac_ext <<_ACEOF3.5684 /* confdefs.h. */3.5685 _ACEOF3.5686 @@ -7599,76 +7845,173 @@3.5687 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5688 *) ac_try_echo=$ac_try;;3.5689 esac3.5690 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5691 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5692 +$as_echo "$ac_try_echo") >&53.5693 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.5694 ac_status=$?3.5695 grep -v '^ *+' conftest.er1 >conftest.err3.5696 rm -f conftest.er13.5697 cat conftest.err >&53.5698 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5699 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5700 (exit $ac_status); } >/dev/null && {3.5701 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.5702 test ! -s conftest.err3.5703 }; then3.5704 ac_header_preproc=yes3.5705 else3.5706 - echo "$as_me: failed program was:" >&53.5707 + $as_echo "$as_me: failed program was:" >&53.5708 sed 's/^/| /' conftest.$ac_ext >&53.5710 ac_header_preproc=no3.5711 fi3.5713 rm -f conftest.err conftest.$ac_ext3.5714 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.5715 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.5716 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.5717 +$as_echo "$ac_header_preproc" >&6; }3.5719 # So? What about this header?3.5720 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.5721 yes:no: )3.5722 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&53.5723 -echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.5724 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&53.5725 -echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}3.5726 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&53.5727 +$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.5728 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&53.5729 +$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}3.5730 ac_header_preproc=yes3.5731 ;;3.5732 no:yes:* )3.5733 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&53.5734 -echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}3.5735 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&53.5736 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}3.5737 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&53.5738 -echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}3.5739 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&53.5740 -echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;}3.5741 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&53.5742 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}3.5743 - { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&53.5744 -echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}3.5745 -3.5746 - ;;3.5747 -esac3.5748 -{ echo "$as_me:$LINENO: checking for GL/gl.h" >&53.5749 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }3.5750 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&53.5751 +$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}3.5752 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&53.5753 +$as_echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}3.5754 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&53.5755 +$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}3.5756 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&53.5757 +$as_echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;}3.5758 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&53.5759 +$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}3.5760 + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&53.5761 +$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}3.5762 +3.5763 + ;;3.5764 +esac3.5765 +{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&53.5766 +$as_echo_n "checking for GL/gl.h... " >&6; }3.5767 if test "${ac_cv_header_GL_gl_h+set}" = set; then3.5768 - echo $ECHO_N "(cached) $ECHO_C" >&63.5769 + $as_echo_n "(cached) " >&63.5770 else3.5771 ac_cv_header_GL_gl_h=$ac_header_preproc3.5772 fi3.5773 -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&53.5774 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }3.5775 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&53.5776 +$as_echo "$ac_cv_header_GL_gl_h" >&6; }3.5778 fi3.5779 if test $ac_cv_header_GL_gl_h = yes; then3.5780 :3.5781 else3.5783 - { { echo "$as_me:$LINENO: error: \"The OpenGL header files (eg GL/gl.h) could not be found, but are required.\"3.5784 -See \`config.log' for more details." >&53.5785 -echo "$as_me: error: \"The OpenGL header files (eg GL/gl.h) could not be found, but are required.\"3.5786 -See \`config.log' for more details." >&2;}3.5787 - { (exit 1); exit 1; }; }3.5788 -fi3.5789 -3.5790 + { { $as_echo "$as_me:$LINENO: error: \"The OpenGL header files (eg GL/gl.h) could not be found, but are required.\"3.5791 +See \`config.log' for more details." >&53.5792 +$as_echo "$as_me: error: \"The OpenGL header files (eg GL/gl.h) could not be found, but are required.\"3.5793 +See \`config.log' for more details." >&2;}3.5794 + { (exit 1); exit 1; }; }3.5795 +fi3.5796 +3.5797 +3.5798 + else3.5799 + { $as_echo "$as_me:$LINENO: checking for NSOpenGLGetVersion" >&53.5800 +$as_echo_n "checking for NSOpenGLGetVersion... " >&6; }3.5801 +if test "${ac_cv_func_NSOpenGLGetVersion+set}" = set; then3.5802 + $as_echo_n "(cached) " >&63.5803 +else3.5804 + cat >conftest.$ac_ext <<_ACEOF3.5805 +/* confdefs.h. */3.5806 +_ACEOF3.5807 +cat confdefs.h >>conftest.$ac_ext3.5808 +cat >>conftest.$ac_ext <<_ACEOF3.5809 +/* end confdefs.h. */3.5810 +/* Define NSOpenGLGetVersion to an innocuous variant, in case <limits.h> declares NSOpenGLGetVersion.3.5811 + For example, HP-UX 11i <limits.h> declares gettimeofday. */3.5812 +#define NSOpenGLGetVersion innocuous_NSOpenGLGetVersion3.5813 +3.5814 +/* System header to define __stub macros and hopefully few prototypes,3.5815 + which can conflict with char NSOpenGLGetVersion (); below.3.5816 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since3.5817 + <limits.h> exists even on freestanding compilers. */3.5818 +3.5819 +#ifdef __STDC__3.5820 +# include <limits.h>3.5821 +#else3.5822 +# include <assert.h>3.5823 +#endif3.5824 +3.5825 +#undef NSOpenGLGetVersion3.5826 +3.5827 +/* Override any GCC internal prototype to avoid an error.3.5828 + Use char because int might match the return type of a GCC3.5829 + builtin and then its argument prototype would still apply. */3.5830 +#ifdef __cplusplus3.5831 +extern "C"3.5832 +#endif3.5833 +char NSOpenGLGetVersion ();3.5834 +/* The GNU C library defines this for functions which it implements3.5835 + to always fail with ENOSYS. Some functions are actually named3.5836 + something starting with __ and the normal name is an alias. */3.5837 +#if defined __stub_NSOpenGLGetVersion || defined __stub___NSOpenGLGetVersion3.5838 +choke me3.5839 +#endif3.5840 +3.5841 +int3.5842 +main ()3.5843 +{3.5844 +return NSOpenGLGetVersion ();3.5845 + ;3.5846 + return 0;3.5847 +}3.5848 +_ACEOF3.5849 +rm -f conftest.$ac_objext conftest$ac_exeext3.5850 +if { (ac_try="$ac_link"3.5851 +case "(($ac_try" in3.5852 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5853 + *) ac_try_echo=$ac_try;;3.5854 +esac3.5855 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5856 +$as_echo "$ac_try_echo") >&53.5857 + (eval "$ac_link") 2>conftest.er13.5858 + ac_status=$?3.5859 + grep -v '^ *+' conftest.er1 >conftest.err3.5860 + rm -f conftest.er13.5861 + cat conftest.err >&53.5862 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5863 + (exit $ac_status); } && {3.5864 + test -z "$ac_c_werror_flag" ||3.5865 + test ! -s conftest.err3.5866 + } && test -s conftest$ac_exeext && {3.5867 + test "$cross_compiling" = yes ||3.5868 + $as_test_x conftest$ac_exeext3.5869 + }; then3.5870 + ac_cv_func_NSOpenGLGetVersion=yes3.5871 +else3.5872 + $as_echo "$as_me: failed program was:" >&53.5873 +sed 's/^/| /' conftest.$ac_ext >&53.5874 +3.5875 + ac_cv_func_NSOpenGLGetVersion=no3.5876 +fi3.5877 +3.5878 +rm -rf conftest.dSYM3.5879 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5880 + conftest$ac_exeext conftest.$ac_ext3.5881 +fi3.5882 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_NSOpenGLGetVersion" >&53.5883 +$as_echo "$ac_cv_func_NSOpenGLGetVersion" >&6; }3.5884 +if test $ac_cv_func_NSOpenGLGetVersion = yes; then3.5885 +3.5886 + HAVE_NSGL='yes'3.5887 +3.5888 +cat >>confdefs.h <<\_ACEOF3.5889 +#define HAVE_NSGL 13.5890 +_ACEOF3.5891 +3.5892 +fi3.5894 fi3.5896 @@ -7676,10 +8019,10 @@3.5897 if test "x$APPLE_BUILD" = "xyes"; then3.5898 LIBS="$LIBS -L/usr/X11/lib -lGL"3.5899 fi3.5900 - { echo "$as_me:$LINENO: checking for glXQueryVersion" >&53.5901 -echo $ECHO_N "checking for glXQueryVersion... $ECHO_C" >&6; }3.5902 + { $as_echo "$as_me:$LINENO: checking for glXQueryVersion" >&53.5903 +$as_echo_n "checking for glXQueryVersion... " >&6; }3.5904 if test "${ac_cv_func_glXQueryVersion+set}" = set; then3.5905 - echo $ECHO_N "(cached) $ECHO_C" >&63.5906 + $as_echo_n "(cached) " >&63.5907 else3.5908 cat >conftest.$ac_ext <<_ACEOF3.5909 /* confdefs.h. */3.5910 @@ -7732,31 +8075,35 @@3.5911 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.5912 *) ac_try_echo=$ac_try;;3.5913 esac3.5914 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.5915 - (eval "$ac_link") 2>conftest.er13.5916 - ac_status=$?3.5917 - grep -v '^ *+' conftest.er1 >conftest.err3.5918 - rm -f conftest.er13.5919 - cat conftest.err >&53.5920 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.5921 - (exit $ac_status); } && {3.5922 - test -z "$ac_c_werror_flag" ||3.5923 - test ! -s conftest.err3.5924 - } && test -s conftest$ac_exeext &&3.5925 - $as_test_x conftest$ac_exeext; then3.5926 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.5927 +$as_echo "$ac_try_echo") >&53.5928 + (eval "$ac_link") 2>conftest.er13.5929 + ac_status=$?3.5930 + grep -v '^ *+' conftest.er1 >conftest.err3.5931 + rm -f conftest.er13.5932 + cat conftest.err >&53.5933 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.5934 + (exit $ac_status); } && {3.5935 + test -z "$ac_c_werror_flag" ||3.5936 + test ! -s conftest.err3.5937 + } && test -s conftest$ac_exeext && {3.5938 + test "$cross_compiling" = yes ||3.5939 + $as_test_x conftest$ac_exeext3.5940 + }; then3.5941 ac_cv_func_glXQueryVersion=yes3.5942 else3.5943 - echo "$as_me: failed program was:" >&53.5944 + $as_echo "$as_me: failed program was:" >&53.5945 sed 's/^/| /' conftest.$ac_ext >&53.5947 ac_cv_func_glXQueryVersion=no3.5948 fi3.5950 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5951 - conftest$ac_exeext conftest.$ac_ext3.5952 -fi3.5953 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glXQueryVersion" >&53.5954 -echo "${ECHO_T}$ac_cv_func_glXQueryVersion" >&6; }3.5955 +rm -rf conftest.dSYM3.5956 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.5957 + conftest$ac_exeext conftest.$ac_ext3.5958 +fi3.5959 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glXQueryVersion" >&53.5960 +$as_echo "$ac_cv_func_glXQueryVersion" >&6; }3.5961 if test $ac_cv_func_glXQueryVersion = yes; then3.5963 HAVE_GLX='yes'3.5964 @@ -7767,98 +8114,6 @@3.5966 fi3.5968 - elif test "x$HAVE_GTK_OSX" = "xyes"; then3.5969 - { echo "$as_me:$LINENO: checking for NSOpenGLGetVersion" >&53.5970 -echo $ECHO_N "checking for NSOpenGLGetVersion... $ECHO_C" >&6; }3.5971 -if test "${ac_cv_func_NSOpenGLGetVersion+set}" = set; then3.5972 - echo $ECHO_N "(cached) $ECHO_C" >&63.5973 -else3.5974 - cat >conftest.$ac_ext <<_ACEOF3.5975 -/* confdefs.h. */3.5976 -_ACEOF3.5977 -cat confdefs.h >>conftest.$ac_ext3.5978 -cat >>conftest.$ac_ext <<_ACEOF3.5979 -/* end confdefs.h. */3.5980 -/* Define NSOpenGLGetVersion to an innocuous variant, in case <limits.h> declares NSOpenGLGetVersion.3.5981 - For example, HP-UX 11i <limits.h> declares gettimeofday. */3.5982 -#define NSOpenGLGetVersion innocuous_NSOpenGLGetVersion3.5983 -3.5984 -/* System header to define __stub macros and hopefully few prototypes,3.5985 - which can conflict with char NSOpenGLGetVersion (); below.3.5986 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since3.5987 - <limits.h> exists even on freestanding compilers. */3.5988 -3.5989 -#ifdef __STDC__3.5990 -# include <limits.h>3.5991 -#else3.5992 -# include <assert.h>3.5993 -#endif3.5994 -3.5995 -#undef NSOpenGLGetVersion3.5996 -3.5997 -/* Override any GCC internal prototype to avoid an error.3.5998 - Use char because int might match the return type of a GCC3.5999 - builtin and then its argument prototype would still apply. */3.6000 -#ifdef __cplusplus3.6001 -extern "C"3.6002 -#endif3.6003 -char NSOpenGLGetVersion ();3.6004 -/* The GNU C library defines this for functions which it implements3.6005 - to always fail with ENOSYS. Some functions are actually named3.6006 - something starting with __ and the normal name is an alias. */3.6007 -#if defined __stub_NSOpenGLGetVersion || defined __stub___NSOpenGLGetVersion3.6008 -choke me3.6009 -#endif3.6010 -3.6011 -int3.6012 -main ()3.6013 -{3.6014 -return NSOpenGLGetVersion ();3.6015 - ;3.6016 - return 0;3.6017 -}3.6018 -_ACEOF3.6019 -rm -f conftest.$ac_objext conftest$ac_exeext3.6020 -if { (ac_try="$ac_link"3.6021 -case "(($ac_try" in3.6022 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6023 - *) ac_try_echo=$ac_try;;3.6024 -esac3.6025 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6026 - (eval "$ac_link") 2>conftest.er13.6027 - ac_status=$?3.6028 - grep -v '^ *+' conftest.er1 >conftest.err3.6029 - rm -f conftest.er13.6030 - cat conftest.err >&53.6031 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6032 - (exit $ac_status); } && {3.6033 - test -z "$ac_c_werror_flag" ||3.6034 - test ! -s conftest.err3.6035 - } && test -s conftest$ac_exeext &&3.6036 - $as_test_x conftest$ac_exeext; then3.6037 - ac_cv_func_NSOpenGLGetVersion=yes3.6038 -else3.6039 - echo "$as_me: failed program was:" >&53.6040 -sed 's/^/| /' conftest.$ac_ext >&53.6041 -3.6042 - ac_cv_func_NSOpenGLGetVersion=no3.6043 -fi3.6044 -3.6045 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6046 - conftest$ac_exeext conftest.$ac_ext3.6047 -fi3.6048 -{ echo "$as_me:$LINENO: result: $ac_cv_func_NSOpenGLGetVersion" >&53.6049 -echo "${ECHO_T}$ac_cv_func_NSOpenGLGetVersion" >&6; }3.6050 -if test $ac_cv_func_NSOpenGLGetVersion = yes; then3.6051 -3.6052 - HAVE_NSGL='yes'3.6053 -3.6054 -cat >>confdefs.h <<\_ACEOF3.6055 -#define HAVE_NSGL 13.6056 -_ACEOF3.6057 -3.6058 -fi3.6059 -3.6060 fi3.6063 @@ -7901,10 +8156,10 @@3.6064 fi3.6067 -{ echo "$as_me:$LINENO: checking for glGenFramebuffersEXT" >&53.6068 -echo $ECHO_N "checking for glGenFramebuffersEXT... $ECHO_C" >&6; }3.6069 +{ $as_echo "$as_me:$LINENO: checking for glGenFramebuffersEXT" >&53.6070 +$as_echo_n "checking for glGenFramebuffersEXT... " >&6; }3.6071 if test "${ac_cv_func_glGenFramebuffersEXT+set}" = set; then3.6072 - echo $ECHO_N "(cached) $ECHO_C" >&63.6073 + $as_echo_n "(cached) " >&63.6074 else3.6075 cat >conftest.$ac_ext <<_ACEOF3.6076 /* confdefs.h. */3.6077 @@ -7957,31 +8212,35 @@3.6078 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6079 *) ac_try_echo=$ac_try;;3.6080 esac3.6081 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6082 - (eval "$ac_link") 2>conftest.er13.6083 - ac_status=$?3.6084 - grep -v '^ *+' conftest.er1 >conftest.err3.6085 - rm -f conftest.er13.6086 - cat conftest.err >&53.6087 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6088 - (exit $ac_status); } && {3.6089 - test -z "$ac_c_werror_flag" ||3.6090 - test ! -s conftest.err3.6091 - } && test -s conftest$ac_exeext &&3.6092 - $as_test_x conftest$ac_exeext; then3.6093 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6094 +$as_echo "$ac_try_echo") >&53.6095 + (eval "$ac_link") 2>conftest.er13.6096 + ac_status=$?3.6097 + grep -v '^ *+' conftest.er1 >conftest.err3.6098 + rm -f conftest.er13.6099 + cat conftest.err >&53.6100 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6101 + (exit $ac_status); } && {3.6102 + test -z "$ac_c_werror_flag" ||3.6103 + test ! -s conftest.err3.6104 + } && test -s conftest$ac_exeext && {3.6105 + test "$cross_compiling" = yes ||3.6106 + $as_test_x conftest$ac_exeext3.6107 + }; then3.6108 ac_cv_func_glGenFramebuffersEXT=yes3.6109 else3.6110 - echo "$as_me: failed program was:" >&53.6111 + $as_echo "$as_me: failed program was:" >&53.6112 sed 's/^/| /' conftest.$ac_ext >&53.6114 ac_cv_func_glGenFramebuffersEXT=no3.6115 fi3.6117 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6118 - conftest$ac_exeext conftest.$ac_ext3.6119 -fi3.6120 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glGenFramebuffersEXT" >&53.6121 -echo "${ECHO_T}$ac_cv_func_glGenFramebuffersEXT" >&6; }3.6122 +rm -rf conftest.dSYM3.6123 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6124 + conftest$ac_exeext conftest.$ac_ext3.6125 +fi3.6126 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glGenFramebuffersEXT" >&53.6127 +$as_echo "$ac_cv_func_glGenFramebuffersEXT" >&6; }3.6128 if test $ac_cv_func_glGenFramebuffersEXT = yes; then3.6130 cat >>confdefs.h <<\_ACEOF3.6131 @@ -7990,10 +8249,10 @@3.6133 fi3.6135 -{ echo "$as_me:$LINENO: checking for glCreateShader" >&53.6136 -echo $ECHO_N "checking for glCreateShader... $ECHO_C" >&6; }3.6137 +{ $as_echo "$as_me:$LINENO: checking for glCreateShader" >&53.6138 +$as_echo_n "checking for glCreateShader... " >&6; }3.6139 if test "${ac_cv_func_glCreateShader+set}" = set; then3.6140 - echo $ECHO_N "(cached) $ECHO_C" >&63.6141 + $as_echo_n "(cached) " >&63.6142 else3.6143 cat >conftest.$ac_ext <<_ACEOF3.6144 /* confdefs.h. */3.6145 @@ -8046,31 +8305,35 @@3.6146 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6147 *) ac_try_echo=$ac_try;;3.6148 esac3.6149 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6150 - (eval "$ac_link") 2>conftest.er13.6151 - ac_status=$?3.6152 - grep -v '^ *+' conftest.er1 >conftest.err3.6153 - rm -f conftest.er13.6154 - cat conftest.err >&53.6155 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6156 - (exit $ac_status); } && {3.6157 - test -z "$ac_c_werror_flag" ||3.6158 - test ! -s conftest.err3.6159 - } && test -s conftest$ac_exeext &&3.6160 - $as_test_x conftest$ac_exeext; then3.6161 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6162 +$as_echo "$ac_try_echo") >&53.6163 + (eval "$ac_link") 2>conftest.er13.6164 + ac_status=$?3.6165 + grep -v '^ *+' conftest.er1 >conftest.err3.6166 + rm -f conftest.er13.6167 + cat conftest.err >&53.6168 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6169 + (exit $ac_status); } && {3.6170 + test -z "$ac_c_werror_flag" ||3.6171 + test ! -s conftest.err3.6172 + } && test -s conftest$ac_exeext && {3.6173 + test "$cross_compiling" = yes ||3.6174 + $as_test_x conftest$ac_exeext3.6175 + }; then3.6176 ac_cv_func_glCreateShader=yes3.6177 else3.6178 - echo "$as_me: failed program was:" >&53.6179 + $as_echo "$as_me: failed program was:" >&53.6180 sed 's/^/| /' conftest.$ac_ext >&53.6182 ac_cv_func_glCreateShader=no3.6183 fi3.6185 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6186 - conftest$ac_exeext conftest.$ac_ext3.6187 -fi3.6188 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShader" >&53.6189 -echo "${ECHO_T}$ac_cv_func_glCreateShader" >&6; }3.6190 +rm -rf conftest.dSYM3.6191 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6192 + conftest$ac_exeext conftest.$ac_ext3.6193 +fi3.6194 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShader" >&53.6195 +$as_echo "$ac_cv_func_glCreateShader" >&6; }3.6196 if test $ac_cv_func_glCreateShader = yes; then3.6198 cat >>confdefs.h <<\_ACEOF3.6199 @@ -8079,10 +8342,10 @@3.6201 fi3.6203 -{ echo "$as_me:$LINENO: checking for glCreateShaderObjectARB" >&53.6204 -echo $ECHO_N "checking for glCreateShaderObjectARB... $ECHO_C" >&6; }3.6205 +{ $as_echo "$as_me:$LINENO: checking for glCreateShaderObjectARB" >&53.6206 +$as_echo_n "checking for glCreateShaderObjectARB... " >&6; }3.6207 if test "${ac_cv_func_glCreateShaderObjectARB+set}" = set; then3.6208 - echo $ECHO_N "(cached) $ECHO_C" >&63.6209 + $as_echo_n "(cached) " >&63.6210 else3.6211 cat >conftest.$ac_ext <<_ACEOF3.6212 /* confdefs.h. */3.6213 @@ -8135,31 +8398,35 @@3.6214 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6215 *) ac_try_echo=$ac_try;;3.6216 esac3.6217 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6218 - (eval "$ac_link") 2>conftest.er13.6219 - ac_status=$?3.6220 - grep -v '^ *+' conftest.er1 >conftest.err3.6221 - rm -f conftest.er13.6222 - cat conftest.err >&53.6223 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6224 - (exit $ac_status); } && {3.6225 - test -z "$ac_c_werror_flag" ||3.6226 - test ! -s conftest.err3.6227 - } && test -s conftest$ac_exeext &&3.6228 - $as_test_x conftest$ac_exeext; then3.6229 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6230 +$as_echo "$ac_try_echo") >&53.6231 + (eval "$ac_link") 2>conftest.er13.6232 + ac_status=$?3.6233 + grep -v '^ *+' conftest.er1 >conftest.err3.6234 + rm -f conftest.er13.6235 + cat conftest.err >&53.6236 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6237 + (exit $ac_status); } && {3.6238 + test -z "$ac_c_werror_flag" ||3.6239 + test ! -s conftest.err3.6240 + } && test -s conftest$ac_exeext && {3.6241 + test "$cross_compiling" = yes ||3.6242 + $as_test_x conftest$ac_exeext3.6243 + }; then3.6244 ac_cv_func_glCreateShaderObjectARB=yes3.6245 else3.6246 - echo "$as_me: failed program was:" >&53.6247 + $as_echo "$as_me: failed program was:" >&53.6248 sed 's/^/| /' conftest.$ac_ext >&53.6250 ac_cv_func_glCreateShaderObjectARB=no3.6251 fi3.6253 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6254 - conftest$ac_exeext conftest.$ac_ext3.6255 -fi3.6256 -{ echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShaderObjectARB" >&53.6257 -echo "${ECHO_T}$ac_cv_func_glCreateShaderObjectARB" >&6; }3.6258 +rm -rf conftest.dSYM3.6259 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.6260 + conftest$ac_exeext conftest.$ac_ext3.6261 +fi3.6262 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_glCreateShaderObjectARB" >&53.6263 +$as_echo "$ac_cv_func_glCreateShaderObjectARB" >&6; }3.6264 if test $ac_cv_func_glCreateShaderObjectARB = yes; then3.6266 cat >>confdefs.h <<\_ACEOF3.6267 @@ -8204,18 +8471,18 @@3.6270 pkg_failed=no3.6271 -{ echo "$as_me:$LINENO: checking for PULSE" >&53.6272 -echo $ECHO_N "checking for PULSE... $ECHO_C" >&6; }3.6273 +{ $as_echo "$as_me:$LINENO: checking for PULSE" >&53.6274 +$as_echo_n "checking for PULSE... " >&6; }3.6276 if test -n "$PKG_CONFIG"; then3.6277 if test -n "$PULSE_CFLAGS"; then3.6278 pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"3.6279 else3.6280 if test -n "$PKG_CONFIG" && \3.6281 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&53.6282 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&53.6283 ($PKG_CONFIG --exists --print-errors "libpulse-simple") 2>&53.6284 ac_status=$?3.6285 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6286 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6287 (exit $ac_status); }; then3.6288 pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse-simple" 2>/dev/null`3.6289 else3.6290 @@ -8230,10 +8497,10 @@3.6291 pkg_cv_PULSE_LIBS="$PULSE_LIBS"3.6292 else3.6293 if test -n "$PKG_CONFIG" && \3.6294 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&53.6295 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&53.6296 ($PKG_CONFIG --exists --print-errors "libpulse-simple") 2>&53.6297 ac_status=$?3.6298 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6299 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6300 (exit $ac_status); }; then3.6301 pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse-simple" 2>/dev/null`3.6302 else3.6303 @@ -8261,16 +8528,16 @@3.6304 # Put the nasty error message in config.log where it belongs3.6305 echo "$PULSE_PKG_ERRORS" >&53.6307 - { echo "$as_me:$LINENO: result: no" >&53.6308 -echo "${ECHO_T}no" >&6; }3.6309 + { $as_echo "$as_me:$LINENO: result: no" >&53.6310 +$as_echo "no" >&6; }3.6311 true3.6312 elif test $pkg_failed = untried; then3.6313 true3.6314 else3.6315 PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS3.6316 PULSE_LIBS=$pkg_cv_PULSE_LIBS3.6317 - { echo "$as_me:$LINENO: result: yes" >&53.6318 -echo "${ECHO_T}yes" >&6; }3.6319 + { $as_echo "$as_me:$LINENO: result: yes" >&53.6320 +$as_echo "yes" >&6; }3.6322 HAVE_PULSE='yes'3.6324 @@ -8292,18 +8559,18 @@3.6327 pkg_failed=no3.6328 -{ echo "$as_me:$LINENO: checking for ESOUND" >&53.6329 -echo $ECHO_N "checking for ESOUND... $ECHO_C" >&6; }3.6330 +{ $as_echo "$as_me:$LINENO: checking for ESOUND" >&53.6331 +$as_echo_n "checking for ESOUND... " >&6; }3.6333 if test -n "$PKG_CONFIG"; then3.6334 if test -n "$ESOUND_CFLAGS"; then3.6335 pkg_cv_ESOUND_CFLAGS="$ESOUND_CFLAGS"3.6336 else3.6337 if test -n "$PKG_CONFIG" && \3.6338 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&53.6339 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&53.6340 ($PKG_CONFIG --exists --print-errors "esound") 2>&53.6341 ac_status=$?3.6342 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6343 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6344 (exit $ac_status); }; then3.6345 pkg_cv_ESOUND_CFLAGS=`$PKG_CONFIG --cflags "esound" 2>/dev/null`3.6346 else3.6347 @@ -8318,10 +8585,10 @@3.6348 pkg_cv_ESOUND_LIBS="$ESOUND_LIBS"3.6349 else3.6350 if test -n "$PKG_CONFIG" && \3.6351 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&53.6352 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&53.6353 ($PKG_CONFIG --exists --print-errors "esound") 2>&53.6354 ac_status=$?3.6355 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6356 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6357 (exit $ac_status); }; then3.6358 pkg_cv_ESOUND_LIBS=`$PKG_CONFIG --libs "esound" 2>/dev/null`3.6359 else3.6360 @@ -8349,16 +8616,16 @@3.6361 # Put the nasty error message in config.log where it belongs3.6362 echo "$ESOUND_PKG_ERRORS" >&53.6364 - { echo "$as_me:$LINENO: result: no" >&53.6365 -echo "${ECHO_T}no" >&6; }3.6366 + { $as_echo "$as_me:$LINENO: result: no" >&53.6367 +$as_echo "no" >&6; }3.6368 true3.6369 elif test $pkg_failed = untried; then3.6370 true3.6371 else3.6372 ESOUND_CFLAGS=$pkg_cv_ESOUND_CFLAGS3.6373 ESOUND_LIBS=$pkg_cv_ESOUND_LIBS3.6374 - { echo "$as_me:$LINENO: result: yes" >&53.6375 -echo "${ECHO_T}yes" >&6; }3.6376 + { $as_echo "$as_me:$LINENO: result: yes" >&53.6377 +$as_echo "yes" >&6; }3.6379 HAVE_ESOUND='yes'3.6381 @@ -8380,18 +8647,18 @@3.6384 pkg_failed=no3.6385 -{ echo "$as_me:$LINENO: checking for ALSA" >&53.6386 -echo $ECHO_N "checking for ALSA... $ECHO_C" >&6; }3.6387 +{ $as_echo "$as_me:$LINENO: checking for ALSA" >&53.6388 +$as_echo_n "checking for ALSA... " >&6; }3.6390 if test -n "$PKG_CONFIG"; then3.6391 if test -n "$ALSA_CFLAGS"; then3.6392 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"3.6393 else3.6394 if test -n "$PKG_CONFIG" && \3.6395 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&53.6396 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&53.6397 ($PKG_CONFIG --exists --print-errors "alsa") 2>&53.6398 ac_status=$?3.6399 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6400 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6401 (exit $ac_status); }; then3.6402 pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`3.6403 else3.6404 @@ -8406,10 +8673,10 @@3.6405 pkg_cv_ALSA_LIBS="$ALSA_LIBS"3.6406 else3.6407 if test -n "$PKG_CONFIG" && \3.6408 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&53.6409 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&53.6410 ($PKG_CONFIG --exists --print-errors "alsa") 2>&53.6411 ac_status=$?3.6412 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6413 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6414 (exit $ac_status); }; then3.6415 pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`3.6416 else3.6417 @@ -8437,16 +8704,16 @@3.6418 # Put the nasty error message in config.log where it belongs3.6419 echo "$ALSA_PKG_ERRORS" >&53.6421 - { echo "$as_me:$LINENO: result: no" >&53.6422 -echo "${ECHO_T}no" >&6; }3.6423 + { $as_echo "$as_me:$LINENO: result: no" >&53.6424 +$as_echo "no" >&6; }3.6425 true3.6426 elif test $pkg_failed = untried; then3.6427 true3.6428 else3.6429 ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS3.6430 ALSA_LIBS=$pkg_cv_ALSA_LIBS3.6431 - { echo "$as_me:$LINENO: result: yes" >&53.6432 -echo "${ECHO_T}yes" >&6; }3.6433 + { $as_echo "$as_me:$LINENO: result: yes" >&53.6434 +$as_echo "yes" >&6; }3.6436 HAVE_ALSA='yes'3.6438 @@ -8471,17 +8738,17 @@3.6439 fi3.6441 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then3.6442 - { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&53.6443 -echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }3.6444 + { $as_echo "$as_me:$LINENO: checking for linux/cdrom.h" >&53.6445 +$as_echo_n "checking for linux/cdrom.h... " >&6; }3.6446 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then3.6447 - echo $ECHO_N "(cached) $ECHO_C" >&63.6448 -fi3.6449 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&53.6450 -echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }3.6451 + $as_echo_n "(cached) " >&63.6452 +fi3.6453 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&53.6454 +$as_echo "$ac_cv_header_linux_cdrom_h" >&6; }3.6455 else3.6456 # Is the header compilable?3.6457 -{ echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&53.6458 -echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6; }3.6459 +{ $as_echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&53.6460 +$as_echo_n "checking linux/cdrom.h usability... " >&6; }3.6461 cat >conftest.$ac_ext <<_ACEOF3.6462 /* confdefs.h. */3.6463 _ACEOF3.6464 @@ -8497,32 +8764,33 @@3.6465 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6466 *) ac_try_echo=$ac_try;;3.6467 esac3.6468 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6469 - (eval "$ac_compile") 2>conftest.er13.6470 - ac_status=$?3.6471 - grep -v '^ *+' conftest.er1 >conftest.err3.6472 - rm -f conftest.er13.6473 - cat conftest.err >&53.6474 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6475 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6476 +$as_echo "$ac_try_echo") >&53.6477 + (eval "$ac_compile") 2>conftest.er13.6478 + ac_status=$?3.6479 + grep -v '^ *+' conftest.er1 >conftest.err3.6480 + rm -f conftest.er13.6481 + cat conftest.err >&53.6482 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6483 (exit $ac_status); } && {3.6484 test -z "$ac_c_werror_flag" ||3.6485 test ! -s conftest.err3.6486 } && test -s conftest.$ac_objext; then3.6487 ac_header_compiler=yes3.6488 else3.6489 - echo "$as_me: failed program was:" >&53.6490 + $as_echo "$as_me: failed program was:" >&53.6491 sed 's/^/| /' conftest.$ac_ext >&53.6493 ac_header_compiler=no3.6494 fi3.6496 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.6497 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.6498 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.6499 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.6500 +$as_echo "$ac_header_compiler" >&6; }3.6502 # Is the header present?3.6503 -{ echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&53.6504 -echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6; }3.6505 +{ $as_echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&53.6506 +$as_echo_n "checking linux/cdrom.h presence... " >&6; }3.6507 cat >conftest.$ac_ext <<_ACEOF3.6508 /* confdefs.h. */3.6509 _ACEOF3.6510 @@ -8536,63 +8804,64 @@3.6511 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6512 *) ac_try_echo=$ac_try;;3.6513 esac3.6514 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6515 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6516 +$as_echo "$ac_try_echo") >&53.6517 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.6518 ac_status=$?3.6519 grep -v '^ *+' conftest.er1 >conftest.err3.6520 rm -f conftest.er13.6521 cat conftest.err >&53.6522 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6523 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6524 (exit $ac_status); } >/dev/null && {3.6525 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.6526 test ! -s conftest.err3.6527 }; then3.6528 ac_header_preproc=yes3.6529 else3.6530 - echo "$as_me: failed program was:" >&53.6531 + $as_echo "$as_me: failed program was:" >&53.6532 sed 's/^/| /' conftest.$ac_ext >&53.6534 ac_header_preproc=no3.6535 fi3.6537 rm -f conftest.err conftest.$ac_ext3.6538 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.6539 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.6540 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.6541 +$as_echo "$ac_header_preproc" >&6; }3.6543 # So? What about this header?3.6544 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.6545 yes:no: )3.6546 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&53.6547 -echo "$as_me: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.6548 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&53.6549 -echo "$as_me: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&2;}3.6550 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&53.6551 +$as_echo "$as_me: WARNING: linux/cdrom.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.6552 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&53.6553 +$as_echo "$as_me: WARNING: linux/cdrom.h: proceeding with the compiler's result" >&2;}3.6554 ac_header_preproc=yes3.6555 ;;3.6556 no:yes:* )3.6557 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: present but cannot be compiled" >&53.6558 -echo "$as_me: WARNING: linux/cdrom.h: present but cannot be compiled" >&2;}3.6559 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&53.6560 -echo "$as_me: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&2;}3.6561 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: see the Autoconf documentation" >&53.6562 -echo "$as_me: WARNING: linux/cdrom.h: see the Autoconf documentation" >&2;}3.6563 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&53.6564 -echo "$as_me: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&2;}3.6565 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&53.6566 -echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}3.6567 - { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&53.6568 -echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}3.6569 -3.6570 - ;;3.6571 -esac3.6572 -{ echo "$as_me:$LINENO: checking for linux/cdrom.h" >&53.6573 -echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }3.6574 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: present but cannot be compiled" >&53.6575 +$as_echo "$as_me: WARNING: linux/cdrom.h: present but cannot be compiled" >&2;}3.6576 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&53.6577 +$as_echo "$as_me: WARNING: linux/cdrom.h: check for missing prerequisite headers?" >&2;}3.6578 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: see the Autoconf documentation" >&53.6579 +$as_echo "$as_me: WARNING: linux/cdrom.h: see the Autoconf documentation" >&2;}3.6580 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&53.6581 +$as_echo "$as_me: WARNING: linux/cdrom.h: section \"Present But Cannot Be Compiled\"" >&2;}3.6582 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&53.6583 +$as_echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}3.6584 + { $as_echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&53.6585 +$as_echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}3.6586 +3.6587 + ;;3.6588 +esac3.6589 +{ $as_echo "$as_me:$LINENO: checking for linux/cdrom.h" >&53.6590 +$as_echo_n "checking for linux/cdrom.h... " >&6; }3.6591 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then3.6592 - echo $ECHO_N "(cached) $ECHO_C" >&63.6593 + $as_echo_n "(cached) " >&63.6594 else3.6595 ac_cv_header_linux_cdrom_h=$ac_header_preproc3.6596 fi3.6597 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&53.6598 -echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }3.6599 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&53.6600 +$as_echo "$ac_cv_header_linux_cdrom_h" >&6; }3.6602 fi3.6603 if test $ac_cv_header_linux_cdrom_h = yes; then3.6604 @@ -8615,17 +8884,17 @@3.6607 if test "${ac_cv_header_linux_joystick_h+set}" = set; then3.6608 - { echo "$as_me:$LINENO: checking for linux/joystick.h" >&53.6609 -echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }3.6610 + { $as_echo "$as_me:$LINENO: checking for linux/joystick.h" >&53.6611 +$as_echo_n "checking for linux/joystick.h... " >&6; }3.6612 if test "${ac_cv_header_linux_joystick_h+set}" = set; then3.6613 - echo $ECHO_N "(cached) $ECHO_C" >&63.6614 -fi3.6615 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&53.6616 -echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }3.6617 + $as_echo_n "(cached) " >&63.6618 +fi3.6619 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&53.6620 +$as_echo "$ac_cv_header_linux_joystick_h" >&6; }3.6621 else3.6622 # Is the header compilable?3.6623 -{ echo "$as_me:$LINENO: checking linux/joystick.h usability" >&53.6624 -echo $ECHO_N "checking linux/joystick.h usability... $ECHO_C" >&6; }3.6625 +{ $as_echo "$as_me:$LINENO: checking linux/joystick.h usability" >&53.6626 +$as_echo_n "checking linux/joystick.h usability... " >&6; }3.6627 cat >conftest.$ac_ext <<_ACEOF3.6628 /* confdefs.h. */3.6629 _ACEOF3.6630 @@ -8641,32 +8910,33 @@3.6631 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6632 *) ac_try_echo=$ac_try;;3.6633 esac3.6634 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6635 - (eval "$ac_compile") 2>conftest.er13.6636 - ac_status=$?3.6637 - grep -v '^ *+' conftest.er1 >conftest.err3.6638 - rm -f conftest.er13.6639 - cat conftest.err >&53.6640 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6641 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6642 +$as_echo "$ac_try_echo") >&53.6643 + (eval "$ac_compile") 2>conftest.er13.6644 + ac_status=$?3.6645 + grep -v '^ *+' conftest.er1 >conftest.err3.6646 + rm -f conftest.er13.6647 + cat conftest.err >&53.6648 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6649 (exit $ac_status); } && {3.6650 test -z "$ac_c_werror_flag" ||3.6651 test ! -s conftest.err3.6652 } && test -s conftest.$ac_objext; then3.6653 ac_header_compiler=yes3.6654 else3.6655 - echo "$as_me: failed program was:" >&53.6656 + $as_echo "$as_me: failed program was:" >&53.6657 sed 's/^/| /' conftest.$ac_ext >&53.6659 ac_header_compiler=no3.6660 fi3.6662 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.6663 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.6664 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.6665 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.6666 +$as_echo "$ac_header_compiler" >&6; }3.6668 # Is the header present?3.6669 -{ echo "$as_me:$LINENO: checking linux/joystick.h presence" >&53.6670 -echo $ECHO_N "checking linux/joystick.h presence... $ECHO_C" >&6; }3.6671 +{ $as_echo "$as_me:$LINENO: checking linux/joystick.h presence" >&53.6672 +$as_echo_n "checking linux/joystick.h presence... " >&6; }3.6673 cat >conftest.$ac_ext <<_ACEOF3.6674 /* confdefs.h. */3.6675 _ACEOF3.6676 @@ -8680,63 +8950,64 @@3.6677 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.6678 *) ac_try_echo=$ac_try;;3.6679 esac3.6680 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.6681 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.6682 +$as_echo "$ac_try_echo") >&53.6683 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.6684 ac_status=$?3.6685 grep -v '^ *+' conftest.er1 >conftest.err3.6686 rm -f conftest.er13.6687 cat conftest.err >&53.6688 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.6689 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.6690 (exit $ac_status); } >/dev/null && {3.6691 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.6692 test ! -s conftest.err3.6693 }; then3.6694 ac_header_preproc=yes3.6695 else3.6696 - echo "$as_me: failed program was:" >&53.6697 + $as_echo "$as_me: failed program was:" >&53.6698 sed 's/^/| /' conftest.$ac_ext >&53.6700 ac_header_preproc=no3.6701 fi3.6703 rm -f conftest.err conftest.$ac_ext3.6704 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.6705 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.6706 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.6707 +$as_echo "$ac_header_preproc" >&6; }3.6709 # So? What about this header?3.6710 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.6711 yes:no: )3.6712 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&53.6713 -echo "$as_me: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.6714 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the compiler's result" >&53.6715 -echo "$as_me: WARNING: linux/joystick.h: proceeding with the compiler's result" >&2;}3.6716 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&53.6717 +$as_echo "$as_me: WARNING: linux/joystick.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.6718 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the compiler's result" >&53.6719 +$as_echo "$as_me: WARNING: linux/joystick.h: proceeding with the compiler's result" >&2;}3.6720 ac_header_preproc=yes3.6721 ;;3.6722 no:yes:* )3.6723 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: present but cannot be compiled" >&53.6724 -echo "$as_me: WARNING: linux/joystick.h: present but cannot be compiled" >&2;}3.6725 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&53.6726 -echo "$as_me: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&2;}3.6727 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: see the Autoconf documentation" >&53.6728 -echo "$as_me: WARNING: linux/joystick.h: see the Autoconf documentation" >&2;}3.6729 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&53.6730 -echo "$as_me: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&2;}3.6731 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&53.6732 -echo "$as_me: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&2;}3.6733 - { echo "$as_me:$LINENO: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&53.6734 -echo "$as_me: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&2;}3.6735 -3.6736 - ;;3.6737 -esac3.6738 -{ echo "$as_me:$LINENO: checking for linux/joystick.h" >&53.6739 -echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }3.6740 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: present but cannot be compiled" >&53.6741 +$as_echo "$as_me: WARNING: linux/joystick.h: present but cannot be compiled" >&2;}3.6742 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&53.6743 +$as_echo "$as_me: WARNING: linux/joystick.h: check for missing prerequisite headers?" >&2;}3.6744 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: see the Autoconf documentation" >&53.6745 +$as_echo "$as_me: WARNING: linux/joystick.h: see the Autoconf documentation" >&2;}3.6746 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&53.6747 +$as_echo "$as_me: WARNING: linux/joystick.h: section \"Present But Cannot Be Compiled\"" >&2;}3.6748 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&53.6749 +$as_echo "$as_me: WARNING: linux/joystick.h: proceeding with the preprocessor's result" >&2;}3.6750 + { $as_echo "$as_me:$LINENO: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&53.6751 +$as_echo "$as_me: WARNING: linux/joystick.h: in the future, the compiler will take precedence" >&2;}3.6752 +3.6753 + ;;3.6754 +esac3.6755 +{ $as_echo "$as_me:$LINENO: checking for linux/joystick.h" >&53.6756 +$as_echo_n "checking for linux/joystick.h... " >&6; }3.6757 if test "${ac_cv_header_linux_joystick_h+set}" = set; then3.6758 - echo $ECHO_N "(cached) $ECHO_C" >&63.6759 + $as_echo_n "(cached) " >&63.6760 else3.6761 ac_cv_header_linux_joystick_h=$ac_header_preproc3.6762 fi3.6763 -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&53.6764 -echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }3.6765 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&53.6766 +$as_echo "$ac_cv_header_linux_joystick_h" >&6; }3.6768 fi3.6769 if test $ac_cv_header_linux_joystick_h = yes; then3.6770 @@ -8765,10 +9036,10 @@3.6772 # Extract the first word of "sh-elf-gcc", so it can be a program name with args.3.6773 set dummy sh-elf-gcc; ac_word=$23.6774 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.6775 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.6776 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.6777 +$as_echo_n "checking for $ac_word... " >&6; }3.6778 if test "${ac_cv_path_SHCC+set}" = set; then3.6779 - echo $ECHO_N "(cached) $ECHO_C" >&63.6780 + $as_echo_n "(cached) " >&63.6781 else3.6782 case $SHCC in3.6783 [\\/]* | ?:[\\/]*)3.6784 @@ -8783,7 +9054,7 @@3.6785 for ac_exec_ext in '' $ac_executable_extensions; do3.6786 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.6787 ac_cv_path_SHCC="$as_dir/$ac_word$ac_exec_ext"3.6788 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6789 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6790 break 23.6791 fi3.6792 done3.6793 @@ -8795,20 +9066,20 @@3.6794 fi3.6795 SHCC=$ac_cv_path_SHCC3.6796 if test -n "$SHCC"; then3.6797 - { echo "$as_me:$LINENO: result: $SHCC" >&53.6798 -echo "${ECHO_T}$SHCC" >&6; }3.6799 -else3.6800 - { echo "$as_me:$LINENO: result: no" >&53.6801 -echo "${ECHO_T}no" >&6; }3.6802 + { $as_echo "$as_me:$LINENO: result: $SHCC" >&53.6803 +$as_echo "$SHCC" >&6; }3.6804 +else3.6805 + { $as_echo "$as_me:$LINENO: result: no" >&53.6806 +$as_echo "no" >&6; }3.6807 fi3.6810 # Extract the first word of "sh-elf-ld", so it can be a program name with args.3.6811 set dummy sh-elf-ld; ac_word=$23.6812 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.6813 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.6814 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.6815 +$as_echo_n "checking for $ac_word... " >&6; }3.6816 if test "${ac_cv_path_SHLD+set}" = set; then3.6817 - echo $ECHO_N "(cached) $ECHO_C" >&63.6818 + $as_echo_n "(cached) " >&63.6819 else3.6820 case $SHLD in3.6821 [\\/]* | ?:[\\/]*)3.6822 @@ -8823,7 +9094,7 @@3.6823 for ac_exec_ext in '' $ac_executable_extensions; do3.6824 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.6825 ac_cv_path_SHLD="$as_dir/$ac_word$ac_exec_ext"3.6826 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6827 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6828 break 23.6829 fi3.6830 done3.6831 @@ -8835,20 +9106,20 @@3.6832 fi3.6833 SHLD=$ac_cv_path_SHLD3.6834 if test -n "$SHLD"; then3.6835 - { echo "$as_me:$LINENO: result: $SHLD" >&53.6836 -echo "${ECHO_T}$SHLD" >&6; }3.6837 -else3.6838 - { echo "$as_me:$LINENO: result: no" >&53.6839 -echo "${ECHO_T}no" >&6; }3.6840 + { $as_echo "$as_me:$LINENO: result: $SHLD" >&53.6841 +$as_echo "$SHLD" >&6; }3.6842 +else3.6843 + { $as_echo "$as_me:$LINENO: result: no" >&53.6844 +$as_echo "no" >&6; }3.6845 fi3.6848 # Extract the first word of "sh-elf-objcopy", so it can be a program name with args.3.6849 set dummy sh-elf-objcopy; ac_word=$23.6850 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.6851 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.6852 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.6853 +$as_echo_n "checking for $ac_word... " >&6; }3.6854 if test "${ac_cv_path_SHOBJCOPY+set}" = set; then3.6855 - echo $ECHO_N "(cached) $ECHO_C" >&63.6856 + $as_echo_n "(cached) " >&63.6857 else3.6858 case $SHOBJCOPY in3.6859 [\\/]* | ?:[\\/]*)3.6860 @@ -8863,7 +9134,7 @@3.6861 for ac_exec_ext in '' $ac_executable_extensions; do3.6862 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.6863 ac_cv_path_SHOBJCOPY="$as_dir/$ac_word$ac_exec_ext"3.6864 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6865 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6866 break 23.6867 fi3.6868 done3.6869 @@ -8875,20 +9146,20 @@3.6870 fi3.6871 SHOBJCOPY=$ac_cv_path_SHOBJCOPY3.6872 if test -n "$SHOBJCOPY"; then3.6873 - { echo "$as_me:$LINENO: result: $SHOBJCOPY" >&53.6874 -echo "${ECHO_T}$SHOBJCOPY" >&6; }3.6875 -else3.6876 - { echo "$as_me:$LINENO: result: no" >&53.6877 -echo "${ECHO_T}no" >&6; }3.6878 + { $as_echo "$as_me:$LINENO: result: $SHOBJCOPY" >&53.6879 +$as_echo "$SHOBJCOPY" >&6; }3.6880 +else3.6881 + { $as_echo "$as_me:$LINENO: result: no" >&53.6882 +$as_echo "no" >&6; }3.6883 fi3.6886 # Extract the first word of "arm-elf-gcc", so it can be a program name with args.3.6887 set dummy arm-elf-gcc; ac_word=$23.6888 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.6889 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.6890 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.6891 +$as_echo_n "checking for $ac_word... " >&6; }3.6892 if test "${ac_cv_path_ARMCC+set}" = set; then3.6893 - echo $ECHO_N "(cached) $ECHO_C" >&63.6894 + $as_echo_n "(cached) " >&63.6895 else3.6896 case $ARMCC in3.6897 [\\/]* | ?:[\\/]*)3.6898 @@ -8903,7 +9174,7 @@3.6899 for ac_exec_ext in '' $ac_executable_extensions; do3.6900 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.6901 ac_cv_path_ARMCC="$as_dir/$ac_word$ac_exec_ext"3.6902 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6903 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6904 break 23.6905 fi3.6906 done3.6907 @@ -8915,20 +9186,20 @@3.6908 fi3.6909 ARMCC=$ac_cv_path_ARMCC3.6910 if test -n "$ARMCC"; then3.6911 - { echo "$as_me:$LINENO: result: $ARMCC" >&53.6912 -echo "${ECHO_T}$ARMCC" >&6; }3.6913 -else3.6914 - { echo "$as_me:$LINENO: result: no" >&53.6915 -echo "${ECHO_T}no" >&6; }3.6916 + { $as_echo "$as_me:$LINENO: result: $ARMCC" >&53.6917 +$as_echo "$ARMCC" >&6; }3.6918 +else3.6919 + { $as_echo "$as_me:$LINENO: result: no" >&53.6920 +$as_echo "no" >&6; }3.6921 fi3.6924 # Extract the first word of "arm-elf-ld", so it can be a program name with args.3.6925 set dummy arm-elf-ld; ac_word=$23.6926 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.6927 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.6928 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.6929 +$as_echo_n "checking for $ac_word... " >&6; }3.6930 if test "${ac_cv_path_ARMLD+set}" = set; then3.6931 - echo $ECHO_N "(cached) $ECHO_C" >&63.6932 + $as_echo_n "(cached) " >&63.6933 else3.6934 case $ARMLD in3.6935 [\\/]* | ?:[\\/]*)3.6936 @@ -8943,7 +9214,7 @@3.6937 for ac_exec_ext in '' $ac_executable_extensions; do3.6938 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.6939 ac_cv_path_ARMLD="$as_dir/$ac_word$ac_exec_ext"3.6940 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6941 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6942 break 23.6943 fi3.6944 done3.6945 @@ -8955,20 +9226,20 @@3.6946 fi3.6947 ARMLD=$ac_cv_path_ARMLD3.6948 if test -n "$ARMLD"; then3.6949 - { echo "$as_me:$LINENO: result: $ARMLD" >&53.6950 -echo "${ECHO_T}$ARMLD" >&6; }3.6951 -else3.6952 - { echo "$as_me:$LINENO: result: no" >&53.6953 -echo "${ECHO_T}no" >&6; }3.6954 + { $as_echo "$as_me:$LINENO: result: $ARMLD" >&53.6955 +$as_echo "$ARMLD" >&6; }3.6956 +else3.6957 + { $as_echo "$as_me:$LINENO: result: no" >&53.6958 +$as_echo "no" >&6; }3.6959 fi3.6962 # Extract the first word of "arm-elf-objcopy", so it can be a program name with args.3.6963 set dummy arm-elf-objcopy; ac_word=$23.6964 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.6965 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.6966 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.6967 +$as_echo_n "checking for $ac_word... " >&6; }3.6968 if test "${ac_cv_path_ARMOBJCOPY+set}" = set; then3.6969 - echo $ECHO_N "(cached) $ECHO_C" >&63.6970 + $as_echo_n "(cached) " >&63.6971 else3.6972 case $ARMOBJCOPY in3.6973 [\\/]* | ?:[\\/]*)3.6974 @@ -8983,7 +9254,7 @@3.6975 for ac_exec_ext in '' $ac_executable_extensions; do3.6976 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.6977 ac_cv_path_ARMOBJCOPY="$as_dir/$ac_word$ac_exec_ext"3.6978 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6979 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.6980 break 23.6981 fi3.6982 done3.6983 @@ -8995,11 +9266,11 @@3.6984 fi3.6985 ARMOBJCOPY=$ac_cv_path_ARMOBJCOPY3.6986 if test -n "$ARMOBJCOPY"; then3.6987 - { echo "$as_me:$LINENO: result: $ARMOBJCOPY" >&53.6988 -echo "${ECHO_T}$ARMOBJCOPY" >&6; }3.6989 -else3.6990 - { echo "$as_me:$LINENO: result: no" >&53.6991 -echo "${ECHO_T}no" >&6; }3.6992 + { $as_echo "$as_me:$LINENO: result: $ARMOBJCOPY" >&53.6993 +$as_echo "$ARMOBJCOPY" >&6; }3.6994 +else3.6995 + { $as_echo "$as_me:$LINENO: result: no" >&53.6996 +$as_echo "no" >&6; }3.6997 fi3.7000 @@ -9051,20 +9322,21 @@3.7002 for ac_header in locale.h3.7003 do3.7004 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`3.7005 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`3.7006 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then3.7007 - { echo "$as_me:$LINENO: checking for $ac_header" >&53.7008 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }3.7009 + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&53.7010 +$as_echo_n "checking for $ac_header... " >&6; }3.7011 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then3.7012 - echo $ECHO_N "(cached) $ECHO_C" >&63.7013 -fi3.7014 -ac_res=`eval echo '${'$as_ac_Header'}'`3.7015 - { echo "$as_me:$LINENO: result: $ac_res" >&53.7016 -echo "${ECHO_T}$ac_res" >&6; }3.7017 + $as_echo_n "(cached) " >&63.7018 +fi3.7019 +ac_res=`eval 'as_val=${'$as_ac_Header'}3.7020 + $as_echo "$as_val"'`3.7021 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&53.7022 +$as_echo "$ac_res" >&6; }3.7023 else3.7024 # Is the header compilable?3.7025 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&53.7026 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }3.7027 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&53.7028 +$as_echo_n "checking $ac_header usability... " >&6; }3.7029 cat >conftest.$ac_ext <<_ACEOF3.7030 /* confdefs.h. */3.7031 _ACEOF3.7032 @@ -9080,32 +9352,33 @@3.7033 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7034 *) ac_try_echo=$ac_try;;3.7035 esac3.7036 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7037 - (eval "$ac_compile") 2>conftest.er13.7038 - ac_status=$?3.7039 - grep -v '^ *+' conftest.er1 >conftest.err3.7040 - rm -f conftest.er13.7041 - cat conftest.err >&53.7042 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7043 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7044 +$as_echo "$ac_try_echo") >&53.7045 + (eval "$ac_compile") 2>conftest.er13.7046 + ac_status=$?3.7047 + grep -v '^ *+' conftest.er1 >conftest.err3.7048 + rm -f conftest.er13.7049 + cat conftest.err >&53.7050 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7051 (exit $ac_status); } && {3.7052 test -z "$ac_c_werror_flag" ||3.7053 test ! -s conftest.err3.7054 } && test -s conftest.$ac_objext; then3.7055 ac_header_compiler=yes3.7056 else3.7057 - echo "$as_me: failed program was:" >&53.7058 + $as_echo "$as_me: failed program was:" >&53.7059 sed 's/^/| /' conftest.$ac_ext >&53.7061 ac_header_compiler=no3.7062 fi3.7064 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.7065 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.7066 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.7067 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.7068 +$as_echo "$ac_header_compiler" >&6; }3.7070 # Is the header present?3.7071 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&53.7072 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }3.7073 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&53.7074 +$as_echo_n "checking $ac_header presence... " >&6; }3.7075 cat >conftest.$ac_ext <<_ACEOF3.7076 /* confdefs.h. */3.7077 _ACEOF3.7078 @@ -9119,69 +9392,72 @@3.7079 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7080 *) ac_try_echo=$ac_try;;3.7081 esac3.7082 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7083 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7084 +$as_echo "$ac_try_echo") >&53.7085 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.7086 ac_status=$?3.7087 grep -v '^ *+' conftest.er1 >conftest.err3.7088 rm -f conftest.er13.7089 cat conftest.err >&53.7090 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7091 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7092 (exit $ac_status); } >/dev/null && {3.7093 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.7094 test ! -s conftest.err3.7095 }; then3.7096 ac_header_preproc=yes3.7097 else3.7098 - echo "$as_me: failed program was:" >&53.7099 + $as_echo "$as_me: failed program was:" >&53.7100 sed 's/^/| /' conftest.$ac_ext >&53.7102 ac_header_preproc=no3.7103 fi3.7105 rm -f conftest.err conftest.$ac_ext3.7106 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.7107 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.7108 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.7109 +$as_echo "$ac_header_preproc" >&6; }3.7111 # So? What about this header?3.7112 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.7113 yes:no: )3.7114 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&53.7115 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}3.7116 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&53.7117 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}3.7118 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&53.7119 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}3.7120 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&53.7121 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}3.7122 ac_header_preproc=yes3.7123 ;;3.7124 no:yes:* )3.7125 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&53.7126 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}3.7127 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&53.7128 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}3.7129 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&53.7130 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}3.7131 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&53.7132 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}3.7133 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&53.7134 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}3.7135 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&53.7136 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}3.7137 -3.7138 - ;;3.7139 -esac3.7140 -{ echo "$as_me:$LINENO: checking for $ac_header" >&53.7141 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }3.7142 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&53.7143 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}3.7144 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&53.7145 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}3.7146 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&53.7147 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}3.7148 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&53.7149 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}3.7150 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&53.7151 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}3.7152 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&53.7153 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}3.7154 +3.7155 + ;;3.7156 +esac3.7157 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&53.7158 +$as_echo_n "checking for $ac_header... " >&6; }3.7159 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then3.7160 - echo $ECHO_N "(cached) $ECHO_C" >&63.7161 + $as_echo_n "(cached) " >&63.7162 else3.7163 eval "$as_ac_Header=\$ac_header_preproc"3.7164 fi3.7165 -ac_res=`eval echo '${'$as_ac_Header'}'`3.7166 - { echo "$as_me:$LINENO: result: $ac_res" >&53.7167 -echo "${ECHO_T}$ac_res" >&6; }3.7168 -3.7169 -fi3.7170 -if test `eval echo '${'$as_ac_Header'}'` = yes; then3.7171 +ac_res=`eval 'as_val=${'$as_ac_Header'}3.7172 + $as_echo "$as_val"'`3.7173 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&53.7174 +$as_echo "$ac_res" >&6; }3.7175 +3.7176 +fi3.7177 +if test `eval 'as_val=${'$as_ac_Header'}3.7178 + $as_echo "$as_val"'` = yes; then3.7179 cat >>confdefs.h <<_ACEOF3.7180 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 13.7181 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 13.7182 _ACEOF3.7184 fi3.7185 @@ -9189,10 +9465,10 @@3.7186 done3.7188 if test $ac_cv_header_locale_h = yes; then3.7189 - { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&53.7190 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }3.7191 + { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&53.7192 +$as_echo_n "checking for LC_MESSAGES... " >&6; }3.7193 if test "${am_cv_val_LC_MESSAGES+set}" = set; then3.7194 - echo $ECHO_N "(cached) $ECHO_C" >&63.7195 + $as_echo_n "(cached) " >&63.7196 else3.7197 cat >conftest.$ac_ext <<_ACEOF3.7198 /* confdefs.h. */3.7199 @@ -9215,31 +9491,35 @@3.7200 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7201 *) ac_try_echo=$ac_try;;3.7202 esac3.7203 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7204 - (eval "$ac_link") 2>conftest.er13.7205 - ac_status=$?3.7206 - grep -v '^ *+' conftest.er1 >conftest.err3.7207 - rm -f conftest.er13.7208 - cat conftest.err >&53.7209 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7210 - (exit $ac_status); } && {3.7211 - test -z "$ac_c_werror_flag" ||3.7212 - test ! -s conftest.err3.7213 - } && test -s conftest$ac_exeext &&3.7214 - $as_test_x conftest$ac_exeext; then3.7215 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7216 +$as_echo "$ac_try_echo") >&53.7217 + (eval "$ac_link") 2>conftest.er13.7218 + ac_status=$?3.7219 + grep -v '^ *+' conftest.er1 >conftest.err3.7220 + rm -f conftest.er13.7221 + cat conftest.err >&53.7222 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7223 + (exit $ac_status); } && {3.7224 + test -z "$ac_c_werror_flag" ||3.7225 + test ! -s conftest.err3.7226 + } && test -s conftest$ac_exeext && {3.7227 + test "$cross_compiling" = yes ||3.7228 + $as_test_x conftest$ac_exeext3.7229 + }; then3.7230 am_cv_val_LC_MESSAGES=yes3.7231 else3.7232 - echo "$as_me: failed program was:" >&53.7233 + $as_echo "$as_me: failed program was:" >&53.7234 sed 's/^/| /' conftest.$ac_ext >&53.7236 am_cv_val_LC_MESSAGES=no3.7237 fi3.7239 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7240 - conftest$ac_exeext conftest.$ac_ext3.7241 -fi3.7242 -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&53.7243 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }3.7244 +rm -rf conftest.dSYM3.7245 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7246 + conftest$ac_exeext conftest.$ac_ext3.7247 +fi3.7248 +{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&53.7249 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; }3.7250 if test $am_cv_val_LC_MESSAGES = yes; then3.7252 cat >>confdefs.h <<\_ACEOF3.7253 @@ -9258,17 +9538,17 @@3.7254 INTLLIBS=3.7256 if test "${ac_cv_header_libintl_h+set}" = set; then3.7257 - { echo "$as_me:$LINENO: checking for libintl.h" >&53.7258 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }3.7259 + { $as_echo "$as_me:$LINENO: checking for libintl.h" >&53.7260 +$as_echo_n "checking for libintl.h... " >&6; }3.7261 if test "${ac_cv_header_libintl_h+set}" = set; then3.7262 - echo $ECHO_N "(cached) $ECHO_C" >&63.7263 -fi3.7264 -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&53.7265 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }3.7266 + $as_echo_n "(cached) " >&63.7267 +fi3.7268 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&53.7269 +$as_echo "$ac_cv_header_libintl_h" >&6; }3.7270 else3.7271 # Is the header compilable?3.7272 -{ echo "$as_me:$LINENO: checking libintl.h usability" >&53.7273 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }3.7274 +{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&53.7275 +$as_echo_n "checking libintl.h usability... " >&6; }3.7276 cat >conftest.$ac_ext <<_ACEOF3.7277 /* confdefs.h. */3.7278 _ACEOF3.7279 @@ -9284,32 +9564,33 @@3.7280 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7281 *) ac_try_echo=$ac_try;;3.7282 esac3.7283 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7284 - (eval "$ac_compile") 2>conftest.er13.7285 - ac_status=$?3.7286 - grep -v '^ *+' conftest.er1 >conftest.err3.7287 - rm -f conftest.er13.7288 - cat conftest.err >&53.7289 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7290 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7291 +$as_echo "$ac_try_echo") >&53.7292 + (eval "$ac_compile") 2>conftest.er13.7293 + ac_status=$?3.7294 + grep -v '^ *+' conftest.er1 >conftest.err3.7295 + rm -f conftest.er13.7296 + cat conftest.err >&53.7297 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7298 (exit $ac_status); } && {3.7299 test -z "$ac_c_werror_flag" ||3.7300 test ! -s conftest.err3.7301 } && test -s conftest.$ac_objext; then3.7302 ac_header_compiler=yes3.7303 else3.7304 - echo "$as_me: failed program was:" >&53.7305 + $as_echo "$as_me: failed program was:" >&53.7306 sed 's/^/| /' conftest.$ac_ext >&53.7308 ac_header_compiler=no3.7309 fi3.7311 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext3.7312 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.7313 -echo "${ECHO_T}$ac_header_compiler" >&6; }3.7314 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&53.7315 +$as_echo "$ac_header_compiler" >&6; }3.7317 # Is the header present?3.7318 -{ echo "$as_me:$LINENO: checking libintl.h presence" >&53.7319 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }3.7320 +{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&53.7321 +$as_echo_n "checking libintl.h presence... " >&6; }3.7322 cat >conftest.$ac_ext <<_ACEOF3.7323 /* confdefs.h. */3.7324 _ACEOF3.7325 @@ -9323,63 +9604,64 @@3.7326 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7327 *) ac_try_echo=$ac_try;;3.7328 esac3.7329 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7330 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7331 +$as_echo "$ac_try_echo") >&53.7332 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er13.7333 ac_status=$?3.7334 grep -v '^ *+' conftest.er1 >conftest.err3.7335 rm -f conftest.er13.7336 cat conftest.err >&53.7337 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7338 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7339 (exit $ac_status); } >/dev/null && {3.7340 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||3.7341 test ! -s conftest.err3.7342 }; then3.7343 ac_header_preproc=yes3.7344 else3.7345 - echo "$as_me: failed program was:" >&53.7346 + $as_echo "$as_me: failed program was:" >&53.7347 sed 's/^/| /' conftest.$ac_ext >&53.7349 ac_header_preproc=no3.7350 fi3.7352 rm -f conftest.err conftest.$ac_ext3.7353 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.7354 -echo "${ECHO_T}$ac_header_preproc" >&6; }3.7355 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&53.7356 +$as_echo "$ac_header_preproc" >&6; }3.7358 # So? What about this header?3.7359 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in3.7360 yes:no: )3.7361 - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&53.7362 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.7363 - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&53.7364 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}3.7365 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&53.7366 +$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}3.7367 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&53.7368 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}3.7369 ac_header_preproc=yes3.7370 ;;3.7371 no:yes:* )3.7372 - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&53.7373 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}3.7374 - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&53.7375 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}3.7376 - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&53.7377 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}3.7378 - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&53.7379 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}3.7380 - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&53.7381 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}3.7382 - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&53.7383 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}3.7384 -3.7385 - ;;3.7386 -esac3.7387 -{ echo "$as_me:$LINENO: checking for libintl.h" >&53.7388 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }3.7389 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&53.7390 +$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}3.7391 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&53.7392 +$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}3.7393 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&53.7394 +$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}3.7395 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&53.7396 +$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}3.7397 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&53.7398 +$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}3.7399 + { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&53.7400 +$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}3.7401 +3.7402 + ;;3.7403 +esac3.7404 +{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&53.7405 +$as_echo_n "checking for libintl.h... " >&6; }3.7406 if test "${ac_cv_header_libintl_h+set}" = set; then3.7407 - echo $ECHO_N "(cached) $ECHO_C" >&63.7408 + $as_echo_n "(cached) " >&63.7409 else3.7410 ac_cv_header_libintl_h=$ac_header_preproc3.7411 fi3.7412 -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&53.7413 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }3.7414 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&53.7415 +$as_echo "$ac_cv_header_libintl_h" >&6; }3.7417 fi3.7418 if test $ac_cv_header_libintl_h = yes; then3.7419 @@ -9389,10 +9671,10 @@3.7420 #3.7421 # First check in libc3.7422 #3.7423 - { echo "$as_me:$LINENO: checking for ngettext in libc" >&53.7424 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }3.7425 + { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&53.7426 +$as_echo_n "checking for ngettext in libc... " >&6; }3.7427 if test "${gt_cv_func_ngettext_libc+set}" = set; then3.7428 - echo $ECHO_N "(cached) $ECHO_C" >&63.7429 + $as_echo_n "(cached) " >&63.7430 else3.7431 cat >conftest.$ac_ext <<_ACEOF3.7432 /* confdefs.h. */3.7433 @@ -9417,38 +9699,42 @@3.7434 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7435 *) ac_try_echo=$ac_try;;3.7436 esac3.7437 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7438 - (eval "$ac_link") 2>conftest.er13.7439 - ac_status=$?3.7440 - grep -v '^ *+' conftest.er1 >conftest.err3.7441 - rm -f conftest.er13.7442 - cat conftest.err >&53.7443 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7444 - (exit $ac_status); } && {3.7445 - test -z "$ac_c_werror_flag" ||3.7446 - test ! -s conftest.err3.7447 - } && test -s conftest$ac_exeext &&3.7448 - $as_test_x conftest$ac_exeext; then3.7449 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7450 +$as_echo "$ac_try_echo") >&53.7451 + (eval "$ac_link") 2>conftest.er13.7452 + ac_status=$?3.7453 + grep -v '^ *+' conftest.er1 >conftest.err3.7454 + rm -f conftest.er13.7455 + cat conftest.err >&53.7456 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7457 + (exit $ac_status); } && {3.7458 + test -z "$ac_c_werror_flag" ||3.7459 + test ! -s conftest.err3.7460 + } && test -s conftest$ac_exeext && {3.7461 + test "$cross_compiling" = yes ||3.7462 + $as_test_x conftest$ac_exeext3.7463 + }; then3.7464 gt_cv_func_ngettext_libc=yes3.7465 else3.7466 - echo "$as_me: failed program was:" >&53.7467 + $as_echo "$as_me: failed program was:" >&53.7468 sed 's/^/| /' conftest.$ac_ext >&53.7470 gt_cv_func_ngettext_libc=no3.7471 fi3.7473 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7474 - conftest$ac_exeext conftest.$ac_ext3.7475 -3.7476 -fi3.7477 -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&53.7478 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }3.7479 +rm -rf conftest.dSYM3.7480 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7481 + conftest$ac_exeext conftest.$ac_ext3.7482 +3.7483 +fi3.7484 +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&53.7485 +$as_echo "$gt_cv_func_ngettext_libc" >&6; }3.7487 if test "$gt_cv_func_ngettext_libc" = "yes" ; then3.7488 - { echo "$as_me:$LINENO: checking for dgettext in libc" >&53.7489 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }3.7490 + { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&53.7491 +$as_echo_n "checking for dgettext in libc... " >&6; }3.7492 if test "${gt_cv_func_dgettext_libc+set}" = set; then3.7493 - echo $ECHO_N "(cached) $ECHO_C" >&63.7494 + $as_echo_n "(cached) " >&63.7495 else3.7496 cat >conftest.$ac_ext <<_ACEOF3.7497 /* confdefs.h. */3.7498 @@ -9473,43 +9759,47 @@3.7499 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7500 *) ac_try_echo=$ac_try;;3.7501 esac3.7502 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7503 - (eval "$ac_link") 2>conftest.er13.7504 - ac_status=$?3.7505 - grep -v '^ *+' conftest.er1 >conftest.err3.7506 - rm -f conftest.er13.7507 - cat conftest.err >&53.7508 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7509 - (exit $ac_status); } && {3.7510 - test -z "$ac_c_werror_flag" ||3.7511 - test ! -s conftest.err3.7512 - } && test -s conftest$ac_exeext &&3.7513 - $as_test_x conftest$ac_exeext; then3.7514 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7515 +$as_echo "$ac_try_echo") >&53.7516 + (eval "$ac_link") 2>conftest.er13.7517 + ac_status=$?3.7518 + grep -v '^ *+' conftest.er1 >conftest.err3.7519 + rm -f conftest.er13.7520 + cat conftest.err >&53.7521 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7522 + (exit $ac_status); } && {3.7523 + test -z "$ac_c_werror_flag" ||3.7524 + test ! -s conftest.err3.7525 + } && test -s conftest$ac_exeext && {3.7526 + test "$cross_compiling" = yes ||3.7527 + $as_test_x conftest$ac_exeext3.7528 + }; then3.7529 gt_cv_func_dgettext_libc=yes3.7530 else3.7531 - echo "$as_me: failed program was:" >&53.7532 + $as_echo "$as_me: failed program was:" >&53.7533 sed 's/^/| /' conftest.$ac_ext >&53.7535 gt_cv_func_dgettext_libc=no3.7536 fi3.7538 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7539 - conftest$ac_exeext conftest.$ac_ext3.7540 -3.7541 -fi3.7542 -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&53.7543 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }3.7544 +rm -rf conftest.dSYM3.7545 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7546 + conftest$ac_exeext conftest.$ac_ext3.7547 +3.7548 +fi3.7549 +{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&53.7550 +$as_echo "$gt_cv_func_dgettext_libc" >&6; }3.7551 fi3.7553 if test "$gt_cv_func_ngettext_libc" = "yes" ; then3.7555 for ac_func in bind_textdomain_codeset3.7556 do3.7557 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`3.7558 -{ echo "$as_me:$LINENO: checking for $ac_func" >&53.7559 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }3.7560 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`3.7561 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&53.7562 +$as_echo_n "checking for $ac_func... " >&6; }3.7563 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then3.7564 - echo $ECHO_N "(cached) $ECHO_C" >&63.7565 + $as_echo_n "(cached) " >&63.7566 else3.7567 cat >conftest.$ac_ext <<_ACEOF3.7568 /* confdefs.h. */3.7569 @@ -9562,35 +9852,41 @@3.7570 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7571 *) ac_try_echo=$ac_try;;3.7572 esac3.7573 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7574 - (eval "$ac_link") 2>conftest.er13.7575 - ac_status=$?3.7576 - grep -v '^ *+' conftest.er1 >conftest.err3.7577 - rm -f conftest.er13.7578 - cat conftest.err >&53.7579 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7580 - (exit $ac_status); } && {3.7581 - test -z "$ac_c_werror_flag" ||3.7582 - test ! -s conftest.err3.7583 - } && test -s conftest$ac_exeext &&3.7584 - $as_test_x conftest$ac_exeext; then3.7585 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7586 +$as_echo "$ac_try_echo") >&53.7587 + (eval "$ac_link") 2>conftest.er13.7588 + ac_status=$?3.7589 + grep -v '^ *+' conftest.er1 >conftest.err3.7590 + rm -f conftest.er13.7591 + cat conftest.err >&53.7592 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7593 + (exit $ac_status); } && {3.7594 + test -z "$ac_c_werror_flag" ||3.7595 + test ! -s conftest.err3.7596 + } && test -s conftest$ac_exeext && {3.7597 + test "$cross_compiling" = yes ||3.7598 + $as_test_x conftest$ac_exeext3.7599 + }; then3.7600 eval "$as_ac_var=yes"3.7601 else3.7602 - echo "$as_me: failed program was:" >&53.7603 + $as_echo "$as_me: failed program was:" >&53.7604 sed 's/^/| /' conftest.$ac_ext >&53.7606 eval "$as_ac_var=no"3.7607 fi3.7609 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7610 - conftest$ac_exeext conftest.$ac_ext3.7611 -fi3.7612 -ac_res=`eval echo '${'$as_ac_var'}'`3.7613 - { echo "$as_me:$LINENO: result: $ac_res" >&53.7614 -echo "${ECHO_T}$ac_res" >&6; }3.7615 -if test `eval echo '${'$as_ac_var'}'` = yes; then3.7616 +rm -rf conftest.dSYM3.7617 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7618 + conftest$ac_exeext conftest.$ac_ext3.7619 +fi3.7620 +ac_res=`eval 'as_val=${'$as_ac_var'}3.7621 + $as_echo "$as_val"'`3.7622 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&53.7623 +$as_echo "$ac_res" >&6; }3.7624 +if test `eval 'as_val=${'$as_ac_var'}3.7625 + $as_echo "$as_val"'` = yes; then3.7626 cat >>confdefs.h <<_ACEOF3.7627 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 13.7628 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 13.7629 _ACEOF3.7631 fi3.7632 @@ -9605,10 +9901,10 @@3.7633 || test "$gt_cv_func_ngettext_libc" != "yes" \3.7634 || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then3.7636 - { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&53.7637 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }3.7638 + { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&53.7639 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }3.7640 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then3.7641 - echo $ECHO_N "(cached) $ECHO_C" >&63.7642 + $as_echo_n "(cached) " >&63.7643 else3.7644 ac_check_lib_save_LIBS=$LIBS3.7645 LIBS="-lintl $LIBS"3.7646 @@ -9640,37 +9936,41 @@3.7647 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7648 *) ac_try_echo=$ac_try;;3.7649 esac3.7650 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7651 - (eval "$ac_link") 2>conftest.er13.7652 - ac_status=$?3.7653 - grep -v '^ *+' conftest.er1 >conftest.err3.7654 - rm -f conftest.er13.7655 - cat conftest.err >&53.7656 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7657 - (exit $ac_status); } && {3.7658 - test -z "$ac_c_werror_flag" ||3.7659 - test ! -s conftest.err3.7660 - } && test -s conftest$ac_exeext &&3.7661 - $as_test_x conftest$ac_exeext; then3.7662 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7663 +$as_echo "$ac_try_echo") >&53.7664 + (eval "$ac_link") 2>conftest.er13.7665 + ac_status=$?3.7666 + grep -v '^ *+' conftest.er1 >conftest.err3.7667 + rm -f conftest.er13.7668 + cat conftest.err >&53.7669 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7670 + (exit $ac_status); } && {3.7671 + test -z "$ac_c_werror_flag" ||3.7672 + test ! -s conftest.err3.7673 + } && test -s conftest$ac_exeext && {3.7674 + test "$cross_compiling" = yes ||3.7675 + $as_test_x conftest$ac_exeext3.7676 + }; then3.7677 ac_cv_lib_intl_bindtextdomain=yes3.7678 else3.7679 - echo "$as_me: failed program was:" >&53.7680 + $as_echo "$as_me: failed program was:" >&53.7681 sed 's/^/| /' conftest.$ac_ext >&53.7683 ac_cv_lib_intl_bindtextdomain=no3.7684 fi3.7686 +rm -rf conftest.dSYM3.7687 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7688 conftest$ac_exeext conftest.$ac_ext3.7689 LIBS=$ac_check_lib_save_LIBS3.7690 fi3.7691 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&53.7692 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }3.7693 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&53.7694 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }3.7695 if test $ac_cv_lib_intl_bindtextdomain = yes; then3.7696 - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&53.7697 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }3.7698 + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&53.7699 +$as_echo_n "checking for ngettext in -lintl... " >&6; }3.7700 if test "${ac_cv_lib_intl_ngettext+set}" = set; then3.7701 - echo $ECHO_N "(cached) $ECHO_C" >&63.7702 + $as_echo_n "(cached) " >&63.7703 else3.7704 ac_check_lib_save_LIBS=$LIBS3.7705 LIBS="-lintl $LIBS"3.7706 @@ -9702,37 +10002,41 @@3.7707 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7708 *) ac_try_echo=$ac_try;;3.7709 esac3.7710 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7711 - (eval "$ac_link") 2>conftest.er13.7712 - ac_status=$?3.7713 - grep -v '^ *+' conftest.er1 >conftest.err3.7714 - rm -f conftest.er13.7715 - cat conftest.err >&53.7716 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7717 - (exit $ac_status); } && {3.7718 - test -z "$ac_c_werror_flag" ||3.7719 - test ! -s conftest.err3.7720 - } && test -s conftest$ac_exeext &&3.7721 - $as_test_x conftest$ac_exeext; then3.7722 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7723 +$as_echo "$ac_try_echo") >&53.7724 + (eval "$ac_link") 2>conftest.er13.7725 + ac_status=$?3.7726 + grep -v '^ *+' conftest.er1 >conftest.err3.7727 + rm -f conftest.er13.7728 + cat conftest.err >&53.7729 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7730 + (exit $ac_status); } && {3.7731 + test -z "$ac_c_werror_flag" ||3.7732 + test ! -s conftest.err3.7733 + } && test -s conftest$ac_exeext && {3.7734 + test "$cross_compiling" = yes ||3.7735 + $as_test_x conftest$ac_exeext3.7736 + }; then3.7737 ac_cv_lib_intl_ngettext=yes3.7738 else3.7739 - echo "$as_me: failed program was:" >&53.7740 + $as_echo "$as_me: failed program was:" >&53.7741 sed 's/^/| /' conftest.$ac_ext >&53.7743 ac_cv_lib_intl_ngettext=no3.7744 fi3.7746 +rm -rf conftest.dSYM3.7747 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7748 conftest$ac_exeext conftest.$ac_ext3.7749 LIBS=$ac_check_lib_save_LIBS3.7750 fi3.7751 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&53.7752 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }3.7753 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&53.7754 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; }3.7755 if test $ac_cv_lib_intl_ngettext = yes; then3.7756 - { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&53.7757 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }3.7758 + { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&53.7759 +$as_echo_n "checking for dgettext in -lintl... " >&6; }3.7760 if test "${ac_cv_lib_intl_dgettext+set}" = set; then3.7761 - echo $ECHO_N "(cached) $ECHO_C" >&63.7762 + $as_echo_n "(cached) " >&63.7763 else3.7764 ac_check_lib_save_LIBS=$LIBS3.7765 LIBS="-lintl $LIBS"3.7766 @@ -9764,32 +10068,36 @@3.7767 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7768 *) ac_try_echo=$ac_try;;3.7769 esac3.7770 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7771 - (eval "$ac_link") 2>conftest.er13.7772 - ac_status=$?3.7773 - grep -v '^ *+' conftest.er1 >conftest.err3.7774 - rm -f conftest.er13.7775 - cat conftest.err >&53.7776 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7777 - (exit $ac_status); } && {3.7778 - test -z "$ac_c_werror_flag" ||3.7779 - test ! -s conftest.err3.7780 - } && test -s conftest$ac_exeext &&3.7781 - $as_test_x conftest$ac_exeext; then3.7782 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7783 +$as_echo "$ac_try_echo") >&53.7784 + (eval "$ac_link") 2>conftest.er13.7785 + ac_status=$?3.7786 + grep -v '^ *+' conftest.er1 >conftest.err3.7787 + rm -f conftest.er13.7788 + cat conftest.err >&53.7789 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7790 + (exit $ac_status); } && {3.7791 + test -z "$ac_c_werror_flag" ||3.7792 + test ! -s conftest.err3.7793 + } && test -s conftest$ac_exeext && {3.7794 + test "$cross_compiling" = yes ||3.7795 + $as_test_x conftest$ac_exeext3.7796 + }; then3.7797 ac_cv_lib_intl_dgettext=yes3.7798 else3.7799 - echo "$as_me: failed program was:" >&53.7800 + $as_echo "$as_me: failed program was:" >&53.7801 sed 's/^/| /' conftest.$ac_ext >&53.7803 ac_cv_lib_intl_dgettext=no3.7804 fi3.7806 +rm -rf conftest.dSYM3.7807 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7808 conftest$ac_exeext conftest.$ac_ext3.7809 LIBS=$ac_check_lib_save_LIBS3.7810 fi3.7811 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&53.7812 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }3.7813 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&53.7814 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; }3.7815 if test $ac_cv_lib_intl_dgettext = yes; then3.7816 gt_cv_func_dgettext_libintl=yes3.7817 fi3.7818 @@ -9800,14 +10108,14 @@3.7821 if test "$gt_cv_func_dgettext_libintl" != "yes" ; then3.7822 - { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&53.7823 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }3.7824 - { echo "$as_me:$LINENO: result: " >&53.7825 -echo "${ECHO_T}" >&6; }3.7826 - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&53.7827 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }3.7828 + { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&53.7829 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }3.7830 + { $as_echo "$as_me:$LINENO: result: " >&53.7831 +$as_echo "" >&6; }3.7832 + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&53.7833 +$as_echo_n "checking for ngettext in -lintl... " >&6; }3.7834 if test "${ac_cv_lib_intl_ngettext+set}" = set; then3.7835 - echo $ECHO_N "(cached) $ECHO_C" >&63.7836 + $as_echo_n "(cached) " >&63.7837 else3.7838 ac_check_lib_save_LIBS=$LIBS3.7839 LIBS="-lintl -liconv $LIBS"3.7840 @@ -9839,37 +10147,41 @@3.7841 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7842 *) ac_try_echo=$ac_try;;3.7843 esac3.7844 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7845 - (eval "$ac_link") 2>conftest.er13.7846 - ac_status=$?3.7847 - grep -v '^ *+' conftest.er1 >conftest.err3.7848 - rm -f conftest.er13.7849 - cat conftest.err >&53.7850 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7851 - (exit $ac_status); } && {3.7852 - test -z "$ac_c_werror_flag" ||3.7853 - test ! -s conftest.err3.7854 - } && test -s conftest$ac_exeext &&3.7855 - $as_test_x conftest$ac_exeext; then3.7856 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7857 +$as_echo "$ac_try_echo") >&53.7858 + (eval "$ac_link") 2>conftest.er13.7859 + ac_status=$?3.7860 + grep -v '^ *+' conftest.er1 >conftest.err3.7861 + rm -f conftest.er13.7862 + cat conftest.err >&53.7863 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7864 + (exit $ac_status); } && {3.7865 + test -z "$ac_c_werror_flag" ||3.7866 + test ! -s conftest.err3.7867 + } && test -s conftest$ac_exeext && {3.7868 + test "$cross_compiling" = yes ||3.7869 + $as_test_x conftest$ac_exeext3.7870 + }; then3.7871 ac_cv_lib_intl_ngettext=yes3.7872 else3.7873 - echo "$as_me: failed program was:" >&53.7874 + $as_echo "$as_me: failed program was:" >&53.7875 sed 's/^/| /' conftest.$ac_ext >&53.7877 ac_cv_lib_intl_ngettext=no3.7878 fi3.7880 +rm -rf conftest.dSYM3.7881 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7882 conftest$ac_exeext conftest.$ac_ext3.7883 LIBS=$ac_check_lib_save_LIBS3.7884 fi3.7885 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&53.7886 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }3.7887 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&53.7888 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; }3.7889 if test $ac_cv_lib_intl_ngettext = yes; then3.7890 - { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&53.7891 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }3.7892 + { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&53.7893 +$as_echo_n "checking for dcgettext in -lintl... " >&6; }3.7894 if test "${ac_cv_lib_intl_dcgettext+set}" = set; then3.7895 - echo $ECHO_N "(cached) $ECHO_C" >&63.7896 + $as_echo_n "(cached) " >&63.7897 else3.7898 ac_check_lib_save_LIBS=$LIBS3.7899 LIBS="-lintl -liconv $LIBS"3.7900 @@ -9901,32 +10213,36 @@3.7901 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7902 *) ac_try_echo=$ac_try;;3.7903 esac3.7904 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7905 - (eval "$ac_link") 2>conftest.er13.7906 - ac_status=$?3.7907 - grep -v '^ *+' conftest.er1 >conftest.err3.7908 - rm -f conftest.er13.7909 - cat conftest.err >&53.7910 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7911 - (exit $ac_status); } && {3.7912 - test -z "$ac_c_werror_flag" ||3.7913 - test ! -s conftest.err3.7914 - } && test -s conftest$ac_exeext &&3.7915 - $as_test_x conftest$ac_exeext; then3.7916 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7917 +$as_echo "$ac_try_echo") >&53.7918 + (eval "$ac_link") 2>conftest.er13.7919 + ac_status=$?3.7920 + grep -v '^ *+' conftest.er1 >conftest.err3.7921 + rm -f conftest.er13.7922 + cat conftest.err >&53.7923 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7924 + (exit $ac_status); } && {3.7925 + test -z "$ac_c_werror_flag" ||3.7926 + test ! -s conftest.err3.7927 + } && test -s conftest$ac_exeext && {3.7928 + test "$cross_compiling" = yes ||3.7929 + $as_test_x conftest$ac_exeext3.7930 + }; then3.7931 ac_cv_lib_intl_dcgettext=yes3.7932 else3.7933 - echo "$as_me: failed program was:" >&53.7934 + $as_echo "$as_me: failed program was:" >&53.7935 sed 's/^/| /' conftest.$ac_ext >&53.7937 ac_cv_lib_intl_dcgettext=no3.7938 fi3.7940 +rm -rf conftest.dSYM3.7941 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.7942 conftest$ac_exeext conftest.$ac_ext3.7943 LIBS=$ac_check_lib_save_LIBS3.7944 fi3.7945 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&53.7946 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }3.7947 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&53.7948 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }3.7949 if test $ac_cv_lib_intl_dcgettext = yes; then3.7950 gt_cv_func_dgettext_libintl=yes3.7951 libintl_extra_libs=-liconv3.7952 @@ -9952,11 +10268,11 @@3.7954 for ac_func in bind_textdomain_codeset3.7955 do3.7956 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`3.7957 -{ echo "$as_me:$LINENO: checking for $ac_func" >&53.7958 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }3.7959 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`3.7960 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&53.7961 +$as_echo_n "checking for $ac_func... " >&6; }3.7962 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then3.7963 - echo $ECHO_N "(cached) $ECHO_C" >&63.7964 + $as_echo_n "(cached) " >&63.7965 else3.7966 cat >conftest.$ac_ext <<_ACEOF3.7967 /* confdefs.h. */3.7968 @@ -10009,35 +10325,41 @@3.7969 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.7970 *) ac_try_echo=$ac_try;;3.7971 esac3.7972 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.7973 - (eval "$ac_link") 2>conftest.er13.7974 - ac_status=$?3.7975 - grep -v '^ *+' conftest.er1 >conftest.err3.7976 - rm -f conftest.er13.7977 - cat conftest.err >&53.7978 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.7979 - (exit $ac_status); } && {3.7980 - test -z "$ac_c_werror_flag" ||3.7981 - test ! -s conftest.err3.7982 - } && test -s conftest$ac_exeext &&3.7983 - $as_test_x conftest$ac_exeext; then3.7984 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.7985 +$as_echo "$ac_try_echo") >&53.7986 + (eval "$ac_link") 2>conftest.er13.7987 + ac_status=$?3.7988 + grep -v '^ *+' conftest.er1 >conftest.err3.7989 + rm -f conftest.er13.7990 + cat conftest.err >&53.7991 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.7992 + (exit $ac_status); } && {3.7993 + test -z "$ac_c_werror_flag" ||3.7994 + test ! -s conftest.err3.7995 + } && test -s conftest$ac_exeext && {3.7996 + test "$cross_compiling" = yes ||3.7997 + $as_test_x conftest$ac_exeext3.7998 + }; then3.7999 eval "$as_ac_var=yes"3.8000 else3.8001 - echo "$as_me: failed program was:" >&53.8002 + $as_echo "$as_me: failed program was:" >&53.8003 sed 's/^/| /' conftest.$ac_ext >&53.8005 eval "$as_ac_var=no"3.8006 fi3.8008 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8009 - conftest$ac_exeext conftest.$ac_ext3.8010 -fi3.8011 -ac_res=`eval echo '${'$as_ac_var'}'`3.8012 - { echo "$as_me:$LINENO: result: $ac_res" >&53.8013 -echo "${ECHO_T}$ac_res" >&6; }3.8014 -if test `eval echo '${'$as_ac_var'}'` = yes; then3.8015 +rm -rf conftest.dSYM3.8016 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8017 + conftest$ac_exeext conftest.$ac_ext3.8018 +fi3.8019 +ac_res=`eval 'as_val=${'$as_ac_var'}3.8020 + $as_echo "$as_val"'`3.8021 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&53.8022 +$as_echo "$ac_res" >&6; }3.8023 +if test `eval 'as_val=${'$as_ac_var'}3.8024 + $as_echo "$as_val"'` = yes; then3.8025 cat >>confdefs.h <<_ACEOF3.8026 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 13.8027 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 13.8028 _ACEOF3.8030 fi3.8031 @@ -10073,10 +10395,10 @@3.8033 # Extract the first word of "msgfmt", so it can be a program name with args.3.8034 set dummy msgfmt; ac_word=$23.8035 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.8036 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.8037 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.8038 +$as_echo_n "checking for $ac_word... " >&6; }3.8039 if test "${ac_cv_path_MSGFMT+set}" = set; then3.8040 - echo $ECHO_N "(cached) $ECHO_C" >&63.8041 + $as_echo_n "(cached) " >&63.8042 else3.8043 case "$MSGFMT" in3.8044 /*)3.8045 @@ -10100,11 +10422,11 @@3.8046 fi3.8047 MSGFMT="$ac_cv_path_MSGFMT"3.8048 if test "$MSGFMT" != "no"; then3.8049 - { echo "$as_me:$LINENO: result: $MSGFMT" >&53.8050 -echo "${ECHO_T}$MSGFMT" >&6; }3.8051 -else3.8052 - { echo "$as_me:$LINENO: result: no" >&53.8053 -echo "${ECHO_T}no" >&6; }3.8054 + { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&53.8055 +$as_echo "$MSGFMT" >&6; }3.8056 +else3.8057 + { $as_echo "$as_me:$LINENO: result: no" >&53.8058 +$as_echo "no" >&6; }3.8059 fi3.8060 if test "$MSGFMT" != "no"; then3.8061 glib_save_LIBS="$LIBS"3.8062 @@ -10112,11 +10434,11 @@3.8064 for ac_func in dcgettext3.8065 do3.8066 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`3.8067 -{ echo "$as_me:$LINENO: checking for $ac_func" >&53.8068 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }3.8069 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`3.8070 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&53.8071 +$as_echo_n "checking for $ac_func... " >&6; }3.8072 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then3.8073 - echo $ECHO_N "(cached) $ECHO_C" >&63.8074 + $as_echo_n "(cached) " >&63.8075 else3.8076 cat >conftest.$ac_ext <<_ACEOF3.8077 /* confdefs.h. */3.8078 @@ -10169,43 +10491,49 @@3.8079 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.8080 *) ac_try_echo=$ac_try;;3.8081 esac3.8082 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.8083 - (eval "$ac_link") 2>conftest.er13.8084 - ac_status=$?3.8085 - grep -v '^ *+' conftest.er1 >conftest.err3.8086 - rm -f conftest.er13.8087 - cat conftest.err >&53.8088 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.8089 - (exit $ac_status); } && {3.8090 - test -z "$ac_c_werror_flag" ||3.8091 - test ! -s conftest.err3.8092 - } && test -s conftest$ac_exeext &&3.8093 - $as_test_x conftest$ac_exeext; then3.8094 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.8095 +$as_echo "$ac_try_echo") >&53.8096 + (eval "$ac_link") 2>conftest.er13.8097 + ac_status=$?3.8098 + grep -v '^ *+' conftest.er1 >conftest.err3.8099 + rm -f conftest.er13.8100 + cat conftest.err >&53.8101 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.8102 + (exit $ac_status); } && {3.8103 + test -z "$ac_c_werror_flag" ||3.8104 + test ! -s conftest.err3.8105 + } && test -s conftest$ac_exeext && {3.8106 + test "$cross_compiling" = yes ||3.8107 + $as_test_x conftest$ac_exeext3.8108 + }; then3.8109 eval "$as_ac_var=yes"3.8110 else3.8111 - echo "$as_me: failed program was:" >&53.8112 + $as_echo "$as_me: failed program was:" >&53.8113 sed 's/^/| /' conftest.$ac_ext >&53.8115 eval "$as_ac_var=no"3.8116 fi3.8118 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8119 - conftest$ac_exeext conftest.$ac_ext3.8120 -fi3.8121 -ac_res=`eval echo '${'$as_ac_var'}'`3.8122 - { echo "$as_me:$LINENO: result: $ac_res" >&53.8123 -echo "${ECHO_T}$ac_res" >&6; }3.8124 -if test `eval echo '${'$as_ac_var'}'` = yes; then3.8125 +rm -rf conftest.dSYM3.8126 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8127 + conftest$ac_exeext conftest.$ac_ext3.8128 +fi3.8129 +ac_res=`eval 'as_val=${'$as_ac_var'}3.8130 + $as_echo "$as_val"'`3.8131 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&53.8132 +$as_echo "$ac_res" >&6; }3.8133 +if test `eval 'as_val=${'$as_ac_var'}3.8134 + $as_echo "$as_val"'` = yes; then3.8135 cat >>confdefs.h <<_ACEOF3.8136 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 13.8137 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 13.8138 _ACEOF3.8140 fi3.8141 done3.8143 MSGFMT_OPTS=3.8144 - { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&53.8145 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }3.8146 + { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&53.8147 +$as_echo_n "checking if msgfmt accepts -c... " >&6; }3.8148 cat >conftest.foo <<_ACEOF3.8150 msgid ""3.8151 @@ -10219,25 +10547,25 @@3.8152 "Content-Transfer-Encoding: 8bit\n"3.8154 _ACEOF3.8155 -if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&53.8156 +if { ($as_echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&53.8157 (msgfmt -c -o /dev/null conftest.foo) 2>&53.8158 ac_status=$?3.8159 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.8160 - (exit $ac_status); }; then3.8161 - MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&53.8162 -echo "${ECHO_T}yes" >&6; }3.8163 -else { echo "$as_me:$LINENO: result: no" >&53.8164 -echo "${ECHO_T}no" >&6; }3.8165 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.8166 + (exit $ac_status); }; then3.8167 + MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&53.8168 +$as_echo "yes" >&6; }3.8169 +else { $as_echo "$as_me:$LINENO: result: no" >&53.8170 +$as_echo "no" >&6; }3.8171 echo "$as_me: failed input was:" >&53.8172 sed 's/^/| /' conftest.foo >&53.8173 fi3.8175 # Extract the first word of "gmsgfmt", so it can be a program name with args.3.8176 set dummy gmsgfmt; ac_word=$23.8177 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.8178 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.8179 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.8180 +$as_echo_n "checking for $ac_word... " >&6; }3.8181 if test "${ac_cv_path_GMSGFMT+set}" = set; then3.8182 - echo $ECHO_N "(cached) $ECHO_C" >&63.8183 + $as_echo_n "(cached) " >&63.8184 else3.8185 case $GMSGFMT in3.8186 [\\/]* | ?:[\\/]*)3.8187 @@ -10252,7 +10580,7 @@3.8188 for ac_exec_ext in '' $ac_executable_extensions; do3.8189 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then3.8190 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"3.8191 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.8192 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&53.8193 break 23.8194 fi3.8195 done3.8196 @@ -10265,20 +10593,20 @@3.8197 fi3.8198 GMSGFMT=$ac_cv_path_GMSGFMT3.8199 if test -n "$GMSGFMT"; then3.8200 - { echo "$as_me:$LINENO: result: $GMSGFMT" >&53.8201 -echo "${ECHO_T}$GMSGFMT" >&6; }3.8202 -else3.8203 - { echo "$as_me:$LINENO: result: no" >&53.8204 -echo "${ECHO_T}no" >&6; }3.8205 + { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&53.8206 +$as_echo "$GMSGFMT" >&6; }3.8207 +else3.8208 + { $as_echo "$as_me:$LINENO: result: no" >&53.8209 +$as_echo "no" >&6; }3.8210 fi3.8213 # Extract the first word of "xgettext", so it can be a program name with args.3.8214 set dummy xgettext; ac_word=$23.8215 -{ echo "$as_me:$LINENO: checking for $ac_word" >&53.8216 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }3.8217 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&53.8218 +$as_echo_n "checking for $ac_word... " >&6; }3.8219 if test "${ac_cv_path_XGETTEXT+set}" = set; then3.8220 - echo $ECHO_N "(cached) $ECHO_C" >&63.8221 + $as_echo_n "(cached) " >&63.8222 else3.8223 case "$XGETTEXT" in3.8224 /*)3.8225 @@ -10302,11 +10630,11 @@3.8226 fi3.8227 XGETTEXT="$ac_cv_path_XGETTEXT"3.8228 if test "$XGETTEXT" != ":"; then3.8229 - { echo "$as_me:$LINENO: result: $XGETTEXT" >&53.8230 -echo "${ECHO_T}$XGETTEXT" >&6; }3.8231 -else3.8232 - { echo "$as_me:$LINENO: result: no" >&53.8233 -echo "${ECHO_T}no" >&6; }3.8234 + { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&53.8235 +$as_echo "$XGETTEXT" >&6; }3.8236 +else3.8237 + { $as_echo "$as_me:$LINENO: result: no" >&53.8238 +$as_echo "no" >&6; }3.8239 fi3.8241 cat >conftest.$ac_ext <<_ACEOF3.8242 @@ -10331,30 +10659,33 @@3.8243 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.8244 *) ac_try_echo=$ac_try;;3.8245 esac3.8246 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.8247 - (eval "$ac_link") 2>conftest.er13.8248 - ac_status=$?3.8249 - grep -v '^ *+' conftest.er1 >conftest.err3.8250 - rm -f conftest.er13.8251 - cat conftest.err >&53.8252 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.8253 - (exit $ac_status); } && {3.8254 - test -z "$ac_c_werror_flag" ||3.8255 - test ! -s conftest.err3.8256 - } && test -s conftest$ac_exeext &&3.8257 - $as_test_x conftest$ac_exeext; then3.8258 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.8259 +$as_echo "$ac_try_echo") >&53.8260 + (eval "$ac_link") 2>conftest.er13.8261 + ac_status=$?3.8262 + grep -v '^ *+' conftest.er1 >conftest.err3.8263 + rm -f conftest.er13.8264 + cat conftest.err >&53.8265 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.8266 + (exit $ac_status); } && {3.8267 + test -z "$ac_c_werror_flag" ||3.8268 + test ! -s conftest.err3.8269 + } && test -s conftest$ac_exeext && {3.8270 + test "$cross_compiling" = yes ||3.8271 + $as_test_x conftest$ac_exeext3.8272 + }; then3.8273 CATOBJEXT=.gmo3.8274 DATADIRNAME=share3.8275 else3.8276 - echo "$as_me: failed program was:" >&53.8277 + $as_echo "$as_me: failed program was:" >&53.8278 sed 's/^/| /' conftest.$ac_ext >&53.8280 case $host in3.8281 *-*-solaris*)3.8282 - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&53.8283 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }3.8284 + { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&53.8285 +$as_echo_n "checking for bind_textdomain_codeset... " >&6; }3.8286 if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then3.8287 - echo $ECHO_N "(cached) $ECHO_C" >&63.8288 + $as_echo_n "(cached) " >&63.8289 else3.8290 cat >conftest.$ac_ext <<_ACEOF3.8291 /* confdefs.h. */3.8292 @@ -10407,31 +10738,35 @@3.8293 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3.8294 *) ac_try_echo=$ac_try;;3.8295 esac3.8296 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&53.8297 - (eval "$ac_link") 2>conftest.er13.8298 - ac_status=$?3.8299 - grep -v '^ *+' conftest.er1 >conftest.err3.8300 - rm -f conftest.er13.8301 - cat conftest.err >&53.8302 - echo "$as_me:$LINENO: \$? = $ac_status" >&53.8303 - (exit $ac_status); } && {3.8304 - test -z "$ac_c_werror_flag" ||3.8305 - test ! -s conftest.err3.8306 - } && test -s conftest$ac_exeext &&3.8307 - $as_test_x conftest$ac_exeext; then3.8308 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""3.8309 +$as_echo "$ac_try_echo") >&53.8310 + (eval "$ac_link") 2>conftest.er13.8311 + ac_status=$?3.8312 + grep -v '^ *+' conftest.er1 >conftest.err3.8313 + rm -f conftest.er13.8314 + cat conftest.err >&53.8315 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&53.8316 + (exit $ac_status); } && {3.8317 + test -z "$ac_c_werror_flag" ||3.8318 + test ! -s conftest.err3.8319 + } && test -s conftest$ac_exeext && {3.8320 + test "$cross_compiling" = yes ||3.8321 + $as_test_x conftest$ac_exeext3.8322 + }; then3.8323 ac_cv_func_bind_textdomain_codeset=yes3.8324 else3.8325 - echo "$as_me: failed program was:" >&53.8326 + $as_echo "$as_me: failed program was:" >&53.8327 sed 's/^/| /' conftest.$ac_ext >&53.8329 ac_cv_func_bind_textdomain_codeset=no3.8330 fi3.8332 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8333 - conftest$ac_exeext conftest.$ac_ext3.8334 -fi3.8335 -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&53.8336 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }3.8337 +rm -rf conftest.dSYM3.8338 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8339 + conftest$ac_exeext conftest.$ac_ext3.8340 +fi3.8341 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&53.8342 +$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }3.8343 if test $ac_cv_func_bind_textdomain_codeset = yes; then3.8344 CATOBJEXT=.gmo3.8345 DATADIRNAME=share3.8346 @@ -10448,6 +10783,7 @@3.8347 esac3.8348 fi3.8350 +rm -rf conftest.dSYM3.8351 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \3.8352 conftest$ac_exeext conftest.$ac_ext3.8353 LIBS="$glib_save_LIBS"3.8354 @@ -10473,8 +10809,8 @@3.8355 if $XGETTEXT --omit-header /dev/null 2> /dev/null; then3.8356 : ;3.8357 else3.8358 - { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&53.8359 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }3.8360 + { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&53.8361 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }3.8362 XGETTEXT=":"3.8363 fi3.8364 fi3.8365 @@ -10506,8 +10842,8 @@3.8366 if test "x$ALL_LINGUAS" = "x"; then3.8367 LINGUAS=3.8368 else3.8369 - { echo "$as_me:$LINENO: checking for catalogs to be installed" >&53.8370 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }3.8371 + { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&53.8372 +$as_echo_n "checking for catalogs to be installed... " >&6; }3.8373 NEW_LINGUAS=3.8374 for presentlang in $ALL_LINGUAS; do3.8375 useit=no3.8376 @@ -10531,8 +10867,8 @@3.8377 fi3.8378 done3.8379 LINGUAS=$NEW_LINGUAS3.8380 - { echo "$as_me:$LINENO: result: $LINGUAS" >&53.8381 -echo "${ECHO_T}$LINGUAS" >&6; }3.8382 + { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&53.8383 +$as_echo "$LINGUAS" >&6; }3.8384 fi3.8386 if test -n "$LINGUAS"; then3.8387 @@ -10593,11 +10929,12 @@3.8388 case $ac_val in #(3.8389 *${as_nl}*)3.8390 case $ac_var in #(3.8391 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&53.8392 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;3.8393 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&53.8394 +$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;3.8395 esac3.8396 case $ac_var in #(3.8397 _ | IFS | as_nl) ;; #(3.8398 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(3.8399 *) $as_unset $ac_var ;;3.8400 esac ;;3.8401 esac3.8402 @@ -10630,12 +10967,12 @@3.8403 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else3.8404 if test -w "$cache_file"; then3.8405 test "x$cache_file" != "x/dev/null" &&3.8406 - { echo "$as_me:$LINENO: updating cache $cache_file" >&53.8407 -echo "$as_me: updating cache $cache_file" >&6;}3.8408 + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&53.8409 +$as_echo "$as_me: updating cache $cache_file" >&6;}3.8410 cat confcache >$cache_file3.8411 else3.8412 - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&53.8413 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}3.8414 + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&53.8415 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}3.8416 fi3.8417 fi3.8418 rm -f confcache3.8419 @@ -10651,7 +10988,7 @@3.8420 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue3.8421 # 1. Remove the extension, and $U if already installed.3.8422 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'3.8423 - ac_i=`echo "$ac_i" | sed "$ac_script"`3.8424 + ac_i=`$as_echo "$ac_i" | sed "$ac_script"`3.8425 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR3.8426 # will be set to the directory where LIBOBJS objects are built.3.8427 ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"3.8428 @@ -10663,145 +11000,146 @@3.8431 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then3.8432 - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.3.8433 -Usually this means the macro was only invoked conditionally." >&53.8434 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.3.8435 + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.3.8436 +Usually this means the macro was only invoked conditionally." >&53.8437 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.3.8438 Usually this means the macro was only invoked conditionally." >&2;}3.8439 { (exit 1); exit 1; }; }3.8440 fi3.8441 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then3.8442 - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.3.8443 -Usually this means the macro was only invoked conditionally." >&53.8444 -echo "$as_me: error: conditional \"AMDEP\" was never defined.3.8445 + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.3.8446 +Usually this means the macro was only invoked conditionally." >&53.8447 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.3.8448 Usually this means the macro was only invoked conditionally." >&2;}3.8449 { (exit 1); exit 1; }; }3.8450 fi3.8451 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then3.8452 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.3.8453 -Usually this means the macro was only invoked conditionally." >&53.8454 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.3.8455 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.3.8456 +Usually this means the macro was only invoked conditionally." >&53.8457 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.3.8458 Usually this means the macro was only invoked conditionally." >&2;}3.8459 { (exit 1); exit 1; }; }3.8460 fi3.8461 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then3.8462 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.3.8463 -Usually this means the macro was only invoked conditionally." >&53.8464 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.3.8465 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.3.8466 +Usually this means the macro was only invoked conditionally." >&53.8467 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.3.8468 Usually this means the macro was only invoked conditionally." >&2;}3.8469 { (exit 1); exit 1; }; }3.8470 fi3.8471 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then3.8472 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.3.8473 -Usually this means the macro was only invoked conditionally." >&53.8474 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.3.8475 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.3.8476 +Usually this means the macro was only invoked conditionally." >&53.8477 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.3.8478 Usually this means the macro was only invoked conditionally." >&2;}3.8479 { (exit 1); exit 1; }; }3.8480 fi3.8481 if test -z "${GUI_COCOA_TRUE}" && test -z "${GUI_COCOA_FALSE}"; then3.8482 - { { echo "$as_me:$LINENO: error: conditional \"GUI_COCOA\" was never defined.3.8483 -Usually this means the macro was only invoked conditionally." >&53.8484 -echo "$as_me: error: conditional \"GUI_COCOA\" was never defined.3.8485 + { { $as_echo "$as_me:$LINENO: error: conditional \"GUI_COCOA\" was never defined.3.8486 +Usually this means the macro was only invoked conditionally." >&53.8487 +$as_echo "$as_me: error: conditional \"GUI_COCOA\" was never defined.3.8488 Usually this means the macro was only invoked conditionally." >&2;}3.8489 { (exit 1); exit 1; }; }3.8490 fi3.8491 if test -z "${GUI_GTK_TRUE}" && test -z "${GUI_GTK_FALSE}"; then3.8492 - { { echo "$as_me:$LINENO: error: conditional \"GUI_GTK\" was never defined.3.8493 -Usually this means the macro was only invoked conditionally." >&53.8494 -echo "$as_me: error: conditional \"GUI_GTK\" was never defined.3.8495 + { { $as_echo "$as_me:$LINENO: error: conditional \"GUI_GTK\" was never defined.3.8496 +Usually this means the macro was only invoked conditionally." >&53.8497 +$as_echo "$as_me: error: conditional \"GUI_GTK\" was never defined.3.8498 Usually this means the macro was only invoked conditionally." >&2;}3.8499 { (exit 1); exit 1; }; }3.8500 fi3.8501 if test -z "${VIDEO_OSMESA_TRUE}" && test -z "${VIDEO_OSMESA_FALSE}"; then3.8502 - { { echo "$as_me:$LINENO: error: conditional \"VIDEO_OSMESA\" was never defined.3.8503 -Usually this means the macro was only invoked conditionally." >&53.8504 -echo "$as_me: error: conditional \"VIDEO_OSMESA\" was never defined.3.8505 + { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_OSMESA\" was never defined.3.8506 +Usually this means the macro was only invoked conditionally." >&53.8507 +$as_echo "$as_me: error: conditional \"VIDEO_OSMESA\" was never defined.3.8508 Usually this means the macro was only invoked conditionally." >&2;}3.8509 { (exit 1); exit 1; }; }3.8510 fi3.8511 if test -z "${VIDEO_GLX_TRUE}" && test -z "${VIDEO_GLX_FALSE}"; then3.8512 - { { echo "$as_me:$LINENO: error: conditional \"VIDEO_GLX\" was never defined.3.8513 -Usually this means the macro was only invoked conditionally." >&53.8514 -echo "$as_me: error: conditional \"VIDEO_GLX\" was never defined.3.8515 + { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_GLX\" was never defined.3.8516 +Usually this means the macro was only invoked conditionally." >&53.8517 +$as_echo "$as_me: error: conditional \"VIDEO_GLX\" was never defined.3.8518 Usually this means the macro was only invoked conditionally." >&2;}3.8519 { (exit 1); exit 1; }; }3.8520 fi3.8521 if test -z "${VIDEO_NSGL_TRUE}" && test -z "${VIDEO_NSGL_FALSE}"; then3.8522 - { { echo "$as_me:$LINENO: error: conditional \"VIDEO_NSGL\" was never defined.3.8523 -Usually this means the macro was only invoked conditionally." >&53.8524 -echo "$as_me: error: conditional \"VIDEO_NSGL\" was never defined.3.8525 + { { $as_echo "$as_me:$LINENO: error: conditional \"VIDEO_NSGL\" was never defined.3.8526 +Usually this means the macro was only invoked conditionally." >&53.8527 +$as_echo "$as_me: error: conditional \"VIDEO_NSGL\" was never defined.3.8528 Usually this means the macro was only invoked conditionally." >&2;}3.8529 { (exit 1); exit 1; }; }3.8530 fi3.8531 if test -z "${BUILD_SH4X86_TRUE}" && test -z "${BUILD_SH4X86_FALSE}"; then3.8532 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_SH4X86\" was never defined.3.8533 -Usually this means the macro was only invoked conditionally." >&53.8534 -echo "$as_me: error: conditional \"BUILD_SH4X86\" was never defined.3.8535 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SH4X86\" was never defined.3.8536 +Usually this means the macro was only invoked conditionally." >&53.8537 +$as_echo "$as_me: error: conditional \"BUILD_SH4X86\" was never defined.3.8538 Usually this means the macro was only invoked conditionally." >&2;}3.8539 { (exit 1); exit 1; }; }3.8540 fi3.8541 if test -z "${BUILD_X86_64_TRUE}" && test -z "${BUILD_X86_64_FALSE}"; then3.8542 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_X86_64\" was never defined.3.8543 -Usually this means the macro was only invoked conditionally." >&53.8544 -echo "$as_me: error: conditional \"BUILD_X86_64\" was never defined.3.8545 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_X86_64\" was never defined.3.8546 +Usually this means the macro was only invoked conditionally." >&53.8547 +$as_echo "$as_me: error: conditional \"BUILD_X86_64\" was never defined.3.8548 Usually this means the macro was only invoked conditionally." >&2;}3.8549 { (exit 1); exit 1; }; }3.8550 fi3.8551 if test -z "${AUDIO_PULSE_TRUE}" && test -z "${AUDIO_PULSE_FALSE}"; then3.8552 - { { echo "$as_me:$LINENO: error: conditional \"AUDIO_PULSE\" was never defined.3.8553 -Usually this means the macro was only invoked conditionally." >&53.8554 -echo "$as_me: error: conditional \"AUDIO_PULSE\" was never defined.3.8555 + { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_PULSE\" was never defined.3.8556 +Usually this means the macro was only invoked conditionally." >&53.8557 +$as_echo "$as_me: error: conditional \"AUDIO_PULSE\" was never defined.3.8558 Usually this means the macro was only invoked conditionally." >&2;}3.8559 { (exit 1); exit 1; }; }3.8560 fi3.8561 if test -z "${AUDIO_ESOUND_TRUE}" && test -z "${AUDIO_ESOUND_FALSE}"; then3.8562 - { { echo "$as_me:$LINENO: error: conditional \"AUDIO_ESOUND\" was never defined.3.8563 -Usually this means the macro was only invoked conditionally." >&53.8564 -echo "$as_me: error: conditional \"AUDIO_ESOUND\" was never defined.3.8565 + { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_ESOUND\" was never defined.3.8566 +Usually this means the macro was only invoked conditionally." >&53.8567 +$as_echo "$as_me: error: conditional \"AUDIO_ESOUND\" was never defined.3.8568 Usually this means the macro was only invoked conditionally." >&2;}3.8569 { (exit 1); exit 1; }; }3.8570 fi3.8571 if test -z "${AUDIO_ALSA_TRUE}" && test -z "${AUDIO_ALSA_FALSE}"; then3.8572 - { { echo "$as_me:$LINENO: error: conditional \"AUDIO_ALSA\" was never defined.3.8573 -Usually this means the macro was only invoked conditionally." >&53.8574 -echo "$as_me: error: conditional \"AUDIO_ALSA\" was never defined.3.8575 + { { $as_echo "$as_me:$LINENO: error: conditional \"AUDIO_ALSA\" was never defined.3.8576 +Usually this means the macro was only invoked conditionally." >&53.8577 +$as_echo "$as_me: error: conditional \"AUDIO_ALSA\" was never defined.3.8578 Usually this means the macro was only invoked conditionally." >&2;}3.8579 { (exit 1); exit 1; }; }3.8580 fi3.8581 if test -z "${CDROM_LINUX_TRUE}" && test -z "${CDROM_LINUX_FALSE}"; then3.8582 - { { echo "$as_me:$LINENO: error: conditional \"CDROM_LINUX\" was never defined.3.8583 -Usually this means the macro was only invoked conditionally." >&53.8584 -echo "$as_me: error: conditional \"CDROM_LINUX\" was never defined.3.8585 + { { $as_echo "$as_me:$LINENO: error: conditional \"CDROM_LINUX\" was never defined.3.8586 +Usually this means the macro was only invoked conditionally." >&53.8587 +$as_echo "$as_me: error: conditional \"CDROM_LINUX\" was never defined.3.8588 Usually this means the macro was only invoked conditionally." >&2;}3.8589 { (exit 1); exit 1; }; }3.8590 fi3.8591 if test -z "${JOY_LINUX_TRUE}" && test -z "${JOY_LINUX_FALSE}"; then3.8592 - { { echo "$as_me:$LINENO: error: conditional \"JOY_LINUX\" was never defined.3.8593 -Usually this means the macro was only invoked conditionally." >&53.8594 -echo "$as_me: error: conditional \"JOY_LINUX\" was never defined.3.8595 + { { $as_echo "$as_me:$LINENO: error: conditional \"JOY_LINUX\" was never defined.3.8596 +Usually this means the macro was only invoked conditionally." >&53.8597 +$as_echo "$as_me: error: conditional \"JOY_LINUX\" was never defined.3.8598 Usually this means the macro was only invoked conditionally." >&2;}3.8599 { (exit 1); exit 1; }; }3.8600 fi3.8601 if test -z "${BUILD_SYSTEST_TRUE}" && test -z "${BUILD_SYSTEST_FALSE}"; then3.8602 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_SYSTEST\" was never defined.3.8603 -Usually this means the macro was only invoked conditionally." >&53.8604 -echo "$as_me: error: conditional \"BUILD_SYSTEST\" was never defined.3.8605 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SYSTEST\" was never defined.3.8606 +Usually this means the macro was only invoked conditionally." >&53.8607 +$as_echo "$as_me: error: conditional \"BUILD_SYSTEST\" was never defined.3.8608 Usually this means the macro was only invoked conditionally." >&2;}3.8609 { (exit 1); exit 1; }; }3.8610 fi3.8611 if test -z "${BUILD_ARMTEST_TRUE}" && test -z "${BUILD_ARMTEST_FALSE}"; then3.8612 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_ARMTEST\" was never defined.3.8613 -Usually this means the macro was only invoked conditionally." >&53.8614 -echo "$as_me: error: conditional \"BUILD_ARMTEST\" was never defined.3.8615 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ARMTEST\" was never defined.3.8616 +Usually this means the macro was only invoked conditionally." >&53.8617 +$as_echo "$as_me: error: conditional \"BUILD_ARMTEST\" was never defined.3.8618 Usually this means the macro was only invoked conditionally." >&2;}3.8619 { (exit 1); exit 1; }; }3.8620 fi3.8622 : ${CONFIG_STATUS=./config.status}3.8623 +ac_write_fail=03.8624 ac_clean_files_save=$ac_clean_files3.8625 ac_clean_files="$ac_clean_files $CONFIG_STATUS"3.8626 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&53.8627 -echo "$as_me: creating $CONFIG_STATUS" >&6;}3.8628 -cat >$CONFIG_STATUS <<_ACEOF3.8629 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&53.8630 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}3.8631 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.8632 #! $SHELL3.8633 # Generated by $as_me.3.8634 # Run this file to recreate the current configuration.3.8635 @@ -10814,7 +11152,7 @@3.8636 SHELL=\${CONFIG_SHELL-$SHELL}3.8637 _ACEOF3.8639 -cat >>$CONFIG_STATUS <<\_ACEOF3.8640 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.8641 ## --------------------- ##3.8642 ## M4sh Initialization. ##3.8643 ## --------------------- ##3.8644 @@ -10824,7 +11162,7 @@3.8645 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then3.8646 emulate sh3.8647 NULLCMD=:3.8648 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which3.8649 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which3.8650 # is contrary to our usage. Disable this feature.3.8651 alias -g '${1+"$@"}'='"$@"'3.8652 setopt NO_GLOB_SUBST3.8653 @@ -10846,17 +11184,45 @@3.8654 as_cr_digits='0123456789'3.8655 as_cr_alnum=$as_cr_Letters$as_cr_digits3.8657 +as_nl='3.8658 +'3.8659 +export as_nl3.8660 +# Printing a long string crashes Solaris 7 /usr/bin/printf.3.8661 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'3.8662 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo3.8663 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo3.8664 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then3.8665 + as_echo='printf %s\n'3.8666 + as_echo_n='printf %s'3.8667 +else3.8668 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then3.8669 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'3.8670 + as_echo_n='/usr/ucb/echo -n'3.8671 + else3.8672 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'3.8673 + as_echo_n_body='eval3.8674 + arg=$1;3.8675 + case $arg in3.8676 + *"$as_nl"*)3.8677 + expr "X$arg" : "X\\(.*\\)$as_nl";3.8678 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;3.8679 + esac;3.8680 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"3.8681 + '3.8682 + export as_echo_n_body3.8683 + as_echo_n='sh -c $as_echo_n_body as_echo'3.8684 + fi3.8685 + export as_echo_body3.8686 + as_echo='sh -c $as_echo_body as_echo'3.8687 +fi3.8688 +3.8689 # The user is always right.3.8690 if test "${PATH_SEPARATOR+set}" != set; then3.8691 - echo "#! /bin/sh" >conf$$.sh3.8692 - echo "exit 0" >>conf$$.sh3.8693 - chmod +x conf$$.sh3.8694 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then3.8695 - PATH_SEPARATOR=';'3.8696 - else3.8697 - PATH_SEPARATOR=:3.8698 - fi3.8699 - rm -f conf$$.sh3.8700 + PATH_SEPARATOR=:3.8701 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {3.8702 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||3.8703 + PATH_SEPARATOR=';'3.8704 + }3.8705 fi3.8707 # Support unset when possible.3.8708 @@ -10872,8 +11238,6 @@3.8709 # there to prevent editors from complaining about space-tab.3.8710 # (If _AS_PATH_WALK were called with IFS unset, it would disable word3.8711 # splitting by setting IFS to empty value.)3.8712 -as_nl='3.8713 -'3.8714 IFS=" "" $as_nl"3.8716 # Find who we are. Look in the path if we contain no directory separator.3.8717 @@ -10896,7 +11260,7 @@3.8718 as_myself=$03.8719 fi3.8720 if test ! -f "$as_myself"; then3.8721 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&23.8722 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&23.8723 { (exit 1); exit 1; }3.8724 fi3.8726 @@ -10909,17 +11273,10 @@3.8727 PS4='+ '3.8729 # NLS nuisances.3.8730 -for as_var in \3.8731 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \3.8732 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \3.8733 - LC_TELEPHONE LC_TIME3.8734 -do3.8735 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then3.8736 - eval $as_var=C; export $as_var3.8737 - else3.8738 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var3.8739 - fi3.8740 -done3.8741 +LC_ALL=C3.8742 +export LC_ALL3.8743 +LANGUAGE=C3.8744 +export LANGUAGE3.8746 # Required to use basename.3.8747 if expr a : '\(a\)' >/dev/null 2>&1 &&3.8748 @@ -10941,7 +11298,7 @@3.8749 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \3.8750 X"$0" : 'X\(//\)$' \| \3.8751 X"$0" : 'X\(/\)' \| . 2>/dev/null ||3.8752 -echo X/"$0" |3.8753 +$as_echo X/"$0" |3.8754 sed '/^.*\/\([^/][^/]*\)\/*$/{3.8755 s//\1/3.8756 q3.8757 @@ -10992,7 +11349,7 @@3.8758 s/-\n.*//3.8759 ' >$as_me.lineno &&3.8760 chmod +x "$as_me.lineno" ||3.8761 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&23.8762 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&23.8763 { (exit 1); exit 1; }; }3.8765 # Don't try to exec as it changes $[0], causing all sort of problems3.8766 @@ -11020,7 +11377,6 @@3.8767 *)3.8768 ECHO_N='-n';;3.8769 esac3.8770 -3.8771 if expr a : '\(a\)' >/dev/null 2>&1 &&3.8772 test "X`expr 00001 : '.*\(...\)'`" = X001; then3.8773 as_expr=expr3.8774 @@ -11033,19 +11389,22 @@3.8775 rm -f conf$$.dir/conf$$.file3.8776 else3.8777 rm -f conf$$.dir3.8778 - mkdir conf$$.dir3.8779 -fi3.8780 -echo >conf$$.file3.8781 -if ln -s conf$$.file conf$$ 2>/dev/null; then3.8782 - as_ln_s='ln -s'3.8783 - # ... but there are two gotchas:3.8784 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.3.8785 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.3.8786 - # In both cases, we have to default to `cp -p'.3.8787 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||3.8788 + mkdir conf$$.dir 2>/dev/null3.8789 +fi3.8790 +if (echo >conf$$.file) 2>/dev/null; then3.8791 + if ln -s conf$$.file conf$$ 2>/dev/null; then3.8792 + as_ln_s='ln -s'3.8793 + # ... but there are two gotchas:3.8794 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.3.8795 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.3.8796 + # In both cases, we have to default to `cp -p'.3.8797 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||3.8798 + as_ln_s='cp -p'3.8799 + elif ln conf$$.file conf$$ 2>/dev/null; then3.8800 + as_ln_s=ln3.8801 + else3.8802 as_ln_s='cp -p'3.8803 -elif ln conf$$.file conf$$ 2>/dev/null; then3.8804 - as_ln_s=ln3.8805 + fi3.8806 else3.8807 as_ln_s='cp -p'3.8808 fi3.8809 @@ -11070,10 +11429,10 @@3.8810 as_test_x='3.8811 eval sh -c '\''3.8812 if test -d "$1"; then3.8813 - test -d "$1/.";3.8814 + test -d "$1/.";3.8815 else3.8816 case $1 in3.8817 - -*)set "./$1";;3.8818 + -*)set "./$1";;3.8819 esac;3.8820 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in3.8821 ???[sx]*):;;*)false;;esac;fi3.8822 @@ -11096,7 +11455,7 @@3.8823 # values after options handling.3.8824 ac_log="3.8825 This file was extended by $as_me, which was3.8826 -generated by GNU Autoconf 2.61. Invocation command line was3.8827 +generated by GNU Autoconf 2.62. Invocation command line was3.8829 CONFIG_FILES = $CONFIG_FILES3.8830 CONFIG_HEADERS = $CONFIG_HEADERS3.8831 @@ -11109,7 +11468,7 @@3.8833 _ACEOF3.8835 -cat >>$CONFIG_STATUS <<_ACEOF3.8836 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.8837 # Files that config.status was made for.3.8838 config_files="$ac_config_files"3.8839 config_headers="$ac_config_headers"3.8840 @@ -11117,7 +11476,7 @@3.8842 _ACEOF3.8844 -cat >>$CONFIG_STATUS <<\_ACEOF3.8845 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.8846 ac_cs_usage="\3.8847 \`$as_me' instantiates files from templates according to the3.8848 current configuration.3.8849 @@ -11130,9 +11489,9 @@3.8850 -d, --debug don't remove temporary files3.8851 --recheck update $as_me by reconfiguring in the same conditions3.8852 --file=FILE[:TEMPLATE]3.8853 - instantiate the configuration file FILE3.8854 + instantiate the configuration file FILE3.8855 --header=FILE[:TEMPLATE]3.8856 - instantiate the configuration header FILE3.8857 + instantiate the configuration header FILE3.8859 Configuration files:3.8860 $config_files3.8861 @@ -11146,24 +11505,25 @@3.8862 Report bugs to <bug-autoconf@gnu.org>."3.8864 _ACEOF3.8865 -cat >>$CONFIG_STATUS <<_ACEOF3.8866 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.8867 ac_cs_version="\\3.8868 config.status3.8869 -configured by $0, generated by GNU Autoconf 2.61,3.8870 - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"3.8871 -3.8872 -Copyright (C) 2006 Free Software Foundation, Inc.3.8873 +configured by $0, generated by GNU Autoconf 2.62,3.8874 + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"3.8875 +3.8876 +Copyright (C) 2008 Free Software Foundation, Inc.3.8877 This config.status script is free software; the Free Software Foundation3.8878 gives unlimited permission to copy, distribute and modify it."3.8880 ac_pwd='$ac_pwd'3.8881 srcdir='$srcdir'3.8882 INSTALL='$INSTALL'3.8883 -_ACEOF3.8884 -3.8885 -cat >>$CONFIG_STATUS <<\_ACEOF3.8886 -# If no file are specified by the user, then we need to provide default3.8887 -# value. By we need to know if files were specified by the user.3.8888 +AWK='$AWK'3.8889 +test -n "\$AWK" || AWK=awk3.8890 +_ACEOF3.8891 +3.8892 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.8893 +# The default lists apply if the user does not specify any file.3.8894 ac_need_defaults=:3.8895 while test $# != 03.8896 do3.8897 @@ -11185,30 +11545,36 @@3.8898 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)3.8899 ac_cs_recheck=: ;;3.8900 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )3.8901 - echo "$ac_cs_version"; exit ;;3.8902 + $as_echo "$ac_cs_version"; exit ;;3.8903 --debug | --debu | --deb | --de | --d | -d )3.8904 debug=: ;;3.8905 --file | --fil | --fi | --f )3.8906 $ac_shift3.8907 - CONFIG_FILES="$CONFIG_FILES $ac_optarg"3.8908 + case $ac_optarg in3.8909 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;3.8910 + esac3.8911 + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"3.8912 ac_need_defaults=false;;3.8913 --header | --heade | --head | --hea )3.8914 $ac_shift3.8915 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"3.8916 + case $ac_optarg in3.8917 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;3.8918 + esac3.8919 + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"3.8920 ac_need_defaults=false;;3.8921 --he | --h)3.8922 # Conflict between --help and --header3.8923 - { echo "$as_me: error: ambiguous option: $13.8924 + { $as_echo "$as_me: error: ambiguous option: $13.8925 Try \`$0 --help' for more information." >&23.8926 { (exit 1); exit 1; }; };;3.8927 --help | --hel | -h )3.8928 - echo "$ac_cs_usage"; exit ;;3.8929 + $as_echo "$ac_cs_usage"; exit ;;3.8930 -q | -quiet | --quiet | --quie | --qui | --qu | --q \3.8931 | -silent | --silent | --silen | --sile | --sil | --si | --s)3.8932 ac_cs_silent=: ;;3.8934 # This is an error.3.8935 - -*) { echo "$as_me: error: unrecognized option: $13.8936 + -*) { $as_echo "$as_me: error: unrecognized option: $13.8937 Try \`$0 --help' for more information." >&23.8938 { (exit 1); exit 1; }; } ;;3.8940 @@ -11227,27 +11593,29 @@3.8941 fi3.8943 _ACEOF3.8944 -cat >>$CONFIG_STATUS <<_ACEOF3.8945 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.8946 if \$ac_cs_recheck; then3.8947 - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&63.8948 - CONFIG_SHELL=$SHELL3.8949 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion3.8950 + shift3.8951 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&63.8952 + CONFIG_SHELL='$SHELL'3.8953 export CONFIG_SHELL3.8954 - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion3.8955 -fi3.8956 -3.8957 -_ACEOF3.8958 -cat >>$CONFIG_STATUS <<\_ACEOF3.8959 + exec "\$@"3.8960 +fi3.8961 +3.8962 +_ACEOF3.8963 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.8964 exec 5>>config.log3.8965 {3.8966 echo3.8967 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX3.8968 ## Running $as_me. ##3.8969 _ASBOX3.8970 - echo "$ac_log"3.8971 + $as_echo "$ac_log"3.8972 } >&53.8974 _ACEOF3.8975 -cat >>$CONFIG_STATUS <<_ACEOF3.8976 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.8977 #3.8978 # INIT-COMMANDS3.8979 #3.8980 @@ -11256,7 +11624,7 @@3.8982 _ACEOF3.8984 -cat >>$CONFIG_STATUS <<\_ACEOF3.8985 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.8987 # Handling of arguments.3.8988 for ac_config_target in $ac_config_targets3.8989 @@ -11270,8 +11638,8 @@3.8990 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;3.8991 "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;3.8993 - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&53.8994 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}3.8995 + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&53.8996 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}3.8997 { (exit 1); exit 1; }; };;3.8998 esac3.8999 done3.9000 @@ -11312,259 +11680,142 @@3.9001 (umask 077 && mkdir "$tmp")3.9002 } ||3.9003 {3.9004 - echo "$me: cannot create a temporary directory in ." >&23.9005 + $as_echo "$as_me: cannot create a temporary directory in ." >&23.9006 { (exit 1); exit 1; }3.9007 }3.9009 -#3.9010 -# Set up the sed scripts for CONFIG_FILES section.3.9011 -#3.9012 -3.9013 -# No need to generate the scripts if there are no CONFIG_FILES.3.9014 -# This happens for instance when ./config.status config.h3.9015 +# Set up the scripts for CONFIG_FILES section.3.9016 +# No need to generate them if there are no CONFIG_FILES.3.9017 +# This happens for instance with `./config.status config.h'.3.9018 if test -n "$CONFIG_FILES"; then3.9020 -_ACEOF3.9021 -3.9022 -3.9023 -3.9024 +3.9025 +ac_cr='3.9026 '3.9027 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`3.9028 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then3.9029 + ac_cs_awk_cr='\\r'3.9030 +else3.9031 + ac_cs_awk_cr=$ac_cr3.9032 +fi3.9033 +3.9034 +echo 'BEGIN {' >"$tmp/subs1.awk" &&3.9035 +_ACEOF3.9036 +3.9037 +3.9038 +{3.9039 + echo "cat >conf$$subs.awk <<_ACEOF" &&3.9040 + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&3.9041 + echo "_ACEOF"3.9042 +} >conf$$subs.sh ||3.9043 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&53.9044 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}3.9045 + { (exit 1); exit 1; }; }3.9046 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`3.9047 ac_delim='%!_!# '3.9048 for ac_last_try in false false false false false :; do3.9049 - cat >conf$$subs.sed <<_ACEOF3.9050 -SHELL!$SHELL$ac_delim3.9051 -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim3.9052 -PACKAGE_NAME!$PACKAGE_NAME$ac_delim3.9053 -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim3.9054 -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim3.9055 -PACKAGE_STRING!$PACKAGE_STRING$ac_delim3.9056 -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim3.9057 -exec_prefix!$exec_prefix$ac_delim3.9058 -prefix!$prefix$ac_delim3.9059 -program_transform_name!$program_transform_name$ac_delim3.9060 -bindir!$bindir$ac_delim3.9061 -sbindir!$sbindir$ac_delim3.9062 -libexecdir!$libexecdir$ac_delim3.9063 -datarootdir!$datarootdir$ac_delim3.9064 -datadir!$datadir$ac_delim3.9065 -sysconfdir!$sysconfdir$ac_delim3.9066 -sharedstatedir!$sharedstatedir$ac_delim3.9067 -localstatedir!$localstatedir$ac_delim3.9068 -includedir!$includedir$ac_delim3.9069 -oldincludedir!$oldincludedir$ac_delim3.9070 -docdir!$docdir$ac_delim3.9071 -infodir!$infodir$ac_delim3.9072 -htmldir!$htmldir$ac_delim3.9073 -dvidir!$dvidir$ac_delim3.9074 -pdfdir!$pdfdir$ac_delim3.9075 -psdir!$psdir$ac_delim3.9076 -libdir!$libdir$ac_delim3.9077 -localedir!$localedir$ac_delim3.9078 -mandir!$mandir$ac_delim3.9079 -DEFS!$DEFS$ac_delim3.9080 -ECHO_C!$ECHO_C$ac_delim3.9081 -ECHO_N!$ECHO_N$ac_delim3.9082 -ECHO_T!$ECHO_T$ac_delim3.9083 -LIBS!$LIBS$ac_delim3.9084 -build_alias!$build_alias$ac_delim3.9085 -host_alias!$host_alias$ac_delim3.9086 -target_alias!$target_alias$ac_delim3.9087 -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim3.9088 -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim3.9089 -INSTALL_DATA!$INSTALL_DATA$ac_delim3.9090 -CYGPATH_W!$CYGPATH_W$ac_delim3.9091 -PACKAGE!$PACKAGE$ac_delim3.9092 -VERSION!$VERSION$ac_delim3.9093 -ACLOCAL!$ACLOCAL$ac_delim3.9094 -AUTOCONF!$AUTOCONF$ac_delim3.9095 -AUTOMAKE!$AUTOMAKE$ac_delim3.9096 -AUTOHEADER!$AUTOHEADER$ac_delim3.9097 -MAKEINFO!$MAKEINFO$ac_delim3.9098 -install_sh!$install_sh$ac_delim3.9099 -STRIP!$STRIP$ac_delim3.9100 -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim3.9101 -mkdir_p!$mkdir_p$ac_delim3.9102 -AWK!$AWK$ac_delim3.9103 -SET_MAKE!$SET_MAKE$ac_delim3.9104 -am__leading_dot!$am__leading_dot$ac_delim3.9105 -AMTAR!$AMTAR$ac_delim3.9106 -am__tar!$am__tar$ac_delim3.9107 -am__untar!$am__untar$ac_delim3.9108 -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim3.9109 -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim3.9110 -MAINT!$MAINT$ac_delim3.9111 -CC!$CC$ac_delim3.9112 -CFLAGS!$CFLAGS$ac_delim3.9113 -LDFLAGS!$LDFLAGS$ac_delim3.9114 -CPPFLAGS!$CPPFLAGS$ac_delim3.9115 -ac_ct_CC!$ac_ct_CC$ac_delim3.9116 -EXEEXT!$EXEEXT$ac_delim3.9117 -OBJEXT!$OBJEXT$ac_delim3.9118 -DEPDIR!$DEPDIR$ac_delim3.9119 -am__include!$am__include$ac_delim3.9120 -am__quote!$am__quote$ac_delim3.9121 -AMDEP_TRUE!$AMDEP_TRUE$ac_delim3.9122 -AMDEP_FALSE!$AMDEP_FALSE$ac_delim3.9123 -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim3.9124 -CCDEPMODE!$CCDEPMODE$ac_delim3.9125 -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim3.9126 -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim3.9127 -CCAS!$CCAS$ac_delim3.9128 -CCASFLAGS!$CCASFLAGS$ac_delim3.9129 -CPP!$CPP$ac_delim3.9130 -GREP!$GREP$ac_delim3.9131 -EGREP!$EGREP$ac_delim3.9132 -build!$build$ac_delim3.9133 -build_cpu!$build_cpu$ac_delim3.9134 -build_vendor!$build_vendor$ac_delim3.9135 -build_os!$build_os$ac_delim3.9136 -host!$host$ac_delim3.9137 -host_cpu!$host_cpu$ac_delim3.9138 -host_vendor!$host_vendor$ac_delim3.9139 -host_os!$host_os$ac_delim3.9140 -GUI_COCOA_TRUE!$GUI_COCOA_TRUE$ac_delim3.9141 -GUI_COCOA_FALSE!$GUI_COCOA_FALSE$ac_delim3.9142 -PKG_CONFIG!$PKG_CONFIG$ac_delim3.9143 -LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim3.9144 -LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim3.9145 -GTK_CFLAGS!$GTK_CFLAGS$ac_delim3.9146 -GTK_LIBS!$GTK_LIBS$ac_delim3.9147 -_ACEOF3.9148 -3.9149 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then3.9150 + . ./conf$$subs.sh ||3.9151 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&53.9152 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}3.9153 + { (exit 1); exit 1; }; }3.9154 +3.9155 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then3.9156 break3.9157 elif $ac_last_try; then3.9158 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&53.9159 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}3.9160 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&53.9161 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}3.9162 { (exit 1); exit 1; }; }3.9163 else3.9164 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "3.9165 fi3.9166 done3.9167 -3.9168 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`3.9169 -if test -n "$ac_eof"; then3.9170 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`3.9171 - ac_eof=`expr $ac_eof + 1`3.9172 -fi3.9173 -3.9174 -cat >>$CONFIG_STATUS <<_ACEOF3.9175 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof3.9176 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b3.9177 -_ACEOF3.9178 -sed '3.9179 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g3.9180 -s/^/s,@/; s/!/@,|#_!!_#|/3.9181 -:n3.9182 -t n3.9183 -s/'"$ac_delim"'$/,g/; t3.9184 -s/$/\\/; p3.9185 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n3.9186 -' >>$CONFIG_STATUS <conf$$subs.sed3.9187 -rm -f conf$$subs.sed3.9188 -cat >>$CONFIG_STATUS <<_ACEOF3.9189 -CEOF$ac_eof3.9190 -_ACEOF3.9191 -3.9192 -3.9193 -ac_delim='%!_!# '3.9194 -for ac_last_try in false false false false false :; do3.9195 - cat >conf$$subs.sed <<_ACEOF3.9196 -GUI_GTK_TRUE!$GUI_GTK_TRUE$ac_delim3.9197 -GUI_GTK_FALSE!$GUI_GTK_FALSE$ac_delim3.9198 -VIDEO_OSMESA_TRUE!$VIDEO_OSMESA_TRUE$ac_delim3.9199 -VIDEO_OSMESA_FALSE!$VIDEO_OSMESA_FALSE$ac_delim3.9200 -VIDEO_GLX_TRUE!$VIDEO_GLX_TRUE$ac_delim3.9201 -VIDEO_GLX_FALSE!$VIDEO_GLX_FALSE$ac_delim3.9202 -VIDEO_NSGL_TRUE!$VIDEO_NSGL_TRUE$ac_delim3.9203 -VIDEO_NSGL_FALSE!$VIDEO_NSGL_FALSE$ac_delim3.9204 -BUILD_SH4X86_TRUE!$BUILD_SH4X86_TRUE$ac_delim3.9205 -BUILD_SH4X86_FALSE!$BUILD_SH4X86_FALSE$ac_delim3.9206 -BUILD_X86_64_TRUE!$BUILD_X86_64_TRUE$ac_delim3.9207 -BUILD_X86_64_FALSE!$BUILD_X86_64_FALSE$ac_delim3.9208 -PULSE_CFLAGS!$PULSE_CFLAGS$ac_delim3.9209 -PULSE_LIBS!$PULSE_LIBS$ac_delim3.9210 -AUDIO_PULSE_TRUE!$AUDIO_PULSE_TRUE$ac_delim3.9211 -AUDIO_PULSE_FALSE!$AUDIO_PULSE_FALSE$ac_delim3.9212 -ESOUND_CFLAGS!$ESOUND_CFLAGS$ac_delim3.9213 -ESOUND_LIBS!$ESOUND_LIBS$ac_delim3.9214 -AUDIO_ESOUND_TRUE!$AUDIO_ESOUND_TRUE$ac_delim3.9215 -AUDIO_ESOUND_FALSE!$AUDIO_ESOUND_FALSE$ac_delim3.9216 -ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim3.9217 -ALSA_LIBS!$ALSA_LIBS$ac_delim3.9218 -AUDIO_ALSA_TRUE!$AUDIO_ALSA_TRUE$ac_delim3.9219 -AUDIO_ALSA_FALSE!$AUDIO_ALSA_FALSE$ac_delim3.9220 -CDROM_LINUX_TRUE!$CDROM_LINUX_TRUE$ac_delim3.9221 -CDROM_LINUX_FALSE!$CDROM_LINUX_FALSE$ac_delim3.9222 -JOY_LINUX_TRUE!$JOY_LINUX_TRUE$ac_delim3.9223 -JOY_LINUX_FALSE!$JOY_LINUX_FALSE$ac_delim3.9224 -SHCC!$SHCC$ac_delim3.9225 -SHLD!$SHLD$ac_delim3.9226 -SHOBJCOPY!$SHOBJCOPY$ac_delim3.9227 -ARMCC!$ARMCC$ac_delim3.9228 -ARMLD!$ARMLD$ac_delim3.9229 -ARMOBJCOPY!$ARMOBJCOPY$ac_delim3.9230 -BUILD_SYSTEST_TRUE!$BUILD_SYSTEST_TRUE$ac_delim3.9231 -BUILD_SYSTEST_FALSE!$BUILD_SYSTEST_FALSE$ac_delim3.9232 -BUILD_ARMTEST_TRUE!$BUILD_ARMTEST_TRUE$ac_delim3.9233 -BUILD_ARMTEST_FALSE!$BUILD_ARMTEST_FALSE$ac_delim3.9234 -GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim3.9235 -USE_NLS!$USE_NLS$ac_delim3.9236 -MSGFMT!$MSGFMT$ac_delim3.9237 -MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim3.9238 -GMSGFMT!$GMSGFMT$ac_delim3.9239 -XGETTEXT!$XGETTEXT$ac_delim3.9240 -CATALOGS!$CATALOGS$ac_delim3.9241 -CATOBJEXT!$CATOBJEXT$ac_delim3.9242 -DATADIRNAME!$DATADIRNAME$ac_delim3.9243 -GMOFILES!$GMOFILES$ac_delim3.9244 -INSTOBJEXT!$INSTOBJEXT$ac_delim3.9245 -INTLLIBS!$INTLLIBS$ac_delim3.9246 -PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim3.9247 -PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim3.9248 -POFILES!$POFILES$ac_delim3.9249 -POSUB!$POSUB$ac_delim3.9250 -MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim3.9251 -LIBOBJS!$LIBOBJS$ac_delim3.9252 -LTLIBOBJS!$LTLIBOBJS$ac_delim3.9253 -_ACEOF3.9254 -3.9255 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then3.9256 - break3.9257 - elif $ac_last_try; then3.9258 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&53.9259 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}3.9260 - { (exit 1); exit 1; }; }3.9261 - else3.9262 - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "3.9263 - fi3.9264 -done3.9265 -3.9266 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`3.9267 -if test -n "$ac_eof"; then3.9268 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`3.9269 - ac_eof=`expr $ac_eof + 1`3.9270 -fi3.9271 -3.9272 -cat >>$CONFIG_STATUS <<_ACEOF3.9273 -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof3.9274 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end3.9275 -_ACEOF3.9276 -sed '3.9277 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g3.9278 -s/^/s,@/; s/!/@,|#_!!_#|/3.9279 -:n3.9280 -t n3.9281 -s/'"$ac_delim"'$/,g/; t3.9282 -s/$/\\/; p3.9283 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n3.9284 -' >>$CONFIG_STATUS <conf$$subs.sed3.9285 -rm -f conf$$subs.sed3.9286 -cat >>$CONFIG_STATUS <<_ACEOF3.9287 -:end3.9288 -s/|#_!!_#|//g3.9289 -CEOF$ac_eof3.9290 -_ACEOF3.9291 -3.9292 +rm -f conf$$subs.sh3.9293 +3.9294 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.9295 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&3.9296 +_ACEOF3.9297 +sed -n '3.9298 +h3.9299 +s/^/S["/; s/!.*/"]=/3.9300 +p3.9301 +g3.9302 +s/^[^!]*!//3.9303 +:repl3.9304 +t repl3.9305 +s/'"$ac_delim"'$//3.9306 +t delim3.9307 +:nl3.9308 +h3.9309 +s/\(.\{148\}\).*/\1/3.9310 +t more13.9311 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/3.9312 +p3.9313 +n3.9314 +b repl3.9315 +:more13.9316 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/3.9317 +p3.9318 +g3.9319 +s/.\{148\}//3.9320 +t nl3.9321 +:delim3.9322 +h3.9323 +s/\(.\{148\}\).*/\1/3.9324 +t more23.9325 +s/["\\]/\\&/g; s/^/"/; s/$/"/3.9326 +p3.9327 +b3.9328 +:more23.9329 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/3.9330 +p3.9331 +g3.9332 +s/.\{148\}//3.9333 +t delim3.9334 +' <conf$$subs.awk | sed '3.9335 +/^[^""]/{3.9336 + N3.9337 + s/\n//3.9338 +}3.9339 +' >>$CONFIG_STATUS || ac_write_fail=13.9340 +rm -f conf$$subs.awk3.9341 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.9342 +_ACAWK3.9343 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&3.9344 + for (key in S) S_is_set[key] = 13.9345 + FS = ""3.9346 +3.9347 +}3.9348 +{3.9349 + line = $ 03.9350 + nfields = split(line, field, "@")3.9351 + substed = 03.9352 + len = length(field[1])3.9353 + for (i = 2; i < nfields; i++) {3.9354 + key = field[i]3.9355 + keylen = length(key)3.9356 + if (S_is_set[key]) {3.9357 + value = S[key]3.9358 + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)3.9359 + len += length(value) + length(field[++i])3.9360 + substed = 13.9361 + } else3.9362 + len += 1 + keylen3.9363 + }3.9364 +3.9365 + print line3.9366 +}3.9367 +3.9368 +_ACAWK3.9369 +_ACEOF3.9370 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.9371 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then3.9372 + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"3.9373 +else3.9374 + cat3.9375 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \3.9376 + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&53.9377 +$as_echo "$as_me: error: could not setup config files machinery" >&2;}3.9378 + { (exit 1); exit 1; }; }3.9379 +_ACEOF3.9381 # VPATH may cause trouble with some makes, so we remove $(srcdir),3.9382 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and3.9383 @@ -11581,19 +11832,133 @@3.9384 }'3.9385 fi3.9387 -cat >>$CONFIG_STATUS <<\_ACEOF3.9388 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.9389 fi # test -n "$CONFIG_FILES"3.9391 -3.9392 -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS3.9393 +# Set up the scripts for CONFIG_HEADERS section.3.9394 +# No need to generate them if there are no CONFIG_HEADERS.3.9395 +# This happens for instance with `./config.status Makefile'.3.9396 +if test -n "$CONFIG_HEADERS"; then3.9397 +cat >"$tmp/defines.awk" <<\_ACAWK ||3.9398 +BEGIN {3.9399 +_ACEOF3.9400 +3.9401 +# Transform confdefs.h into an awk script `defines.awk', embedded as3.9402 +# here-document in config.status, that substitutes the proper values into3.9403 +# config.h.in to produce config.h.3.9404 +3.9405 +# Create a delimiter string that does not exist in confdefs.h, to ease3.9406 +# handling of long lines.3.9407 +ac_delim='%!_!# '3.9408 +for ac_last_try in false false :; do3.9409 + ac_t=`sed -n "/$ac_delim/p" confdefs.h`3.9410 + if test -z "$ac_t"; then3.9411 + break3.9412 + elif $ac_last_try; then3.9413 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&53.9414 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}3.9415 + { (exit 1); exit 1; }; }3.9416 + else3.9417 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "3.9418 + fi3.9419 +done3.9420 +3.9421 +# For the awk script, D is an array of macro values keyed by name,3.9422 +# likewise P contains macro parameters if any. Preserve backslash3.9423 +# newline sequences.3.9424 +3.9425 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*3.9426 +sed -n '3.9427 +s/.\{148\}/&'"$ac_delim"'/g3.9428 +t rset3.9429 +:rset3.9430 +s/^[ ]*#[ ]*define[ ][ ]*/ /3.9431 +t def3.9432 +d3.9433 +:def3.9434 +s/\\$//3.9435 +t bsnl3.9436 +s/["\\]/\\&/g3.9437 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\3.9438 +D["\1"]=" \3"/p3.9439 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p3.9440 +d3.9441 +:bsnl3.9442 +s/["\\]/\\&/g3.9443 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\3.9444 +D["\1"]=" \3\\\\\\n"\\/p3.9445 +t cont3.9446 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p3.9447 +t cont3.9448 +d3.9449 +:cont3.9450 +n3.9451 +s/.\{148\}/&'"$ac_delim"'/g3.9452 +t clear3.9453 +:clear3.9454 +s/\\$//3.9455 +t bsnlc3.9456 +s/["\\]/\\&/g; s/^/"/; s/$/"/p3.9457 +d3.9458 +:bsnlc3.9459 +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p3.9460 +b cont3.9461 +' <confdefs.h | sed '3.9462 +s/'"$ac_delim"'/"\\\3.9463 +"/g' >>$CONFIG_STATUS || ac_write_fail=13.9464 +3.9465 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.9466 + for (key in D) D_is_set[key] = 13.9467 + FS = ""3.9468 +}3.9469 +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {3.9470 + line = \$ 03.9471 + split(line, arg, " ")3.9472 + if (arg[1] == "#") {3.9473 + defundef = arg[2]3.9474 + mac1 = arg[3]3.9475 + } else {3.9476 + defundef = substr(arg[1], 2)3.9477 + mac1 = arg[2]3.9478 + }3.9479 + split(mac1, mac2, "(") #)3.9480 + macro = mac2[1]3.9481 + if (D_is_set[macro]) {3.9482 + # Preserve the white space surrounding the "#".3.9483 + prefix = substr(line, 1, index(line, defundef) - 1)3.9484 + print prefix "define", macro P[macro] D[macro]3.9485 + next3.9486 + } else {3.9487 + # Replace #undef with comments. This is necessary, for example,3.9488 + # in the case of _POSIX_SOURCE, which is predefined and required3.9489 + # on some systems where configure will not decide to define it.3.9490 + if (defundef == "undef") {3.9491 + print "/*", line, "*/"3.9492 + next3.9493 + }3.9494 + }3.9495 +}3.9496 +{ print }3.9497 +_ACAWK3.9498 +_ACEOF3.9499 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.9500 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&53.9501 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;}3.9502 + { (exit 1); exit 1; }; }3.9503 +fi # test -n "$CONFIG_HEADERS"3.9504 +3.9505 +3.9506 +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"3.9507 +shift3.9508 +for ac_tag3.9509 do3.9510 case $ac_tag in3.9511 :[FHLC]) ac_mode=$ac_tag; continue;;3.9512 esac3.9513 case $ac_mode$ac_tag in3.9514 :[FHL]*:*);;3.9515 - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&53.9516 -echo "$as_me: error: Invalid tag $ac_tag." >&2;}3.9517 + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&53.9518 +$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}3.9519 { (exit 1); exit 1; }; };;3.9520 :[FH]-) ac_tag=-:-;;3.9521 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;3.9522 @@ -11622,26 +11987,38 @@3.9523 [\\/$]*) false;;3.9524 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;3.9525 esac ||3.9526 - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&53.9527 -echo "$as_me: error: cannot find input file: $ac_f" >&2;}3.9528 + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&53.9529 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}3.9530 { (exit 1); exit 1; }; };;3.9531 esac3.9532 - ac_file_inputs="$ac_file_inputs $ac_f"3.9533 + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac3.9534 + ac_file_inputs="$ac_file_inputs '$ac_f'"3.9535 done3.9537 # Let's still pretend it is `configure' which instantiates (i.e., don't3.9538 # use $as_me), people would be surprised to read:3.9539 # /* config.h. Generated by config.status. */3.9540 - configure_input="Generated from "`IFS=:3.9541 - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."3.9542 + configure_input='Generated from '`3.9543 + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'3.9544 + `' by configure.'3.9545 if test x"$ac_file" != x-; then3.9546 configure_input="$ac_file. $configure_input"3.9547 - { echo "$as_me:$LINENO: creating $ac_file" >&53.9548 -echo "$as_me: creating $ac_file" >&6;}3.9549 - fi3.9550 + { $as_echo "$as_me:$LINENO: creating $ac_file" >&53.9551 +$as_echo "$as_me: creating $ac_file" >&6;}3.9552 + fi3.9553 + # Neutralize special characters interpreted by sed in replacement strings.3.9554 + case $configure_input in #(3.9555 + *\&* | *\|* | *\\* )3.9556 + ac_sed_conf_input=`$as_echo "$configure_input" |3.9557 + sed 's/[\\\\&|]/\\\\&/g'`;; #(3.9558 + *) ac_sed_conf_input=$configure_input;;3.9559 + esac3.9561 case $ac_tag in3.9562 - *:-:* | *:-) cat >"$tmp/stdin";;3.9563 + *:-:* | *:-) cat >"$tmp/stdin" \3.9564 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&53.9565 +$as_echo "$as_me: error: could not create $ac_file" >&2;}3.9566 + { (exit 1); exit 1; }; } ;;3.9567 esac3.9568 ;;3.9569 esac3.9570 @@ -11651,7 +12028,7 @@3.9571 X"$ac_file" : 'X\(//\)[^/]' \| \3.9572 X"$ac_file" : 'X\(//\)$' \| \3.9573 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||3.9574 -echo X"$ac_file" |3.9575 +$as_echo X"$ac_file" |3.9576 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.9577 s//\1/3.9578 q3.9579 @@ -11677,7 +12054,7 @@3.9580 as_dirs=3.9581 while :; do3.9582 case $as_dir in #(3.9583 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(3.9584 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(3.9585 *) as_qdir=$as_dir;;3.9586 esac3.9587 as_dirs="'$as_qdir' $as_dirs"3.9588 @@ -11686,7 +12063,7 @@3.9589 X"$as_dir" : 'X\(//\)[^/]' \| \3.9590 X"$as_dir" : 'X\(//\)$' \| \3.9591 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||3.9592 -echo X"$as_dir" |3.9593 +$as_echo X"$as_dir" |3.9594 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.9595 s//\1/3.9596 q3.9597 @@ -11707,17 +12084,17 @@3.9598 test -d "$as_dir" && break3.9599 done3.9600 test -z "$as_dirs" || eval "mkdir $as_dirs"3.9601 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&53.9602 -echo "$as_me: error: cannot create directory $as_dir" >&2;}3.9603 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&53.9604 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}3.9605 { (exit 1); exit 1; }; }; }3.9606 ac_builddir=.3.9608 case "$ac_dir" in3.9609 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;3.9610 *)3.9611 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`3.9612 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`3.9613 # A ".." for each directory in $ac_dir_suffix.3.9614 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`3.9615 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`3.9616 case $ac_top_builddir_sub in3.9617 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;3.9618 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;3.9619 @@ -11757,12 +12134,13 @@3.9620 esac3.9621 _ACEOF3.9623 -cat >>$CONFIG_STATUS <<\_ACEOF3.9624 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.9625 # If the template does not know about datarootdir, expand it.3.9626 # FIXME: This hack should be removed a few years after 2.60.3.9627 ac_datarootdir_hack=; ac_datarootdir_seen=3.9629 -case `sed -n '/datarootdir/ {3.9630 +ac_sed_dataroot='3.9631 +/datarootdir/ {3.9632 p3.9633 q3.9634 }3.9635 @@ -11771,13 +12149,14 @@3.9636 /@infodir@/p3.9637 /@localedir@/p3.9638 /@mandir@/p3.9639 -' $ac_file_inputs` in3.9640 +'3.9641 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in3.9642 *datarootdir*) ac_datarootdir_seen=yes;;3.9643 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)3.9644 - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&53.9645 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}3.9646 -_ACEOF3.9647 -cat >>$CONFIG_STATUS <<_ACEOF3.9648 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&53.9649 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}3.9650 +_ACEOF3.9651 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.9652 ac_datarootdir_hack='3.9653 s&@datadir@&$datadir&g3.9654 s&@docdir@&$docdir&g3.9655 @@ -11791,15 +12170,16 @@3.9656 # Neutralize VPATH when `$srcdir' = `.'.3.9657 # Shell code in configure.ac might set extrasub.3.9658 # FIXME: do we really want to maintain this feature?3.9659 -cat >>$CONFIG_STATUS <<_ACEOF3.9660 - sed "$ac_vpsub3.9661 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=13.9662 +ac_sed_extra="$ac_vpsub3.9663 $extrasub3.9664 _ACEOF3.9665 -cat >>$CONFIG_STATUS <<\_ACEOF3.9666 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=13.9667 :t3.9668 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b3.9669 -s&@configure_input@&$configure_input&;t t3.9670 +s|@configure_input@|$ac_sed_conf_input|;t t3.9671 s&@top_builddir@&$ac_top_builddir_sub&;t t3.9672 +s&@top_build_prefix@&$ac_top_build_prefix&;t t3.9673 s&@srcdir@&$ac_srcdir&;t t3.9674 s&@abs_srcdir@&$ac_abs_srcdir&;t t3.9675 s&@top_srcdir@&$ac_top_srcdir&;t t3.9676 @@ -11809,135 +12189,74 @@3.9677 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t3.9678 s&@INSTALL@&$ac_INSTALL&;t t3.9679 $ac_datarootdir_hack3.9680 -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out3.9681 +"3.9682 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \3.9683 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&53.9684 +$as_echo "$as_me: error: could not create $ac_file" >&2;}3.9685 + { (exit 1); exit 1; }; }3.9687 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&3.9688 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&3.9689 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&3.9690 - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'3.9691 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'3.9692 which seems to be undefined. Please make sure it is defined." >&53.9693 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'3.9694 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'3.9695 which seems to be undefined. Please make sure it is defined." >&2;}3.9697 rm -f "$tmp/stdin"3.9698 case $ac_file in3.9699 - -) cat "$tmp/out"; rm -f "$tmp/out";;3.9700 - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;3.9701 - esac3.9702 + -) cat "$tmp/out" && rm -f "$tmp/out";;3.9703 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;3.9704 + esac \3.9705 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&53.9706 +$as_echo "$as_me: error: could not create $ac_file" >&2;}3.9707 + { (exit 1); exit 1; }; }3.9708 ;;3.9709 :H)3.9710 #3.9711 # CONFIG_HEADER3.9712 #3.9713 -_ACEOF3.9714 -3.9715 -# Transform confdefs.h into a sed script `conftest.defines', that3.9716 -# substitutes the proper values into config.h.in to produce config.h.3.9717 -rm -f conftest.defines conftest.tail3.9718 -# First, append a space to every undef/define line, to ease matching.3.9719 -echo 's/$/ /' >conftest.defines3.9720 -# Then, protect against being on the right side of a sed subst, or in3.9721 -# an unquoted here document, in config.status. If some macros were3.9722 -# called several times there might be several #defines for the same3.9723 -# symbol, which is useless. But do not sort them, since the last3.9724 -# AC_DEFINE must be honored.3.9725 -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*3.9726 -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where3.9727 -# NAME is the cpp macro being defined, VALUE is the value it is being given.3.9728 -# PARAMS is the parameter list in the macro definition--in most cases, it's3.9729 -# just an empty string.3.9730 -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'3.9731 -ac_dB='\\)[ (].*,\\1define\\2'3.9732 -ac_dC=' '3.9733 -ac_dD=' ,'3.9734 -3.9735 -uniq confdefs.h |3.9736 - sed -n '3.9737 - t rset3.9738 - :rset3.9739 - s/^[ ]*#[ ]*define[ ][ ]*//3.9740 - t ok3.9741 - d3.9742 - :ok3.9743 - s/[\\&,]/\\&/g3.9744 - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p3.9745 - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p3.9746 - ' >>conftest.defines3.9747 -3.9748 -# Remove the space that was appended to ease matching.3.9749 -# Then replace #undef with comments. This is necessary, for3.9750 -# example, in the case of _POSIX_SOURCE, which is predefined and required3.9751 -# on some systems where configure will not decide to define it.3.9752 -# (The regexp can be short, since the line contains either #define or #undef.)3.9753 -echo 's/ $//3.9754 -s,^[ #]*u.*,/* & */,' >>conftest.defines3.9755 -3.9756 -# Break up conftest.defines:3.9757 -ac_max_sed_lines=503.9758 -3.9759 -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"3.9760 -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"3.9761 -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"3.9762 -# et cetera.3.9763 -ac_in='$ac_file_inputs'3.9764 -ac_out='"$tmp/out1"'3.9765 -ac_nxt='"$tmp/out2"'3.9766 -3.9767 -while :3.9768 -do3.9769 - # Write a here document:3.9770 - cat >>$CONFIG_STATUS <<_ACEOF3.9771 - # First, check the format of the line:3.9772 - cat >"\$tmp/defines.sed" <<\\CEOF3.9773 -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def3.9774 -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def3.9775 -b3.9776 -:def3.9777 -_ACEOF3.9778 - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS3.9779 - echo 'CEOF3.9780 - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS3.9781 - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in3.9782 - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail3.9783 - grep . conftest.tail >/dev/null || break3.9784 - rm -f conftest.defines3.9785 - mv conftest.tail conftest.defines3.9786 -done3.9787 -rm -f conftest.defines conftest.tail3.9788 -3.9789 -echo "ac_result=$ac_in" >>$CONFIG_STATUS3.9790 -cat >>$CONFIG_STATUS <<\_ACEOF3.9791 if test x"$ac_file" != x-; then3.9792 - echo "/* $configure_input */" >"$tmp/config.h"3.9793 - cat "$ac_result" >>"$tmp/config.h"3.9794 - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then3.9795 - { echo "$as_me:$LINENO: $ac_file is unchanged" >&53.9796 -echo "$as_me: $ac_file is unchanged" >&6;}3.9797 - else3.9798 - rm -f $ac_file3.9799 - mv "$tmp/config.h" $ac_file3.9800 - fi3.9801 - else3.9802 - echo "/* $configure_input */"3.9803 - cat "$ac_result"3.9804 - fi3.9805 - rm -f "$tmp/out12"3.9806 -# Compute $ac_file's index in $config_headers.3.9807 + {3.9808 + $as_echo "/* $configure_input */" \3.9809 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"3.9810 + } >"$tmp/config.h" \3.9811 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&53.9812 +$as_echo "$as_me: error: could not create $ac_file" >&2;}3.9813 + { (exit 1); exit 1; }; }3.9814 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then3.9815 + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&53.9816 +$as_echo "$as_me: $ac_file is unchanged" >&6;}3.9817 + else3.9818 + rm -f "$ac_file"3.9819 + mv "$tmp/config.h" "$ac_file" \3.9820 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&53.9821 +$as_echo "$as_me: error: could not create $ac_file" >&2;}3.9822 + { (exit 1); exit 1; }; }3.9823 + fi3.9824 + else3.9825 + $as_echo "/* $configure_input */" \3.9826 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \3.9827 + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&53.9828 +$as_echo "$as_me: error: could not create -" >&2;}3.9829 + { (exit 1); exit 1; }; }3.9830 + fi3.9831 +# Compute "$ac_file"'s index in $config_headers.3.9832 _am_stamp_count=13.9833 for _am_header in $config_headers :; do3.9834 case $_am_header in3.9835 - $ac_file | $ac_file:* )3.9836 + "$ac_file" | "$ac_file":* )3.9837 break ;;3.9838 * )3.9839 _am_stamp_count=`expr $_am_stamp_count + 1` ;;3.9840 esac3.9841 done3.9842 -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||3.9843 -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \3.9844 - X$ac_file : 'X\(//\)[^/]' \| \3.9845 - X$ac_file : 'X\(//\)$' \| \3.9846 - X$ac_file : 'X\(/\)' \| . 2>/dev/null ||3.9847 -echo X$ac_file |3.9848 +echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||3.9849 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \3.9850 + X"$ac_file" : 'X\(//\)[^/]' \| \3.9851 + X"$ac_file" : 'X\(//\)$' \| \3.9852 + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||3.9853 +$as_echo X"$ac_file" |3.9854 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.9855 s//\1/3.9856 q3.9857 @@ -11957,8 +12276,8 @@3.9858 s/.*/./; q'`/stamp-h$_am_stamp_count3.9859 ;;3.9861 - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&53.9862 -echo "$as_me: executing $ac_file commands" >&6;}3.9863 + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&53.9864 +$as_echo "$as_me: executing $ac_file commands" >&6;}3.9865 ;;3.9866 esac3.9868 @@ -11979,7 +12298,7 @@3.9869 X"$mf" : 'X\(//\)[^/]' \| \3.9870 X"$mf" : 'X\(//\)$' \| \3.9871 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||3.9872 -echo X"$mf" |3.9873 +$as_echo X"$mf" |3.9874 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.9875 s//\1/3.9876 q3.9877 @@ -12023,7 +12342,7 @@3.9878 X"$file" : 'X\(//\)[^/]' \| \3.9879 X"$file" : 'X\(//\)$' \| \3.9880 X"$file" : 'X\(/\)' \| . 2>/dev/null ||3.9881 -echo X"$file" |3.9882 +$as_echo X"$file" |3.9883 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.9884 s//\1/3.9885 q3.9886 @@ -12049,7 +12368,7 @@3.9887 as_dirs=3.9888 while :; do3.9889 case $as_dir in #(3.9890 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(3.9891 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(3.9892 *) as_qdir=$as_dir;;3.9893 esac3.9894 as_dirs="'$as_qdir' $as_dirs"3.9895 @@ -12058,7 +12377,7 @@3.9896 X"$as_dir" : 'X\(//\)[^/]' \| \3.9897 X"$as_dir" : 'X\(//\)$' \| \3.9898 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||3.9899 -echo X"$as_dir" |3.9900 +$as_echo X"$as_dir" |3.9901 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{3.9902 s//\1/3.9903 q3.9904 @@ -12079,8 +12398,8 @@3.9905 test -d "$as_dir" && break3.9906 done3.9907 test -z "$as_dirs" || eval "mkdir $as_dirs"3.9908 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&53.9909 -echo "$as_me: error: cannot create directory $as_dir" >&2;}3.9910 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&53.9911 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}3.9912 { (exit 1); exit 1; }; }; }3.9913 # echo "creating $dirpart/$file"3.9914 echo '# dummy' > "$dirpart/$file"3.9915 @@ -12100,6 +12419,11 @@3.9916 chmod +x $CONFIG_STATUS3.9917 ac_clean_files=$ac_clean_files_save3.9919 +test $ac_write_fail = 0 ||3.9920 + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&53.9921 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}3.9922 + { (exit 1); exit 1; }; }3.9923 +3.9925 # configure is writing to config.log, and then calls config.status.3.9926 # config.status does its own redirection, appending to config.log.3.9927 @@ -12121,5 +12445,9 @@3.9928 # would make configure fail if this is the last instruction.3.9929 $ac_cs_success || { (exit 1); exit 1; }3.9930 fi3.9931 -3.9932 -3.9933 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then3.9934 + { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&53.9935 +$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}3.9936 +fi3.9937 +3.9938 +
4.1 --- a/configure.in Sun Jun 01 00:46:15 2008 +00004.2 +++ b/configure.in Sun Jun 01 00:47:45 2008 +00004.3 @@ -31,9 +31,10 @@4.4 AC_ARG_WITH( osmesa,4.5 AS_HELP_STRING( [--with-osmesa], [Build with the osmesa GL library (software rendering)]),4.6 [], [with_osmesa=no])4.7 +AC_ARG_WITH( gtk,4.8 + AS_HELP_STRING( [--with-gtk], [Build with the GTK UI. Default on X11 systems]), [with_gtk=yes], [with_gtk=x11] )4.10 -4.11 -dnl ------------ Check if we're building on Darwn --------------4.12 +dnl ------------ Check if we're building on Darwin --------------4.14 dnl For starters, do we have a working objective-c compiler?4.15 lxdream_save_cppflags="$CPPFLAGS"4.16 @@ -49,8 +50,12 @@4.17 AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])4.18 ])4.20 + if test "x$with_gtk" = "xx11"; then4.21 + with_gtk=no4.22 + fi4.23 +4.24 ], [CPPFLAGS="$lxdream_save_cppflags"] )4.25 -AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes'])4.26 +AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"])4.28 dnl ----------- Check for mandatory dependencies --------------4.29 dnl Check for libpng (required)4.30 @@ -61,23 +66,28 @@4.31 echo "Zlib (libz.so) could not be found, but is required."4.32 exit 1])4.34 +if test "x$with_gtk" = "xno"; then4.35 + dnl Check for GLIB only4.36 + PKG_CHECK_MODULES(GLIB, glib-2.0)4.37 +else4.38 + dnl Check for GTK4.39 + PKG_CHECK_MODULES(GTK, gtk+-2.0, [4.40 + HAVE_GTK='yes'4.41 + AC_DEFINE([HAVE_GTK],1,[Have GTK libraries])4.42 + ])4.44 -dnl Check for GTK (currently compulsory)4.45 -PKG_CHECK_MODULES(GTK, gtk+-2.0, [4.46 - HAVE_GTK='yes'4.47 - AC_DEFINE([HAVE_GTK],1,[Have GTK libraries])4.48 -])4.49 + dnl Which GTK port do we have?4.50 + LIBS="$LIBS $GTK_LIBS"4.51 + AC_CHECK_FUNC(gdk_x11_display_get_xdisplay, [4.52 + HAVE_GTK_X11='yes'4.53 + AC_DEFINE([HAVE_GTK_X11],1,[Building with GTK+X11]) ], [])4.54 + AC_CHECK_FUNC(gdk_quartz_window_get_nsview, [4.55 + HAVE_GTK_OSX='yes'4.56 + AC_DEFINE([HAVE_GTK_OSX],1,[Building with GTK+Cocoa]) ], [])4.57 +fi4.58 +4.59 AM_CONDITIONAL(GUI_GTK, [test "$HAVE_GTK" = 'yes'])4.61 -dnl Which GTK port do we have?4.62 -LIBS="$LIBS $GTK_LIBS"4.63 -AC_CHECK_FUNC(gdk_x11_display_get_xdisplay, [4.64 - HAVE_GTK_X11='yes'4.65 - AC_DEFINE([HAVE_GTK_X11],1,[Building with GTK+X11]) ], [])4.66 -AC_CHECK_FUNC(gdk_quartz_window_get_nsview, [4.67 - HAVE_GTK_OSX='yes'4.68 - AC_DEFINE([HAVE_GTK_OSX],1,[Building with GTK+Cocoa]) ], [])4.69 -4.70 dnl ------------------ Video driver support -------------------4.71 AS_IF([test "x$with_osmesa" != xno], [4.73 @@ -96,6 +106,10 @@4.74 AC_MSG_FAILURE( ["The OpenGL library (libGL.so) could not be found, but is required."])])4.75 AC_CHECK_HEADER([GL/gl.h], [], [4.76 AC_MSG_FAILURE( ["The OpenGL header files (eg GL/gl.h) could not be found, but are required."])])4.77 + else4.78 + AC_CHECK_FUNC(NSOpenGLGetVersion, [4.79 + HAVE_NSGL='yes'4.80 + AC_DEFINE([HAVE_NSGL],1, [Have NSOpenGL support]) ] )4.81 fi4.83 dnl Now work out how to get from the UI to GL - this is usually the painful part.4.84 @@ -106,10 +120,7 @@4.85 AC_CHECK_FUNC(glXQueryVersion, [4.86 HAVE_GLX='yes'4.87 AC_DEFINE([HAVE_GLX], 1, [Have GLX support]) ] )4.88 - elif test "x$HAVE_GTK_OSX" = "xyes"; then4.89 - AC_CHECK_FUNC(NSOpenGLGetVersion, [4.90 - HAVE_NSGL='yes'4.91 - AC_DEFINE([HAVE_NSGL],1, [Have NSOpenGL support]) ] )4.92 +dnl elif test "x$HAVE_GTK_OSX" = "xyes"; then4.93 fi4.95 ])
5.1 --- a/src/Makefile.am Sun Jun 01 00:46:15 2008 +00005.2 +++ b/src/Makefile.am Sun Jun 01 00:47:45 2008 +00005.3 @@ -5,7 +5,7 @@5.4 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \5.5 -DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \5.6 -Ish4 \5.7 - @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@5.8 + @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@5.10 bin_PROGRAMS = lxdream5.11 noinst_PROGRAMS = gendec genglsl5.12 @@ -13,7 +13,7 @@5.14 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE5.15 TESTS = test/testxlt5.16 -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c5.17 +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h5.19 gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c5.20 genglsl_SOURCES = tools/genglsl.c5.21 @@ -52,7 +52,7 @@5.22 x86dasm/x86dasm.c x86dasm/x86dasm.h \5.23 x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c5.25 -test_testsh4x86_LDADD = @GTK_LIBS@5.26 +test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@5.27 test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \5.28 x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \5.29 x86dasm/dis-buf.c \5.30 @@ -70,6 +70,11 @@5.31 drivers/video_gtk.c drivers/video_gtk.h5.32 endif5.34 +if GUI_COCOA5.35 +lxdream_SOURCES += cocoaui/cocoaui.c cocoaui/cocoaui.h \5.36 + cocoaui/cocoa_win.c drivers/video_osx.c drivers/mac_keymap.h5.37 +endif5.38 +5.39 if VIDEO_OSMESA5.40 lxdream_SOURCES += drivers/video_gdk.c drivers/video_gdk.h5.41 endif5.42 @@ -106,10 +111,10 @@5.43 endif5.46 -lxdream_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)5.47 +lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)5.49 -gendec_LDADD = @GTK_LIBS@ $(INTLLIBS)5.50 -genglsl_LDADD = @GTK_LIBS@ $(INTLLIBS)5.51 +gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)5.52 +genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)5.55 test_testxlt_SOURCES = test/testxlt.c sh4/xltcache.c sh4/xltcache.h5.56 @@ -124,3 +129,6 @@5.57 ./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c5.58 pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl5.59 ./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c5.60 +drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl5.61 + drivers/genkeymap.pl mac drivers/mac_keymap.txt > drivers/mac_keymap.h5.62 +5.63 \ No newline at end of file
6.1 --- a/src/Makefile.in Sun Jun 01 00:46:15 2008 +00006.2 +++ b/src/Makefile.in Sun Jun 01 00:47:45 2008 +00006.3 @@ -52,15 +52,18 @@6.4 @GUI_GTK_TRUE@ gtkui/ctrl_dlg.c gtkui/path_dlg.c gtkui/gdrom_menu.c \6.5 @GUI_GTK_TRUE@ drivers/video_gtk.c drivers/video_gtk.h6.7 -@VIDEO_OSMESA_TRUE@am__append_4 = drivers/video_gdk.c drivers/video_gdk.h6.8 -@VIDEO_GLX_TRUE@am__append_5 = drivers/video_glx.c drivers/video_glx.h6.9 -@VIDEO_NSGL_TRUE@am__append_6 = drivers/video_nsgl.c drivers/video_nsgl.h6.10 -@AUDIO_PULSE_TRUE@am__append_7 = drivers/audio_pulse.c6.11 -@AUDIO_ESOUND_TRUE@am__append_8 = drivers/audio_esd.c6.12 -@AUDIO_ALSA_TRUE@am__append_9 = drivers/audio_alsa.c6.13 -@CDROM_LINUX_TRUE@am__append_10 = drivers/cd_linux.c6.14 -@CDROM_LINUX_FALSE@am__append_11 = drivers/cd_none.c6.15 -@JOY_LINUX_TRUE@am__append_12 = drivers/joy_linux.c6.16 +@GUI_COCOA_TRUE@am__append_4 = cocoaui/cocoaui.c cocoaui/cocoaui.h \6.17 +@GUI_COCOA_TRUE@ cocoaui/cocoa_win.c drivers/video_osx.c drivers/mac_keymap.h6.18 +6.19 +@VIDEO_OSMESA_TRUE@am__append_5 = drivers/video_gdk.c drivers/video_gdk.h6.20 +@VIDEO_GLX_TRUE@am__append_6 = drivers/video_glx.c drivers/video_glx.h6.21 +@VIDEO_NSGL_TRUE@am__append_7 = drivers/video_nsgl.c drivers/video_nsgl.h6.22 +@AUDIO_PULSE_TRUE@am__append_8 = drivers/audio_pulse.c6.23 +@AUDIO_ESOUND_TRUE@am__append_9 = drivers/audio_esd.c6.24 +@AUDIO_ALSA_TRUE@am__append_10 = drivers/audio_alsa.c6.25 +@CDROM_LINUX_TRUE@am__append_11 = drivers/cd_linux.c6.26 +@CDROM_LINUX_FALSE@am__append_12 = drivers/cd_none.c6.27 +@JOY_LINUX_TRUE@am__append_13 = drivers/joy_linux.c6.28 subdir = src6.29 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in6.30 ACLOCAL_M4 = $(top_srcdir)/aclocal.m46.31 @@ -110,11 +113,12 @@6.32 gtkui/gtkui.h gtkui/main_win.c gtkui/gtkcb.c gtkui/mmio_win.c \6.33 gtkui/debug_win.c gtkui/dump_win.c gtkui/ctrl_dlg.c \6.34 gtkui/path_dlg.c gtkui/gdrom_menu.c drivers/video_gtk.c \6.35 - drivers/video_gtk.h drivers/video_gdk.c drivers/video_gdk.h \6.36 - drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.c \6.37 - drivers/video_nsgl.h drivers/audio_pulse.c drivers/audio_esd.c \6.38 - drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_none.c \6.39 - drivers/joy_linux.c6.40 + drivers/video_gtk.h cocoaui/cocoaui.c cocoaui/cocoaui.h \6.41 + cocoaui/cocoa_win.c drivers/video_osx.c drivers/mac_keymap.h \6.42 + drivers/video_gdk.c drivers/video_gdk.h drivers/video_glx.c \6.43 + drivers/video_glx.h drivers/video_nsgl.c drivers/video_nsgl.h \6.44 + drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \6.45 + drivers/cd_linux.c drivers/cd_none.c drivers/joy_linux.c6.46 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \6.47 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \6.48 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)6.49 @@ -123,15 +127,17 @@6.50 @GUI_GTK_TRUE@ debug_win.$(OBJEXT) dump_win.$(OBJEXT) \6.51 @GUI_GTK_TRUE@ ctrl_dlg.$(OBJEXT) path_dlg.$(OBJEXT) \6.52 @GUI_GTK_TRUE@ gdrom_menu.$(OBJEXT) video_gtk.$(OBJEXT)6.53 -@VIDEO_OSMESA_TRUE@am__objects_3 = video_gdk.$(OBJEXT)6.54 -@VIDEO_GLX_TRUE@am__objects_4 = video_glx.$(OBJEXT)6.55 -@VIDEO_NSGL_TRUE@am__objects_5 = video_nsgl.$(OBJEXT)6.56 -@AUDIO_PULSE_TRUE@am__objects_6 = audio_pulse.$(OBJEXT)6.57 -@AUDIO_ESOUND_TRUE@am__objects_7 = audio_esd.$(OBJEXT)6.58 -@AUDIO_ALSA_TRUE@am__objects_8 = audio_alsa.$(OBJEXT)6.59 -@CDROM_LINUX_TRUE@am__objects_9 = cd_linux.$(OBJEXT)6.60 -@CDROM_LINUX_FALSE@am__objects_10 = cd_none.$(OBJEXT)6.61 -@JOY_LINUX_TRUE@am__objects_11 = joy_linux.$(OBJEXT)6.62 +@GUI_COCOA_TRUE@am__objects_3 = cocoaui.$(OBJEXT) cocoa_win.$(OBJEXT) \6.63 +@GUI_COCOA_TRUE@ video_osx.$(OBJEXT)6.64 +@VIDEO_OSMESA_TRUE@am__objects_4 = video_gdk.$(OBJEXT)6.65 +@VIDEO_GLX_TRUE@am__objects_5 = video_glx.$(OBJEXT)6.66 +@VIDEO_NSGL_TRUE@am__objects_6 = video_nsgl.$(OBJEXT)6.67 +@AUDIO_PULSE_TRUE@am__objects_7 = audio_pulse.$(OBJEXT)6.68 +@AUDIO_ESOUND_TRUE@am__objects_8 = audio_esd.$(OBJEXT)6.69 +@AUDIO_ALSA_TRUE@am__objects_9 = audio_alsa.$(OBJEXT)6.70 +@CDROM_LINUX_TRUE@am__objects_10 = cd_linux.$(OBJEXT)6.71 +@CDROM_LINUX_FALSE@am__objects_11 = cd_none.$(OBJEXT)6.72 +@JOY_LINUX_TRUE@am__objects_12 = joy_linux.$(OBJEXT)6.73 am_lxdream_OBJECTS = main.$(OBJEXT) config.$(OBJEXT) mem.$(OBJEXT) \6.74 watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) \6.75 bios.$(OBJEXT) dcload.$(OBJEXT) ide.$(OBJEXT) \6.76 @@ -154,7 +160,7 @@6.77 $(am__objects_2) $(am__objects_3) $(am__objects_4) \6.78 $(am__objects_5) $(am__objects_6) $(am__objects_7) \6.79 $(am__objects_8) $(am__objects_9) $(am__objects_10) \6.80 - $(am__objects_11)6.81 + $(am__objects_11) $(am__objects_12)6.82 lxdream_OBJECTS = $(am_lxdream_OBJECTS)6.83 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1)6.84 am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \6.85 @@ -238,13 +244,15 @@6.86 ESOUND_LIBS = @ESOUND_LIBS@6.87 EXEEXT = @EXEEXT@6.88 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@6.89 +GLIB_CFLAGS = @GLIB_CFLAGS@6.90 +GLIB_LIBS = @GLIB_LIBS@6.91 GMOFILES = @GMOFILES@6.92 GMSGFMT = @GMSGFMT@6.93 GREP = @GREP@6.94 GTK_CFLAGS = @GTK_CFLAGS@6.95 GTK_LIBS = @GTK_LIBS@6.96 -GUI_CARBON_FALSE = @GUI_CARBON_FALSE@6.97 -GUI_CARBON_TRUE = @GUI_CARBON_TRUE@6.98 +GUI_COCOA_FALSE = @GUI_COCOA_FALSE@6.99 +GUI_COCOA_TRUE = @GUI_COCOA_TRUE@6.100 GUI_GTK_FALSE = @GUI_GTK_FALSE@6.101 GUI_GTK_TRUE = @GUI_GTK_TRUE@6.102 INSTALL_DATA = @INSTALL_DATA@6.103 @@ -346,11 +354,11 @@6.104 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \6.105 -DPACKAGE_CONF_DIR=\""$(sysconfdir)"\" \6.106 -Ish4 \6.107 - @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@6.108 + @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@6.110 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE6.111 TESTS = test/testxlt6.112 -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c6.113 +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h6.114 gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c6.115 genglsl_SOURCES = tools/genglsl.c6.116 lxdream_SOURCES = main.c config.c config.h mem.c mem.h mmio.h watch.c \6.117 @@ -377,17 +385,18 @@6.118 drivers/gl_fbo.c $(am__append_1) $(am__append_3) \6.119 $(am__append_4) $(am__append_5) $(am__append_6) \6.120 $(am__append_7) $(am__append_8) $(am__append_9) \6.121 - $(am__append_10) $(am__append_11) $(am__append_12)6.122 -@BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GTK_LIBS@6.123 + $(am__append_10) $(am__append_11) $(am__append_12) \6.124 + $(am__append_13)6.125 +@BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@6.126 @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \6.127 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \6.128 @BUILD_SH4X86_TRUE@ x86dasm/dis-buf.c \6.129 @BUILD_SH4X86_TRUE@ sh4/sh4dasm.c sh4/sh4trans.c sh4/sh4x86.c sh4/xltcache.c \6.130 @BUILD_SH4X86_TRUE@ sh4/xltcache.h mem.c util.c sh4/mmu.c6.132 -lxdream_LDADD = @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)6.133 -gendec_LDADD = @GTK_LIBS@ $(INTLLIBS)6.134 -genglsl_LDADD = @GTK_LIBS@ $(INTLLIBS)6.135 +lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @PULSE_LIBS@ @ESOUND_LIBS@ @ALSA_LIBS@ $(INTLLIBS)6.136 +gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)6.137 +genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)6.138 test_testxlt_SOURCES = test/testxlt.c sh4/xltcache.c sh4/xltcache.h6.139 all: $(BUILT_SOURCES)6.140 $(MAKE) $(AM_MAKEFLAGS) all-am6.141 @@ -493,6 +502,8 @@6.142 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_linux.Po@am__quote@6.143 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_none.Po@am__quote@6.144 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi.Po@am__quote@6.145 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cocoa_win.Po@am__quote@6.146 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cocoaui.Po@am__quote@6.147 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@6.148 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controller.Po@am__quote@6.149 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctrl_dlg.Po@am__quote@6.150 @@ -563,6 +574,7 @@6.151 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gtk.Po@am__quote@6.152 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_nsgl.Po@am__quote@6.153 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_null.Po@am__quote@6.154 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_osx.Po@am__quote@6.155 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch.Po@am__quote@6.156 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x86dasm.Po@am__quote@6.157 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xltcache.Po@am__quote@6.158 @@ -1492,6 +1504,48 @@6.159 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.160 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_gtk.obj `if test -f 'drivers/video_gtk.c'; then $(CYGPATH_W) 'drivers/video_gtk.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_gtk.c'; fi`6.162 +cocoaui.o: cocoaui/cocoaui.c6.163 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cocoaui.o -MD -MP -MF "$(DEPDIR)/cocoaui.Tpo" -c -o cocoaui.o `test -f 'cocoaui/cocoaui.c' || echo '$(srcdir)/'`cocoaui/cocoaui.c; \6.164 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cocoaui.Tpo" "$(DEPDIR)/cocoaui.Po"; else rm -f "$(DEPDIR)/cocoaui.Tpo"; exit 1; fi6.165 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cocoaui/cocoaui.c' object='cocoaui.o' libtool=no @AMDEPBACKSLASH@6.166 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.167 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoaui.o `test -f 'cocoaui/cocoaui.c' || echo '$(srcdir)/'`cocoaui/cocoaui.c6.168 +6.169 +cocoaui.obj: cocoaui/cocoaui.c6.170 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cocoaui.obj -MD -MP -MF "$(DEPDIR)/cocoaui.Tpo" -c -o cocoaui.obj `if test -f 'cocoaui/cocoaui.c'; then $(CYGPATH_W) 'cocoaui/cocoaui.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoaui.c'; fi`; \6.171 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cocoaui.Tpo" "$(DEPDIR)/cocoaui.Po"; else rm -f "$(DEPDIR)/cocoaui.Tpo"; exit 1; fi6.172 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cocoaui/cocoaui.c' object='cocoaui.obj' libtool=no @AMDEPBACKSLASH@6.173 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.174 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoaui.obj `if test -f 'cocoaui/cocoaui.c'; then $(CYGPATH_W) 'cocoaui/cocoaui.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoaui.c'; fi`6.175 +6.176 +cocoa_win.o: cocoaui/cocoa_win.c6.177 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cocoa_win.o -MD -MP -MF "$(DEPDIR)/cocoa_win.Tpo" -c -o cocoa_win.o `test -f 'cocoaui/cocoa_win.c' || echo '$(srcdir)/'`cocoaui/cocoa_win.c; \6.178 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cocoa_win.Tpo" "$(DEPDIR)/cocoa_win.Po"; else rm -f "$(DEPDIR)/cocoa_win.Tpo"; exit 1; fi6.179 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cocoaui/cocoa_win.c' object='cocoa_win.o' libtool=no @AMDEPBACKSLASH@6.180 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.181 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoa_win.o `test -f 'cocoaui/cocoa_win.c' || echo '$(srcdir)/'`cocoaui/cocoa_win.c6.182 +6.183 +cocoa_win.obj: cocoaui/cocoa_win.c6.184 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cocoa_win.obj -MD -MP -MF "$(DEPDIR)/cocoa_win.Tpo" -c -o cocoa_win.obj `if test -f 'cocoaui/cocoa_win.c'; then $(CYGPATH_W) 'cocoaui/cocoa_win.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoa_win.c'; fi`; \6.185 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cocoa_win.Tpo" "$(DEPDIR)/cocoa_win.Po"; else rm -f "$(DEPDIR)/cocoa_win.Tpo"; exit 1; fi6.186 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cocoaui/cocoa_win.c' object='cocoa_win.obj' libtool=no @AMDEPBACKSLASH@6.187 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.188 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cocoa_win.obj `if test -f 'cocoaui/cocoa_win.c'; then $(CYGPATH_W) 'cocoaui/cocoa_win.c'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoa_win.c'; fi`6.189 +6.190 +video_osx.o: drivers/video_osx.c6.191 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_osx.o -MD -MP -MF "$(DEPDIR)/video_osx.Tpo" -c -o video_osx.o `test -f 'drivers/video_osx.c' || echo '$(srcdir)/'`drivers/video_osx.c; \6.192 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/video_osx.Tpo" "$(DEPDIR)/video_osx.Po"; else rm -f "$(DEPDIR)/video_osx.Tpo"; exit 1; fi6.193 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_osx.c' object='video_osx.o' libtool=no @AMDEPBACKSLASH@6.194 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.195 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_osx.o `test -f 'drivers/video_osx.c' || echo '$(srcdir)/'`drivers/video_osx.c6.196 +6.197 +video_osx.obj: drivers/video_osx.c6.198 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_osx.obj -MD -MP -MF "$(DEPDIR)/video_osx.Tpo" -c -o video_osx.obj `if test -f 'drivers/video_osx.c'; then $(CYGPATH_W) 'drivers/video_osx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_osx.c'; fi`; \6.199 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/video_osx.Tpo" "$(DEPDIR)/video_osx.Po"; else rm -f "$(DEPDIR)/video_osx.Tpo"; exit 1; fi6.200 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/video_osx.c' object='video_osx.obj' libtool=no @AMDEPBACKSLASH@6.201 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@6.202 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o video_osx.obj `if test -f 'drivers/video_osx.c'; then $(CYGPATH_W) 'drivers/video_osx.c'; else $(CYGPATH_W) '$(srcdir)/drivers/video_osx.c'; fi`6.203 +6.204 video_gdk.o: drivers/video_gdk.c6.205 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_gdk.o -MD -MP -MF "$(DEPDIR)/video_gdk.Tpo" -c -o video_gdk.o `test -f 'drivers/video_gdk.c' || echo '$(srcdir)/'`drivers/video_gdk.c; \6.206 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/video_gdk.Tpo" "$(DEPDIR)/video_gdk.Po"; else rm -f "$(DEPDIR)/video_gdk.Tpo"; exit 1; fi6.207 @@ -1905,6 +1959,8 @@6.208 ./gendec sh4/sh4.def sh4/sh4stat.in -o sh4/sh4stat.c6.209 pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl6.210 ./genglsl pvr2/vertex.glsl pvr2/fragment.glsl pvr2/gl_slsrc.c6.211 +drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl6.212 + drivers/genkeymap.pl mac drivers/mac_keymap.txt > drivers/mac_keymap.h6.213 # Tell versions [3.59,3.63) of GNU make to not export all variables.6.214 # Otherwise a system limit (for SysV at least) may be exceeded.6.215 .NOEXPORT:
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +00007.2 +++ b/src/cocoaui/cocoa_win.c Sun Jun 01 00:47:45 2008 +00007.3 @@ -0,0 +1,190 @@7.4 +/**7.5 + * $Id$7.6 + *7.7 + * Construct and maintain the main window under cocoa.7.8 + *7.9 + * Copyright (c) 2008 Nathan Keynes.7.10 + *7.11 + * This program is free software; you can redistribute it and/or modify7.12 + * it under the terms of the GNU General Public License as published by7.13 + * the Free Software Foundation; either version 2 of the License, or7.14 + * (at your option) any later version.7.15 + *7.16 + * This program is distributed in the hope that it will be useful,7.17 + * but WITHOUT ANY WARRANTY; without even the implied warranty of7.18 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the7.19 + * GNU General Public License for more details.7.20 + */7.21 +7.22 +#include "cocoaui/cocoaui.h"7.23 +#include "lxdream.h"7.24 +#include <ApplicationServices/ApplicationServices.h>7.25 +7.26 +#define STATUSBAR_HEIGHT 207.27 +7.28 +@interface LxdreamToolbarDelegate : NSObject {7.29 + NSArray *identifiers;7.30 + NSArray *defaults;7.31 + NSDictionary *items;7.32 +}7.33 +- (NSToolbarItem *) createToolbarItem: (NSString *)id label: (NSString *) label7.34 + tooltip: (NSString *)tooltip icon: (NSString *)icon action: (SEL) action;7.35 +@end7.36 +7.37 +@implementation LxdreamToolbarDelegate7.38 +- (id) init7.39 +{7.40 + NSToolbarItem *mount = [self createToolbarItem: @"GdromMount" label: @"Open Image"7.41 + tooltip: @"Mount a cdrom disc" icon: @"tb-cdrom"7.42 + action: @selector(mount_action:)];7.43 + NSToolbarItem *reset = [self createToolbarItem: @"Reset" label: @"Reset"7.44 + tooltip: @"Reset dreamcast" icon: @"tb-reset"7.45 + action: @selector(reset_action:)];7.46 + NSToolbarItem *pause = [self createToolbarItem: @"Pause" label: @"Pause"7.47 + tooltip: @"Pause dreamcast" icon: @"tb-pause"7.48 + action: @selector(pause_action:)];7.49 + NSToolbarItem *run = [self createToolbarItem: @"Run" label: @"Resume"7.50 + tooltip: @"Resume" icon: @"tb-run"7.51 + action: @selector(run_action:)];7.52 + NSToolbarItem *load = [self createToolbarItem: @"LoadState" label: @"Load State..."7.53 + tooltip: @"Load an lxdream save state" icon: @"tb-load"7.54 + action: @selector(load_action:)];7.55 + NSToolbarItem *save = [self createToolbarItem: @"SaveState" label: @"Save State..."7.56 + tooltip: @"Create an lxdream save state" icon: @"tb-save"7.57 + action: @selector(save_action:)];7.58 + [pause setEnabled: NO];7.59 + identifiers =7.60 + [NSArray arrayWithObjects: @"GdromMount", @"Reset", @"Pause", @"Run", @"LoadState", @"SaveState", nil ];7.61 + defaults =7.62 + [NSArray arrayWithObjects: @"GdromMount", @"Reset", @"Pause", @"Run",7.63 + NSToolbarSeparatorItemIdentifier, @"LoadState", @"SaveState", nil ];7.64 + NSArray *values = [NSArray arrayWithObjects: mount, reset, pause, run, load, save, nil ];7.65 + items = [NSDictionary dictionaryWithObjects: values forKeys: identifiers];7.66 + return self;7.67 +}7.68 +7.69 +- (NSToolbarItem *) createToolbarItem: (NSString *)id label: (NSString *) label7.70 + tooltip: (NSString *)tooltip icon: (NSString *)icon action: (SEL) action7.71 +{7.72 + NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier: id];7.73 + [item setLabel: label];7.74 + [item setToolTip: tooltip];7.75 + [item setTarget: [NSApp delegate]];7.76 + NSString *iconFile = [[NSBundle mainBundle] pathForResource:icon ofType:@"png"];7.77 + NSImage *image = [[NSImage alloc] initWithContentsOfFile: iconFile];7.78 + [item setImage: image];7.79 + [item setAction: action];7.80 + return item;7.81 +}7.82 +7.83 +- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar7.84 +{7.85 + return identifiers;7.86 +}7.87 +7.88 +- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar7.89 +{7.90 + return defaults;7.91 +}7.92 +7.93 +- (NSArray *)toolbarSelectableItemIdentifiers: (NSToolbar *)toolbar7.94 +{7.95 + return [NSArray arrayWithObjects: @"Pause", @"Run", nil];7.96 +}7.97 +7.98 +- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier7.99 + willBeInsertedIntoToolbar:(BOOL)flag7.100 +{7.101 + return [items objectForKey: itemIdentifier];7.102 +}7.103 +@end7.104 +7.105 +@implementation LxdreamMainWindow7.106 +- (id)initWithContentRect:(NSRect)videoRect7.107 +{7.108 + NSRect contentRect = NSMakeRect(videoRect.origin.x,videoRect.origin.y,7.109 + videoRect.size.width,videoRect.size.height+STATUSBAR_HEIGHT);7.110 + if( [super initWithContentRect: contentRect7.111 + styleMask: ( NSTitledWindowMask | NSClosableWindowMask |7.112 + NSMiniaturizableWindowMask | NSResizableWindowMask |7.113 + NSTexturedBackgroundWindowMask | NSUnifiedTitleAndToolbarWindowMask )7.114 + backing: NSBackingStoreBuffered defer: NO ] == nil ) {7.115 + return nil;7.116 + } else {7.117 + isGrabbed = NO;7.118 + video = video_osx_create_drawable();7.119 + [video setFrameOrigin: NSMakePoint(0.0,STATUSBAR_HEIGHT)];7.120 +7.121 + status =7.122 + [[NSTextField alloc] initWithFrame: NSMakeRect(0.0,0.0,videoRect.size.width,STATUSBAR_HEIGHT)];7.123 + [status setStringValue: @"Idle"];7.124 + [status setEditable: NO];7.125 + [status setDrawsBackground: NO];7.126 + [status setBordered: NO];7.127 + [[self contentView] addSubview: video];7.128 + [[self contentView] addSubview: status];7.129 + [self makeFirstResponder: video];7.130 +7.131 + [self setAutorecalculatesContentBorderThickness: YES forEdge: NSMinYEdge ];7.132 + [self setContentBorderThickness: 15.0 forEdge: NSMinYEdge];7.133 +7.134 + // Share the app delegate for the purposes of keeping it in one place7.135 + [self setDelegate: [NSApp delegate]];7.136 + [self setContentMinSize: contentRect.size];7.137 + [self setAcceptsMouseMovedEvents: YES];7.138 +7.139 + NSString *title = [[NSString alloc] initWithCString: (APP_NAME " " APP_VERSION) encoding: NSASCIIStringEncoding];7.140 + [self setTitle: title];7.141 +7.142 + NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier: @"LxdreamToolbar"];7.143 + [toolbar setDelegate: [[LxdreamToolbarDelegate alloc] init]];7.144 + [toolbar setDisplayMode: NSToolbarDisplayModeIconOnly];7.145 + [toolbar setSizeMode: NSToolbarSizeModeSmall];7.146 + [toolbar setSelectedItemIdentifier: @"Pause"];7.147 + [self setToolbar: toolbar];7.148 + return self;7.149 + }7.150 +}7.151 +7.152 +- (void)setStatusText: (const gchar *)text7.153 +{7.154 + if( isGrabbed ) {7.155 + gchar buf[128];7.156 + snprintf( buf, sizeof(buf), "%s %s", text, _("(Press <ctrl><alt> to release grab)") );7.157 + NSString *s = [NSString stringWithUTF8String: buf];7.158 + [status setStringValue: s];7.159 + } else {7.160 + NSString *s = [NSString stringWithUTF8String: text];7.161 + [status setStringValue: s];7.162 + }7.163 +}7.164 +- (void)setRunning:(BOOL)isRunning7.165 +{7.166 + if( isRunning ) {7.167 + [[self toolbar] setSelectedItemIdentifier: @"Run"];7.168 + [self setStatusText: _("Running")];7.169 + } else {7.170 + [[self toolbar] setSelectedItemIdentifier: @"Pause"];7.171 + [self setStatusText: _("Stopped")];7.172 + }7.173 +}7.174 +- (BOOL)isGrabbed7.175 +{7.176 + return isGrabbed;7.177 +}7.178 +- (void)setIsGrabbed:(BOOL)grab7.179 +{7.180 + if( grab != isGrabbed ) {7.181 + isGrabbed = grab;7.182 + [self setRunning: dreamcast_is_running() ? YES : NO];7.183 + }7.184 +}7.185 +7.186 +@end7.187 +7.188 +NSWindow *cocoa_gui_create_main_window()7.189 +{7.190 + NSRect contentRect = {{0,0},{640,480}};7.191 + NSWindow *main_win = [[LxdreamMainWindow alloc] initWithContentRect: contentRect];7.192 + return main_win;7.193 +}
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +00008.2 +++ b/src/cocoaui/cocoaui.c Sun Jun 01 00:47:45 2008 +00008.3 @@ -0,0 +1,320 @@8.4 +/**8.5 + * $Id$8.6 + *8.7 + * Core Cocoa-based user interface8.8 + *8.9 + * Copyright (c) 2005 Nathan Keynes.8.10 + *8.11 + * This program is free software; you can redistribute it and/or modify8.12 + * it under the terms of the GNU General Public License as published by8.13 + * the Free Software Foundation; either version 2 of the License, or8.14 + * (at your option) any later version.8.15 + *8.16 + * This program is distributed in the hope that it will be useful,8.17 + * but WITHOUT ANY WARRANTY; without even the implied warranty of8.18 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the8.19 + * GNU General Public License for more details.8.20 + */8.21 +8.22 +#include <AppKit/AppKit.h>8.23 +#include <stdio.h>8.24 +#include <stdlib.h>8.25 +#include <sys/time.h>8.26 +#include "lxdream.h"8.27 +#include "dreamcast.h"8.28 +#include "dream.h"8.29 +#include "gui.h"8.30 +#include "cocoaui/cocoaui.h"8.31 +8.32 +void cocoa_gui_update( void );8.33 +void cocoa_gui_start( void );8.34 +void cocoa_gui_stop( void );8.35 +void cocoa_gui_run_later( void );8.36 +uint32_t cocoa_gui_run_slice( uint32_t nanosecs );8.37 +8.38 +struct dreamcast_module cocoa_gui_module = { "gui", NULL,8.39 + cocoa_gui_update,8.40 + cocoa_gui_start,8.41 + cocoa_gui_run_slice,8.42 + cocoa_gui_stop,8.43 + NULL, NULL };8.44 +8.45 +/**8.46 + * Count of running nanoseconds - used to cut back on the GUI runtime8.47 + */8.48 +static uint32_t cocoa_gui_nanos = 0;8.49 +static uint32_t cocoa_gui_ticks = 0;8.50 +static struct timeval cocoa_gui_lasttv;8.51 +static BOOL cocoa_gui_autorun = NO;8.52 +8.53 +@interface NSApplication (PrivateAdditions)8.54 +- (void) setAppleMenu:(NSMenu *)aMenu;8.55 +@end8.56 +8.57 +static void cocoa_gui_create_menu(void)8.58 +{8.59 + NSMenu *appleMenu, *services;8.60 + NSMenuItem *menuItem;8.61 + NSString *title;8.62 + NSString *appName;8.63 +8.64 + appName = @"Lxdream";8.65 + appleMenu = [[NSMenu alloc] initWithTitle:@""];8.66 +8.67 + /* Add menu items */8.68 + title = [@"About " stringByAppendingString:appName];8.69 + [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];8.70 + [appleMenu addItem:[NSMenuItem separatorItem]];8.71 +8.72 + // Services Menu8.73 + services = [[[NSMenu alloc] init] autorelease];8.74 + [appleMenu addItemWithTitle:@"Services" action:nil keyEquivalent:@""];8.75 + [appleMenu setSubmenu: services forItem: [appleMenu itemWithTitle: @"Services"]];8.76 +8.77 + // Hide AppName8.78 + title = [@"Hide " stringByAppendingString:appName];8.79 + [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];8.80 +8.81 + // Hide Others8.82 + menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others"8.83 + action:@selector(hideOtherApplications:)8.84 + keyEquivalent:@"h"];8.85 + [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];8.86 +8.87 + // Show All8.88 + [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];8.89 + [appleMenu addItem:[NSMenuItem separatorItem]];8.90 +8.91 + // Quit AppName8.92 + title = [@"Quit " stringByAppendingString:appName];8.93 + [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];8.94 +8.95 + /* Put menu into the menubar */8.96 + menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];8.97 + [menuItem setSubmenu: appleMenu];8.98 + NSMenu *menu = [NSMenu new];8.99 + [menu addItem: menuItem];8.100 +8.101 + NSMenu *fileMenu = [[NSMenu alloc] initWithTitle: NS_("File")];8.102 + [fileMenu addItemWithTitle: NS_("Load Binary") action: @selector(load_binary_action:) keyEquivalent: @"b"];8.103 + [fileMenu addItemWithTitle: NS_("GD-Rom") action: @selector(mount_action:) keyEquivalent: @"g"];8.104 + [fileMenu addItem: [NSMenuItem separatorItem]];8.105 + [[fileMenu addItemWithTitle: NS_("Reset") action: @selector(reset_action:) keyEquivalent: @"r"]8.106 + setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];8.107 + [fileMenu addItemWithTitle: NS_("Pause") action: @selector(pause_action:) keyEquivalent: @"p"];8.108 + [fileMenu addItemWithTitle: NS_("Resume") action: @selector(run_action:) keyEquivalent: @"r"];8.109 + [fileMenu addItem: [NSMenuItem separatorItem]];8.110 + [fileMenu addItemWithTitle: NS_("Load State") action: @selector(load_action:) keyEquivalent: @"o"];8.111 + [fileMenu addItemWithTitle: NS_("Save State") action: @selector(save_action:) keyEquivalent: @"s"];8.112 +8.113 + menuItem = [[NSMenuItem alloc] initWithTitle:NS_("File") action: nil keyEquivalent: @""];8.114 + [menuItem setSubmenu: fileMenu];8.115 + [menu addItem: menuItem];8.116 +8.117 + /* Tell the application object that this is now the application menu */8.118 + [NSApp setMainMenu: menu];8.119 + [NSApp setAppleMenu: appleMenu];8.120 + [NSApp setServicesMenu: services];8.121 +8.122 + /* Finally give up our references to the objects */8.123 + [appleMenu release];8.124 + [menuItem release];8.125 + [menu release];8.126 +}8.127 +8.128 +@interface LxdreamDelegate : NSObject8.129 +@end8.130 +8.131 +@implementation LxdreamDelegate8.132 +- (void)windowWillClose: (NSNotification *)notice8.133 +{8.134 + dreamcast_shutdown();8.135 + exit(0);8.136 +}8.137 +- (void)windowDidBecomeMain: (NSNotification *)notice8.138 +{8.139 + if( cocoa_gui_autorun ) {8.140 + cocoa_gui_autorun = NO;8.141 + cocoa_gui_run_later();8.142 + }8.143 +}8.144 +- (void) load_action: (id)sender8.145 +{8.146 + NSOpenPanel *panel = [NSOpenPanel openPanel];8.147 + NSArray *fileTypes = [NSArray arrayWithObject: @"dst"];8.148 + int result = [panel runModalForDirectory: NSHomeDirectory() file: nil types: fileTypes];8.149 + if( result == NSOKButton && [[panel filenames] count] > 0 ) {8.150 + NSString *filename = [[panel filenames] objectAtIndex: 0];8.151 + dreamcast_load_state( [filename UTF8String] );8.152 + }8.153 +}8.154 +- (void) save_action: (id)sender8.155 +{8.156 + NSSavePanel *panel = [NSSavePanel savePanel];8.157 + [panel setRequiredFileType: @"dst"];8.158 + int result = [panel runModalForDirectory: NSHomeDirectory() file:@""];8.159 + if( result == NSOKButton ) {8.160 + NSString *filename = [panel filename];8.161 + dreamcast_save_state( [filename UTF8String] );8.162 + }8.163 +}8.164 +- (void) load_binary_action: (id)sender8.165 +{8.166 + NSOpenPanel *panel = [NSOpenPanel openPanel];8.167 + int result = [panel runModalForDirectory: NSHomeDirectory() file: nil types: nil];8.168 + if( result == NSOKButton && [[panel filenames] count] > 0 ) {8.169 + NSString *filename = [[panel filenames] objectAtIndex: 0];8.170 + file_load_magic( [filename UTF8String] );8.171 + }8.172 +}8.173 +- (void) mount_action: (id)sender8.174 +{8.175 + NSOpenPanel *panel = [NSOpenPanel openPanel];8.176 + int result = [panel runModalForDirectory: NSHomeDirectory() file: nil types: nil];8.177 + if( result == NSOKButton && [[panel filenames] count] > 0 ) {8.178 + NSString *filename = [[panel filenames] objectAtIndex: 0];8.179 + gdrom_mount_image( [filename UTF8String] );8.180 + }8.181 +}8.182 +- (void) pause_action: (id)sender8.183 +{8.184 + dreamcast_stop();8.185 +}8.186 +8.187 +- (void) reset_action: (id)sender8.188 +{8.189 + dreamcast_reset();8.190 +}8.191 +- (void) run_action: (id)sender8.192 +{8.193 + cocoa_gui_run_later();8.194 +}8.195 +- (void) run_immediate8.196 +{8.197 + dreamcast_run();8.198 +}8.199 +@end8.200 +8.201 +8.202 +gboolean gui_parse_cmdline( int *argc, char **argv[] )8.203 +{8.204 + /* do nothing */8.205 +}8.206 +8.207 +gboolean gui_init( gboolean withDebug )8.208 +{8.209 + dreamcast_register_module( &cocoa_gui_module );8.210 +8.211 + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];8.212 + [NSApplication sharedApplication];8.213 + LxdreamDelegate *delegate = [[LxdreamDelegate alloc] init];8.214 + [NSApp setDelegate: delegate];8.215 + cocoa_gui_create_menu();8.216 + NSWindow *window = cocoa_gui_create_main_window();8.217 + [window makeKeyAndOrderFront: nil];8.218 + [NSApp activateIgnoringOtherApps: YES];8.219 + [pool release];8.220 +}8.221 +8.222 +void gui_main_loop( gboolean run )8.223 +{8.224 + if( run ) {8.225 + cocoa_gui_autorun = YES;8.226 + /*8.227 + */8.228 + }8.229 + [NSApp run];8.230 +}8.231 +8.232 +void gui_update_state(void)8.233 +{8.234 + cocoa_gui_update();8.235 +}8.236 +8.237 +gboolean gui_error_dialog( const char *msg, ... )8.238 +{8.239 +8.240 +}8.241 +8.242 +void gui_update_io_activity( io_activity_type io, gboolean active )8.243 +{8.244 +8.245 +}8.246 +8.247 +8.248 +uint32_t cocoa_gui_run_slice( uint32_t nanosecs )8.249 +{8.250 + NSEvent *event;8.251 + NSAutoreleasePool *pool;8.252 +8.253 + cocoa_gui_nanos += nanosecs;8.254 + if( cocoa_gui_nanos > GUI_TICK_PERIOD ) { /* 10 ms */8.255 + cocoa_gui_nanos -= GUI_TICK_PERIOD;8.256 + cocoa_gui_ticks ++;8.257 + uint32_t current_period = cocoa_gui_ticks * GUI_TICK_PERIOD;8.258 +8.259 + // Run the event loop8.260 + pool = [NSAutoreleasePool new];8.261 + while( (event = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: nil8.262 + inMode: NSDefaultRunLoopMode dequeue: YES]) != nil ) {8.263 + [NSApp sendEvent: event];8.264 + }8.265 + [pool release];8.266 +8.267 + struct timeval tv;8.268 + gettimeofday(&tv,NULL);8.269 + uint32_t ns = ((tv.tv_sec - cocoa_gui_lasttv.tv_sec) * 1000000000) +8.270 + (tv.tv_usec - cocoa_gui_lasttv.tv_usec)*1000;8.271 + if( (ns * 1.05) < current_period ) {8.272 + // We've gotten ahead - sleep for a little bit8.273 + struct timespec tv;8.274 + tv.tv_sec = 0;8.275 + tv.tv_nsec = current_period - ns;8.276 + nanosleep(&tv, &tv);8.277 + }8.278 +8.279 + /* Update the display every 10 ticks (ie 10 times a second) and8.280 + * save the current tv value */8.281 + if( cocoa_gui_ticks > 10 ) {8.282 + gchar buf[32];8.283 + cocoa_gui_ticks -= 10;8.284 +8.285 + double speed = (float)( (double)current_period * 100.0 / ns );8.286 + cocoa_gui_lasttv.tv_sec = tv.tv_sec;8.287 + cocoa_gui_lasttv.tv_usec = tv.tv_usec;8.288 + snprintf( buf, 32, _("Running (%2.4f%%)"), speed );8.289 + [((LxdreamMainWindow *)[NSApp mainWindow]) setStatusText: buf];8.290 +8.291 + }8.292 + }8.293 + return nanosecs;8.294 +}8.295 +8.296 +void cocoa_gui_update( void )8.297 +{8.298 +8.299 +}8.300 +8.301 +void cocoa_gui_start( void )8.302 +{8.303 + LxdreamMainWindow *win = (LxdreamMainWindow *)[NSApp mainWindow];8.304 + [win setRunning: YES];8.305 + cocoa_gui_nanos = 0;8.306 + gettimeofday(&cocoa_gui_lasttv,NULL);8.307 +}8.308 +8.309 +void cocoa_gui_stop( void )8.310 +{8.311 + LxdreamMainWindow *win = (LxdreamMainWindow *)[NSApp mainWindow];8.312 + [win setRunning: NO];8.313 +}8.314 +8.315 +/**8.316 + * Queue a dreamcast_run() to execute after the currently event(s)8.317 + */8.318 +void cocoa_gui_run_later( void )8.319 +{8.320 + [[NSRunLoop currentRunLoop] performSelector: @selector(run_immediate)8.321 + target: [NSApp delegate] argument: nil order: 18.322 + modes: [NSArray arrayWithObject: NSDefaultRunLoopMode] ];8.323 +}8.324 \ No newline at end of file
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +00009.2 +++ b/src/cocoaui/cocoaui.h Sun Jun 01 00:47:45 2008 +00009.3 @@ -0,0 +1,44 @@9.4 +/**9.5 + * $Id$9.6 + *9.7 + * Core Cocoa-based user interface9.8 + *9.9 + * Copyright (c) 2008 Nathan Keynes.9.10 + *9.11 + * This program is free software; you can redistribute it and/or modify9.12 + * it under the terms of the GNU General Public License as published by9.13 + * the Free Software Foundation; either version 2 of the License, or9.14 + * (at your option) any later version.9.15 + *9.16 + * This program is distributed in the hope that it will be useful,9.17 + * but WITHOUT ANY WARRANTY; without even the implied warranty of9.18 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the9.19 + * GNU General Public License for more details.9.20 + */9.21 +9.22 +#import <AppKit/AppKit.h>9.23 +#include <glib/gi18n.h>9.24 +9.25 +#ifndef lxdream_cocoaui_H9.26 +#define lxdream_cocoaui_H9.27 +9.28 +#define NS_(x) [NSString stringWithUTF8String: _(x)]9.29 +9.30 +NSWindow *cocoa_gui_create_main_window();9.31 +NSView *video_osx_create_drawable();9.32 +9.33 +@interface LxdreamMainWindow : NSWindow9.34 +{9.35 + NSView *video;9.36 + NSTextField *status;9.37 + BOOL isGrabbed;9.38 +}9.39 +- (id)initWithContentRect:(NSRect)contentRect;9.40 +- (void)setStatusText:(const gchar *)text;9.41 +- (void)setRunning:(BOOL)isRunning;9.42 +- (BOOL)isGrabbed;9.43 +- (void)setIsGrabbed:(BOOL)grab;9.44 +@end9.45 +9.46 +9.47 +#endif /* lxdream_cocoaui_H */9.48 \ No newline at end of file
10.1 --- a/src/dckeysyms.h Sun Jun 01 00:46:15 2008 +000010.2 +++ b/src/dckeysyms.h Sun Jun 01 00:47:45 2008 +000010.3 @@ -22,32 +22,32 @@10.5 #define DCKB_NONE 0x0010.6 #define DCKB_ERROR 0x0110.7 -#define DCKB_A 0x0410.8 -#define DCKB_B 0x0510.9 -#define DCKB_C 0x0610.10 -#define DCKB_D 0x0710.11 -#define DCKB_E 0x0810.12 -#define DCKB_F 0x0910.13 -#define DCKB_G 0x0A10.14 -#define DCKB_H 0x0B10.15 -#define DCKB_I 0x0C10.16 -#define DCKB_J 0x0D10.17 -#define DCKB_K 0x0E10.18 -#define DCKB_L 0x0F10.19 -#define DCKB_M 0x1010.20 -#define DCKB_N 0x1110.21 -#define DCKB_O 0x1210.22 -#define DCKB_P 0x1310.23 -#define DCKB_Q 0x1410.24 -#define DCKB_R 0x1510.25 -#define DCKB_S 0x1610.26 -#define DCKB_T 0x1710.27 -#define DCKB_U 0x1810.28 -#define DCKB_V 0x1910.29 -#define DCKB_W 0x1A10.30 -#define DCKB_X 0x1B10.31 -#define DCKB_Y 0x1C10.32 -#define DCKB_Z 0x1D10.33 +#define DCKB_a 0x0410.34 +#define DCKB_b 0x0510.35 +#define DCKB_c 0x0610.36 +#define DCKB_d 0x0710.37 +#define DCKB_e 0x0810.38 +#define DCKB_f 0x0910.39 +#define DCKB_g 0x0A10.40 +#define DCKB_h 0x0B10.41 +#define DCKB_i 0x0C10.42 +#define DCKB_j 0x0D10.43 +#define DCKB_k 0x0E10.44 +#define DCKB_l 0x0F10.45 +#define DCKB_m 0x1010.46 +#define DCKB_n 0x1110.47 +#define DCKB_o 0x1210.48 +#define DCKB_p 0x1310.49 +#define DCKB_q 0x1410.50 +#define DCKB_r 0x1510.51 +#define DCKB_s 0x1610.52 +#define DCKB_t 0x1710.53 +#define DCKB_u 0x1810.54 +#define DCKB_v 0x1910.55 +#define DCKB_w 0x1A10.56 +#define DCKB_x 0x1B10.57 +#define DCKB_y 0x1C10.58 +#define DCKB_z 0x1D10.59 #define DCKB_1 0x1E10.60 #define DCKB_2 0x1F10.61 #define DCKB_3 0x2010.62 @@ -58,23 +58,23 @@10.63 #define DCKB_8 0x2510.64 #define DCKB_9 0x2610.65 #define DCKB_0 0x2710.66 -#define DCKB_ENTER 0x2810.67 -#define DCKB_ESCAPE 0x2910.68 -#define DCKB_BACKSPACE 0x2A10.69 -#define DCKB_TAB 0x2B10.70 -#define DCKB_SPACE 0x2C10.71 -#define DCKB_MINUS 0x2D10.72 -#define DCKB_EQUAL 0x2E10.73 -#define DCKB_LBRACKET 0x2F10.74 -#define DCKB_RBRACKET 0x3010.75 -#define DCKB_BACKSLASH 0x3110.76 -#define DCKB_SEMICOLON 0x3310.77 -#define DCKB_QUOTE 0x3410.78 -#define DCKB_BACKQUOTE 0x3510.79 -#define DCKB_COMMA 0x3610.80 -#define DCKB_PERIOD 0x3710.81 -#define DCKB_SLASH 0x3810.82 -#define DCKB_CAPSLOCK 0x3910.83 +#define DCKB_Return 0x2810.84 +#define DCKB_Escape 0x2910.85 +#define DCKB_BackSpace 0x2A10.86 +#define DCKB_Tab 0x2B10.87 +#define DCKB_space 0x2C10.88 +#define DCKB_minus 0x2D10.89 +#define DCKB_equal 0x2E10.90 +#define DCKB_bracketleft 0x2F10.91 +#define DCKB_bracketright 0x3010.92 +#define DCKB_backslash 0x3110.93 +#define DCKB_semicolon 0x3310.94 +#define DCKB_apostrophe 0x3410.95 +#define DCKB_grave 0x3510.96 +#define DCKB_comma 0x3610.97 +#define DCKB_period 0x3710.98 +#define DCKB_slash 0x3810.99 +#define DCKB_Caps_Lock 0x3910.100 #define DCKB_F1 0x3A10.101 #define DCKB_F2 0x3B10.102 #define DCKB_F3 0x3C10.103 @@ -87,47 +87,47 @@10.104 #define DCKB_F10 0x4310.105 #define DCKB_F11 0x4410.106 #define DCKB_F12 0x4510.107 -#define DCKB_PRINTSCR 0x4610.108 -#define DCKB_SCROLLLOCK 0x4710.109 -#define DCKB_PAUSE 0x4810.110 -#define DCKB_INSERT 0x4910.111 -#define DCKB_HOME 0x4A10.112 -#define DCKB_PAGEUP 0x4B10.113 -#define DCKB_DELETE 0x4C10.114 -#define DCKB_END 0x4D10.115 -#define DCKB_PAGEDOWN 0x4E10.116 -#define DCKB_RIGHT 0x4F10.117 -#define DCKB_LEFT 0x5010.118 -#define DCKB_DOWN 0x5110.119 -#define DCKB_UP 0x5210.120 -#define DCKB_NUMLOCK 0x5310.121 -#define DCKB_KP_SLASH 0x5410.122 -#define DCKB_KP_STAR 0x5510.123 -#define DCKB_KP_MINUS 0x5610.124 -#define DCKB_KP_PLUS 0x5710.125 -#define DCKB_KP_ENTER 0x5810.126 -#define DCKB_KP_1 0x5910.127 -#define DCKB_KP_2 0x5A10.128 -#define DCKB_KP_3 0x5B10.129 -#define DCKB_KP_4 0x5C10.130 -#define DCKB_KP_5 0x5D10.131 -#define DCKB_KP_6 0x5E10.132 -#define DCKB_KP_7 0x5F10.133 -#define DCKB_KP_8 0x6010.134 -#define DCKB_KP_9 0x6110.135 -#define DCKB_KP_0 0x6210.136 -#define DCKB_KP_PERIOD 0x6310.137 +#define DCKB_Print_Screen 0x4610.138 +#define DCKB_Scroll_Lock 0x4710.139 +#define DCKB_Pause 0x4810.140 +#define DCKB_Insert 0x4910.141 +#define DCKB_Home 0x4A10.142 +#define DCKB_Page_Up 0x4B10.143 +#define DCKB_Delete 0x4C10.144 +#define DCKB_End 0x4D10.145 +#define DCKB_Page_Down 0x4E10.146 +#define DCKB_Right 0x4F10.147 +#define DCKB_Left 0x5010.148 +#define DCKB_Down 0x5110.149 +#define DCKB_Up 0x5210.150 +#define DCKB_Num_Lock 0x5310.151 +#define DCKB_KP_Divide 0x5410.152 +#define DCKB_KP_Multiply 0x5510.153 +#define DCKB_KP_Subtract 0x5610.154 +#define DCKB_KP_Add 0x5710.155 +#define DCKB_KP_Enter 0x5810.156 +#define DCKB_KP_End 0x5910.157 +#define DCKB_KP_Down 0x5A10.158 +#define DCKB_KP_Page_Down 0x5B10.159 +#define DCKB_KP_Left 0x5C10.160 +#define DCKB_KP_Begin 0x5D10.161 +#define DCKB_KP_Right 0x5E10.162 +#define DCKB_KP_Home 0x5F10.163 +#define DCKB_KP_Up 0x6010.164 +#define DCKB_KP_Page_Up 0x6110.165 +#define DCKB_KP_Insert 0x6210.166 +#define DCKB_KP_Delete 0x6310.167 #define DCKB_S3 0x6510.169 /* Modifier keys */10.171 -#define DCKB_CONTROL_L 0xFF0110.172 -#define DCKB_SHIFT_L 0xFF0210.173 -#define DCKB_ALT_L 0xFF0410.174 -#define DCKB_S1 0xFF0810.175 -#define DCKB_CONTROL_R 0xFF1010.176 -#define DCKB_SHIFT_R 0xFF2010.177 -#define DCKB_ALT_R 0xFF4010.178 -#define DCKB_S2 0xFF8010.179 +#define DCKB_Control_L 0xFF0110.180 +#define DCKB_Shift_L 0xFF0210.181 +#define DCKB_Alt_L 0xFF0410.182 +#define DCKB_Meta_L 0xFF08 /* S1 */10.183 +#define DCKB_Control_R 0xFF1010.184 +#define DCKB_Shift_R 0xFF2010.185 +#define DCKB_Alt_R 0xFF4010.186 +#define DCKB_Meta_R 0xFF80 /* S2 */10.188 #endif /* !lxdream_dckeysyms_H */
11.1 --- a/src/display.c Sun Jun 01 00:46:15 2008 +000011.2 +++ b/src/display.c Sun Jun 01 00:47:45 2008 +000011.3 @@ -24,10 +24,14 @@11.4 #include "display.h"11.5 #include "pvr2/pvr2.h"11.7 -display_driver_t display_driver_list[] = {11.8 +display_driver_t display_driver_list[] = {11.9 #ifdef HAVE_GTK11.10 &display_gtk_driver,11.11 +#else11.12 +#ifdef HAVE_COCOA11.13 + &display_osx_driver,11.14 #endif11.15 +#endif11.16 &display_null_driver,11.17 NULL };
12.1 --- a/src/display.h Sun Jun 01 00:46:15 2008 +000012.2 +++ b/src/display.h Sun Jun 01 00:47:45 2008 +000012.3 @@ -185,8 +185,8 @@12.5 extern display_driver_t display_driver;12.7 -extern struct display_driver display_agl_driver;12.8 extern struct display_driver display_gtk_driver;12.9 +extern struct display_driver display_osx_driver;12.10 extern struct display_driver display_null_driver;12.12 /****************** Input methods **********************/
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +000013.2 +++ b/src/drivers/genkeymap.pl Sun Jun 01 00:47:45 2008 +000013.3 @@ -0,0 +1,56 @@13.4 +#!/usr/bin/perl13.5 +13.6 +use POSIX;13.7 +13.8 +my $dckeysymsfile = "dckeysyms.h";13.9 +my %dcsyms = ();13.10 +13.11 +open DCKB, "<$dckeysymsfile" || die "Unable to open keysym file $dckeysymsfile";13.12 +while(<DCKB>) {13.13 + if( /^#define\s+DCKB_([^ ]*)/ ) {13.14 + $dcsyms{$1} = "DCKB_$1";13.15 + }13.16 +}13.17 +13.18 +my %hash = ();13.19 +my %rhash = ();13.20 +my $name = shift();13.21 +while(<ARGV>) {13.22 + my ($val, $sym) = split /\s+/;13.23 + $ival = POSIX::strtol($val,0);13.24 + $hash{$ival} = $sym;13.25 + $rhash{$sym} = $ival;13.26 +}13.27 +13.28 +print "/**\n * $name keyboard map autogenerated by genkeymap.pl\n */\n\n";13.29 +13.30 +print "const gchar *${name}_keysyms_by_keycode[128] = { ";13.31 +for( $i=0; $i < 128; $i++ ) {13.32 + if( $i != 0 ) { print ", "; }13.33 + if( $hash{$i} ) {13.34 + print "\"$hash{$i}\"";13.35 + } else {13.36 + print "NULL";13.37 + }13.38 +}13.39 +print "};\n\n";13.40 +13.41 +print "const uint16_t ${name}_keycode_to_dckeysym[128] = { ";13.42 +for( $i=0; $i<128; $i++ ) {13.43 + if( $i != 0 ) { print ", "; }13.44 + if( $hash{$i} && $dcsyms{$hash{$i}} ) {13.45 + print $dcsyms{$hash{$i}};13.46 + } else {13.47 + print "DCKB_NONE";13.48 + }13.49 +}13.50 +print "};\n\n";13.51 +13.52 +my @keys = sort {uc($a) cmp uc($b)} keys %rhash;13.53 +print "#define ${name}_keysym_count " . ($#keys+1) . "\n";13.54 +print "struct ${name}_keymap_struct {\n const gchar *name;\n uint16_t keycode;\n};\n\n";13.55 +print "struct ${name}_keymap_struct ${name}_keysyms[] = { ";13.56 +foreach my $keysym (@keys) {13.57 + print "{\"$keysym\", $rhash{$keysym} }, ";13.58 +}13.59 +print "{NULL,-1} };\n\n";
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +000014.2 +++ b/src/drivers/mac_keymap.h Sun Jun 01 00:47:45 2008 +000014.3 @@ -0,0 +1,16 @@14.4 +/**14.5 + * mac keyboard map autogenerated by genkeymap.pl14.6 + */14.7 +14.8 +const gchar *mac_keysyms_by_keycode[128] = { "a", "s", "d", "f", "h", "g", "z", "x", "c", "v", NULL, "b", "q", "w", "e", "r", "y", "t", "1", "2", "3", "4", "6", "5", "equal", "9", "7", "minus", "8", NULL, "bracketright", "o", "u", "bracketleft", "i", "p", "Return", "l", "j", "apostrophe", "k", "semicolon", "backslash", "comma", "slash", "n", "m", "period", "Tab", "space", "grave", "BackSpace", NULL, "Escape", "Meta_R", "Meta_L", "Shift_L", "Caps_Lock", "Alt_L", "Control_L", "Shift_R", "Alt_R", "Control_R", "Function", NULL, "KP_Delete", NULL, "KP_Multiply", NULL, "KP_Add", NULL, "Num_Lock", NULL, NULL, NULL, "KP_Divide", "KP_Enter", NULL, "KP_Subtract", NULL, NULL, "KP_Equal", "KP_Insert", "KP_End", "KP_Down", "KP_Page_Down", "KP_Left", "KP_Begin", "KP_Right", "KP_Home", NULL, "KP_Up", "KP_Page_Up", NULL, NULL, NULL, "F5", "F6", "F7", "F3", "F8", "F9", NULL, "F11", NULL, "F13", NULL, "F14", NULL, "F10", NULL, "F12", NULL, "F15", "Insert", "Home", "Page_Up", "Delete", "F4", "End", "F2", "Page_Down", "F1", "Left", "Right", "Down", "Up", "Power"};14.9 +14.10 +const uint16_t mac_keycode_to_dckeysym[128] = { DCKB_a, DCKB_s, DCKB_d, DCKB_f, DCKB_h, DCKB_g, DCKB_z, DCKB_x, DCKB_c, DCKB_v, DCKB_NONE, DCKB_b, DCKB_q, DCKB_w, DCKB_e, DCKB_r, DCKB_y, DCKB_t, DCKB_1, DCKB_2, DCKB_3, DCKB_4, DCKB_6, DCKB_5, DCKB_equal, DCKB_9, DCKB_7, DCKB_minus, DCKB_8, DCKB_NONE, DCKB_bracketright, DCKB_o, DCKB_u, DCKB_bracketleft, DCKB_i, DCKB_p, DCKB_Return, DCKB_l, DCKB_j, DCKB_apostrophe, DCKB_k, DCKB_semicolon, DCKB_backslash, DCKB_comma, DCKB_slash, DCKB_n, DCKB_m, DCKB_period, DCKB_Tab, DCKB_space, DCKB_grave, DCKB_BackSpace, DCKB_NONE, DCKB_Escape, DCKB_Meta_R, DCKB_Meta_L, DCKB_Shift_L, DCKB_Caps_Lock, DCKB_Alt_L, DCKB_Control_L, DCKB_Shift_R, DCKB_Alt_R, DCKB_Control_R, DCKB_NONE, DCKB_NONE, DCKB_KP_Delete, DCKB_NONE, DCKB_KP_Multiply, DCKB_NONE, DCKB_KP_Add, DCKB_NONE, DCKB_Num_Lock, DCKB_NONE, DCKB_NONE, DCKB_NONE, DCKB_KP_Divide, DCKB_KP_Enter, DCKB_NONE, DCKB_KP_Subtract, DCKB_NONE, DCKB_NONE, DCKB_NONE, DCKB_KP_Insert, DCKB_KP_End, DCKB_KP_Down, DCKB_KP_Page_Down, DCKB_KP_Left, DCKB_KP_Begin, DCKB_KP_Right, DCKB_KP_Home, DCKB_NONE, DCKB_KP_Up, DCKB_KP_Page_Up, DCKB_NONE, DCKB_NONE, DCKB_NONE, DCKB_F5, DCKB_F6, DCKB_F7, DCKB_F3, DCKB_F8, DCKB_F9, DCKB_NONE, DCKB_F11, DCKB_NONE, DCKB_NONE, DCKB_NONE, DCKB_NONE, DCKB_NONE, DCKB_F10, DCKB_NONE, DCKB_F12, DCKB_NONE, DCKB_NONE, DCKB_Insert, DCKB_Home, DCKB_Page_Up, DCKB_Delete, DCKB_F4, DCKB_End, DCKB_F2, DCKB_Page_Down, DCKB_F1, DCKB_Left, DCKB_Right, DCKB_Down, DCKB_Up, DCKB_NONE};14.11 +14.12 +#define mac_keysym_count 10614.13 +struct mac_keymap_struct {14.14 + const gchar *name;14.15 + uint16_t keycode;14.16 +};14.17 +14.18 +struct mac_keymap_struct mac_keysyms[] = { {"0", 29 }, {"1", 18 }, {"2", 19 }, {"3", 20 }, {"4", 21 }, {"5", 23 }, {"6", 22 }, {"7", 26 }, {"8", 28 }, {"9", 25 }, {"a", 0 }, {"Alt_L", 58 }, {"Alt_R", 61 }, {"apostrophe", 39 }, {"b", 11 }, {"backslash", 42 }, {"BackSpace", 51 }, {"bracketleft", 33 }, {"bracketright", 30 }, {"c", 8 }, {"Caps_Lock", 57 }, {"comma", 43 }, {"Control_L", 59 }, {"Control_R", 62 }, {"d", 2 }, {"Delete", 117 }, {"Down", 125 }, {"e", 14 }, {"End", 119 }, {"equal", 24 }, {"Escape", 53 }, {"f", 3 }, {"F1", 122 }, {"F10", 109 }, {"F11", 103 }, {"F12", 111 }, {"F13", 105 }, {"F14", 107 }, {"F15", 113 }, {"F2", 120 }, {"F3", 99 }, {"F4", 118 }, {"F5", 96 }, {"F6", 97 }, {"F7", 98 }, {"F8", 100 }, {"F9", 101 }, {"Function", 63 }, {"g", 5 }, {"grave", 50 }, {"h", 4 }, {"Home", 115 }, {"i", 34 }, {"Insert", 114 }, {"j", 38 }, {"k", 40 }, {"KP_Add", 69 }, {"KP_Begin", 87 }, {"KP_Delete", 65 }, {"KP_Divide", 75 }, {"KP_Down", 84 }, {"KP_End", 83 }, {"KP_Enter", 76 }, {"KP_Equal", 81 }, {"KP_Home", 89 }, {"KP_Insert", 82 }, {"KP_Left", 86 }, {"KP_Multiply", 67 }, {"KP_Page_Down", 85 }, {"KP_Page_Up", 92 }, {"KP_Right", 88 }, {"KP_Subtract", 78 }, {"KP_Up", 91 }, {"l", 37 }, {"Left", 123 }, {"m", 46 }, {"Meta_L", 55 }, {"Meta_R", 54 }, {"minus", 27 }, {"n", 45 }, {"Num_Lock", 71 }, {"o", 31 }, {"p", 35 }, {"Page_Down", 121 }, {"Page_Up", 116 }, {"period", 47 }, {"Power", 127 }, {"q", 12 }, {"r", 15 }, {"Return", 36 }, {"Right", 124 }, {"s", 1 }, {"semicolon", 41 }, {"Shift_L", 56 }, {"Shift_R", 60 }, {"slash", 44 }, {"space", 49 }, {"t", 17 }, {"Tab", 48 }, {"u", 32 }, {"Up", 126 }, {"v", 9 }, {"w", 13 }, {"x", 7 }, {"y", 16 }, {"z", 6 }, {NULL,-1} };14.19 +
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +000015.2 +++ b/src/drivers/mac_keymap.txt Sun Jun 01 00:47:45 2008 +000015.3 @@ -0,0 +1,106 @@15.4 +0x00 a15.5 +0x01 s15.6 +0x02 d15.7 +0x03 f15.8 +0x04 h15.9 +0x05 g15.10 +0x06 z15.11 +0x07 x15.12 +0x08 c15.13 +0x09 v15.14 +0x0B b15.15 +0x0C q15.16 +0x0D w15.17 +0x0E e15.18 +0x0F r15.19 +0x10 y15.20 +0x11 t15.21 +0x12 115.22 +0x13 215.23 +0x14 315.24 +0x15 415.25 +0x16 615.26 +0x17 515.27 +0x18 equal15.28 +0x19 915.29 +0x1A 715.30 +0x1B minus15.31 +0x1C 815.32 +0x1D 015.33 +0x1E bracketright15.34 +0x1F o15.35 +0x20 u15.36 +0x21 bracketleft15.37 +0x22 i15.38 +0x23 p15.39 +0x24 Return15.40 +0x25 l15.41 +0x26 j15.42 +0x27 apostrophe15.43 +0x28 k15.44 +0x29 semicolon15.45 +0x2A backslash15.46 +0x2B comma15.47 +0x2C slash15.48 +0x2D n15.49 +0x2E m15.50 +0x2F period15.51 +0x30 Tab15.52 +0x31 space15.53 +0x32 grave15.54 +0x33 BackSpace15.55 +0x35 Escape15.56 +0x36 Meta_R15.57 +0x37 Meta_L15.58 +0x38 Shift_L15.59 +0x39 Caps_Lock15.60 +0x3A Alt_L15.61 +0x3B Control_L15.62 +0x3C Shift_R15.63 +0x3D Alt_R15.64 +0x3E Control_R15.65 +0x3F Function15.66 +0x41 KP_Delete15.67 +0x43 KP_Multiply15.68 +0x45 KP_Add15.69 +0x47 Num_Lock15.70 +0x4B KP_Divide15.71 +0x4C KP_Enter15.72 +0x4E KP_Subtract15.73 +0x51 KP_Equal15.74 +0x52 KP_Insert15.75 +0x53 KP_End15.76 +0x54 KP_Down15.77 +0x55 KP_Page_Down15.78 +0x56 KP_Left15.79 +0x57 KP_Begin15.80 +0x58 KP_Right15.81 +0x59 KP_Home15.82 +0x5B KP_Up15.83 +0x5C KP_Page_Up15.84 +0x60 F515.85 +0x61 F615.86 +0x62 F715.87 +0x63 F315.88 +0x64 F815.89 +0x65 F915.90 +0x67 F1115.91 +0x69 F1315.92 +0x6B F1415.93 +0x6D F1015.94 +0x6F F1215.95 +0x71 F1515.96 +0x72 Insert15.97 +0x73 Home15.98 +0x74 Page_Up15.99 +0x75 Delete15.100 +0x76 F415.101 +0x77 End15.102 +0x78 F215.103 +0x79 Page_Down15.104 +0x7A F115.105 +0x7B Left15.106 +0x7C Right15.107 +0x7D Down15.108 +0x7E Up15.109 +0x7F Power
16.1 --- a/src/drivers/video_gl.c Sun Jun 01 00:46:15 2008 +000016.2 +++ b/src/drivers/video_gl.c Sun Jun 01 00:47:45 2008 +000016.3 @@ -36,7 +36,9 @@16.4 glOrtho( 0, video_width, video_height, 0, 0, 65535 );16.5 glMatrixMode(GL_MODELVIEW);16.6 glLoadIdentity();16.7 + glEnable( GL_BLEND );16.8 glDisable( GL_TEXTURE_2D );16.9 + glDisable( GL_TEXTURE_RECTANGLE_ARB );16.10 glDisable( GL_ALPHA_TEST );16.11 glDisable( GL_DEPTH_TEST );16.12 glDisable( GL_SCISSOR_TEST );
17.1 --- a/src/drivers/video_glx.c Sun Jun 01 00:46:15 2008 +000017.2 +++ b/src/drivers/video_glx.c Sun Jun 01 00:47:45 2008 +000017.3 @@ -102,7 +102,7 @@17.4 glx_pbuffer_supported = (glx_version >= 103 ||17.5 isServerGLXExtensionSupported(display, screen,17.6 "GLX_SGIX_pbuffer") );17.7 -17.8 + glx_fbconfig_supported = FALSE;17.9 if( glx_fbconfig_supported ) {17.10 int nelem;17.11 int fb_attribs[] = { GLX_DRAWABLE_TYPE,
18.1 --- a/src/drivers/video_gtk.c Sun Jun 01 00:46:15 2008 +000018.2 +++ b/src/drivers/video_gtk.c Sun Jun 01 00:47:45 2008 +000018.3 @@ -158,28 +158,28 @@18.4 uint16_t video_gtk_keycode_to_dckeysym(uint16_t keycode)18.5 {18.6 if( keycode >= 'a' && keycode <= 'z' ) {18.7 - return (keycode - 'a') + DCKB_A;18.8 + return (keycode - 'a') + DCKB_a;18.9 } else if( keycode >= '1' && keycode <= '9' ) {18.10 return (keycode - '1') + DCKB_1;18.11 }18.12 switch(keycode) {18.13 case GDK_0: return DCKB_0;18.14 - case GDK_Return: return DCKB_ENTER;18.15 - case GDK_Escape: return DCKB_ESCAPE;18.16 - case GDK_BackSpace: return DCKB_BACKSPACE;18.17 - case GDK_Tab: return DCKB_TAB;18.18 - case GDK_space: return DCKB_SPACE;18.19 - case GDK_minus: return DCKB_MINUS;18.20 - case GDK_equal: return DCKB_EQUAL;18.21 - case GDK_bracketleft: return DCKB_LBRACKET;18.22 - case GDK_bracketright: return DCKB_RBRACKET;18.23 - case GDK_semicolon: return DCKB_SEMICOLON;18.24 - case GDK_apostrophe:return DCKB_QUOTE;18.25 - case GDK_grave : return DCKB_BACKQUOTE;18.26 - case GDK_comma: return DCKB_COMMA;18.27 - case GDK_period: return DCKB_PERIOD;18.28 - case GDK_slash: return DCKB_SLASH;18.29 - case GDK_Caps_Lock: return DCKB_CAPSLOCK;18.30 + case GDK_Return: return DCKB_Return;18.31 + case GDK_Escape: return DCKB_Escape;18.32 + case GDK_BackSpace: return DCKB_BackSpace;18.33 + case GDK_Tab: return DCKB_Tab;18.34 + case GDK_space: return DCKB_space;18.35 + case GDK_minus: return DCKB_minus;18.36 + case GDK_equal: return DCKB_equal;18.37 + case GDK_bracketleft: return DCKB_bracketleft;18.38 + case GDK_bracketright: return DCKB_bracketright;18.39 + case GDK_semicolon: return DCKB_semicolon;18.40 + case GDK_apostrophe:return DCKB_apostrophe;18.41 + case GDK_grave : return DCKB_grave;18.42 + case GDK_comma: return DCKB_comma;18.43 + case GDK_period: return DCKB_period;18.44 + case GDK_slash: return DCKB_slash;18.45 + case GDK_Caps_Lock: return DCKB_Caps_Lock;18.46 case GDK_F1: return DCKB_F1;18.47 case GDK_F2: return DCKB_F2;18.48 case GDK_F3: return DCKB_F3;18.49 @@ -192,44 +192,44 @@18.50 case GDK_F10: return DCKB_F10;18.51 case GDK_F11: return DCKB_F11;18.52 case GDK_F12: return DCKB_F12;18.53 - case GDK_Scroll_Lock: return DCKB_SCROLLLOCK;18.54 - case GDK_Pause: return DCKB_PAUSE;18.55 - case GDK_Insert: return DCKB_INSERT;18.56 - case GDK_Home: return DCKB_HOME;18.57 - case GDK_Page_Up: return DCKB_PAGEUP;18.58 - case GDK_Delete: return DCKB_DELETE;18.59 - case GDK_End: return DCKB_END;18.60 - case GDK_Page_Down: return DCKB_PAGEDOWN;18.61 - case GDK_Right: return DCKB_RIGHT;18.62 - case GDK_Left: return DCKB_LEFT;18.63 - case GDK_Down: return DCKB_DOWN;18.64 - case GDK_Up: return DCKB_UP;18.65 - case GDK_Num_Lock: return DCKB_NUMLOCK;18.66 - case GDK_KP_Divide: return DCKB_KP_SLASH;18.67 - case GDK_KP_Multiply: return DCKB_KP_STAR;18.68 - case GDK_KP_Subtract: return DCKB_KP_MINUS;18.69 - case GDK_KP_Add: return DCKB_KP_PLUS;18.70 - case GDK_KP_Enter: return DCKB_KP_ENTER;18.71 - case GDK_KP_End: return DCKB_KP_1;18.72 - case GDK_KP_Down: return DCKB_KP_2;18.73 - case GDK_KP_Page_Down: return DCKB_KP_3;18.74 - case GDK_KP_Left: return DCKB_KP_4;18.75 - case GDK_KP_Begin: return DCKB_KP_5;18.76 - case GDK_KP_Right: return DCKB_KP_6;18.77 - case GDK_KP_Home: return DCKB_KP_7;18.78 - case GDK_KP_Up: return DCKB_KP_8;18.79 - case GDK_KP_Page_Up:return DCKB_KP_9;18.80 - case GDK_KP_Insert: return DCKB_KP_0;18.81 - case GDK_KP_Delete: return DCKB_KP_PERIOD;18.82 - case GDK_backslash: return DCKB_BACKSLASH;18.83 - case GDK_Control_L: return DCKB_CONTROL_L;18.84 - case GDK_Shift_L: return DCKB_SHIFT_L;18.85 - case GDK_Alt_L: return DCKB_ALT_L;18.86 - case GDK_Meta_L: return DCKB_S1;18.87 - case GDK_Control_R: return DCKB_CONTROL_R;18.88 - case GDK_Shift_R: return DCKB_SHIFT_R;18.89 - case GDK_Alt_R: return DCKB_ALT_R;18.90 - case GDK_Meta_R: return DCKB_S2;18.91 + case GDK_Scroll_Lock: return DCKB_Scroll_Lock;18.92 + case GDK_Pause: return DCKB_Pause;18.93 + case GDK_Insert: return DCKB_Insert;18.94 + case GDK_Home: return DCKB_Home;18.95 + case GDK_Page_Up: return DCKB_Page_Up;18.96 + case GDK_Delete: return DCKB_Delete;18.97 + case GDK_End: return DCKB_nd;18.98 + case GDK_Page_Down: return DCKB_Page_Down;18.99 + case GDK_Right: return DCKB_Right;18.100 + case GDK_Left: return DCKB_Left;18.101 + case GDK_Down: return DCKB_Down;18.102 + case GDK_Up: return DCKB_Up;18.103 + case GDK_Num_Lock: return DCKB_Num_Lock;18.104 + case GDK_KP_Divide: return DCKB_KP_Divide;18.105 + case GDK_KP_Multiply: return DCKB_KP_Multiply;18.106 + case GDK_KP_Subtract: return DCKB_KP_Subtract;18.107 + case GDK_KP_Add: return DCKB_KP_Add;18.108 + case GDK_KP_Enter: return DCKB_KP_Enter;18.109 + case GDK_KP_End: return DCKB_KP_End;18.110 + case GDK_KP_Down: return DCKB_KP_Down;18.111 + case GDK_KP_Page_Down: return DCKB_KP_Page_Down;18.112 + case GDK_KP_Left: return DCKB_KP_Left;18.113 + case GDK_KP_Begin: return DCKB_KP_Begin;18.114 + case GDK_KP_Right: return DCKB_KP_Right;18.115 + case GDK_KP_Home: return DCKB_KP_Home;18.116 + case GDK_KP_Up: return DCKB_KP_Up;18.117 + case GDK_KP_Page_Up:return DCKB_KP_Page_Up;18.118 + case GDK_KP_Insert: return DCKB_KP_Insert;18.119 + case GDK_KP_Delete: return DCKB_KP_Delete;18.120 + case GDK_backslash: return DCKB_backslash;18.121 + case GDK_Control_L: return DCKB_Control_L;18.122 + case GDK_Shift_L: return DCKB_Shift_L;18.123 + case GDK_Alt_L: return DCKB_Alt_L;18.124 + case GDK_Meta_L: return DCKB_Meta_L;18.125 + case GDK_Control_R: return DCKB_Control_R;18.126 + case GDK_Shift_R: return DCKB_Shift_R;18.127 + case GDK_Alt_R: return DCKB_Alt_R;18.128 + case GDK_Meta_R: return DCKB_Meta_R;18.129 }18.130 return DCKB_NONE;18.131 }
19.1 --- a/src/drivers/video_nsgl.c Sun Jun 01 00:46:15 2008 +000019.2 +++ b/src/drivers/video_nsgl.c Sun Jun 01 00:47:45 2008 +000019.3 @@ -21,13 +21,14 @@19.4 #include "drivers/video_gl.h"19.5 #include "pvr2/glutil.h"19.7 -static NSOpenGLContext *nsgl_context;19.8 +static NSOpenGLContext *nsgl_context = nil;19.10 gboolean video_nsgl_init_driver( NSView *view, display_driver_t driver )19.11 {19.12 + NSAutoreleasePool *pool = [NSAutoreleasePool new];19.13 NSOpenGLPixelFormatAttribute attributes[] = {19.14 NSOpenGLPFAWindow,19.15 - NSOpenGLPFADoubleBuffer,19.16 +// NSOpenGLPFADoubleBuffer,19.17 NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)24,19.18 (NSOpenGLPixelFormatAttribute)nil };19.20 @@ -37,7 +38,7 @@19.21 [[NSOpenGLContext alloc] initWithFormat: pixelFormat shareContext: nil];19.22 [nsgl_context setView: view];19.23 [nsgl_context makeCurrentContext];19.24 -19.25 + [pool release];19.26 if( gl_fbo_is_supported() ) {19.27 gl_fbo_init(driver);19.28 } else {19.29 @@ -48,6 +49,27 @@19.30 return TRUE;19.31 }19.33 +void video_nsgl_update()19.34 +{19.35 + if( nsgl_context != nil ) {19.36 + [nsgl_context update];19.37 + }19.38 +}19.39 +19.40 +void video_nsgl_make_current()19.41 +{19.42 + if( nsgl_context != nil ) {19.43 + [nsgl_context makeCurrentContext];19.44 + }19.45 +}19.46 +19.47 +void video_nsgl_swap_buffers()19.48 +{19.49 + if( nsgl_context != nil ) {19.50 + [nsgl_context flushBuffer];19.51 + }19.52 +}19.53 +19.54 void video_nsgl_shutdown()19.55 {19.56 if( nsgl_context != nil ) {
20.1 --- a/src/drivers/video_nsgl.h Sun Jun 01 00:46:15 2008 +000020.2 +++ b/src/drivers/video_nsgl.h Sun Jun 01 00:47:45 2008 +000020.3 @@ -33,5 +33,9 @@20.4 */20.5 void video_nsgl_shutdown();20.7 +/**20.8 + * Standard front/back buffer swap20.9 + */20.10 +void video_nsgl_swap_buffers();20.12 #endif /* !video_nsgl_H */20.13 \ No newline at end of file
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +000021.2 +++ b/src/drivers/video_osx.c Sun Jun 01 00:47:45 2008 +000021.3 @@ -0,0 +1,249 @@21.4 +/**21.5 + * $Id$21.6 + *21.7 + * The OS/X side of the video support (responsible for actually displaying /21.8 + * rendering frames)21.9 + *21.10 + * Copyright (c) 2008 Nathan Keynes.21.11 + *21.12 + * This program is free software; you can redistribute it and/or modify21.13 + * it under the terms of the GNU General Public License as published by21.14 + * the Free Software Foundation; either version 2 of the License, or21.15 + * (at your option) any later version.21.16 + *21.17 + * This program is distributed in the hope that it will be useful,21.18 + * but WITHOUT ANY WARRANTY; without even the implied warranty of21.19 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the21.20 + * GNU General Public License for more details.21.21 + */21.22 +21.23 +#include <stdlib.h>21.24 +#include <string.h>21.25 +#include "lxdream.h"21.26 +#include "display.h"21.27 +#include "dckeysyms.h"21.28 +#include "cocoaui/cocoaui.h"21.29 +#include "drivers/video_nsgl.h"21.30 +#include "drivers/video_gl.h"21.31 +#include "pvr2/pvr2.h"21.32 +#import <AppKit/AppKit.h>21.33 +21.34 +#include "mac_keymap.h"21.35 +21.36 +static gboolean video_osx_init();21.37 +static void video_osx_shutdown();21.38 +static void video_osx_display_blank( uint32_t colour );21.39 +static uint16_t video_osx_resolve_keysym( const gchar *keysym );21.40 +static uint16_t video_osx_keycode_to_dckeysym(uint16_t keycode);21.41 +21.42 +struct display_driver display_osx_driver = { "osx", video_osx_init, video_osx_shutdown,21.43 + video_osx_resolve_keysym,21.44 + video_osx_keycode_to_dckeysym,21.45 + NULL,21.46 + NULL, NULL, NULL, NULL, NULL,21.47 + video_osx_display_blank, NULL };21.48 +21.49 +21.50 +static NSView *video_view = NULL;21.51 +int video_width = 640;21.52 +int video_height = 480;21.53 +21.54 +#define MAX_MASK_KEYCODE 12821.55 +21.56 +@interface LxdreamVideoView : NSView21.57 +{21.58 + BOOL isGrabbed;21.59 + int buttonMask;21.60 + int flagsMask[MAX_MASK_KEYCODE];21.61 +}21.62 +- (BOOL)isOpaque;21.63 +- (BOOL)isFlipped;21.64 +- (void)drawRect: (NSRect) rect;21.65 +@end21.66 +21.67 +@implementation LxdreamVideoView21.68 +//--------------------------------------------------------------------21.69 +- (id)initWithFrame: (NSRect)contentRect21.70 +{21.71 + if( [super initWithFrame: contentRect] != nil ) {21.72 + int i;21.73 + isGrabbed = NO;21.74 + buttonMask = 0;21.75 + for( i=0; i<MAX_MASK_KEYCODE; i++ ) {21.76 + flagsMask[i] = 0;21.77 + }21.78 + return self;21.79 + }21.80 + return nil;21.81 +}21.82 +- (BOOL)isOpaque21.83 +{21.84 + return YES;21.85 +}21.86 +- (BOOL)acceptsFirstResponder21.87 +{21.88 + return YES;21.89 +}21.90 +- (BOOL)isFlipped21.91 +{21.92 + return YES;21.93 +}21.94 +//--------------------------------------------------------------------21.95 +- (void)drawRect: (NSRect) rect21.96 +{21.97 + NSSize size = [self frame].size;21.98 + if( video_width != size.width || video_height != size.height ) {21.99 + video_width = size.width;21.100 + video_height = size.height;21.101 + video_nsgl_update();21.102 + }21.103 + pvr2_redraw_display();21.104 +}21.105 +- (void)keyDown: (NSEvent *) event21.106 +{21.107 + if( ![event isARepeat] ) {21.108 + input_event_keydown( NULL, [event keyCode]+1, 1 );21.109 + }21.110 +}21.111 +- (void)keyUp: (NSEvent *) event21.112 +{21.113 + input_event_keyup( NULL, [event keyCode]+1, 1 );21.114 +}21.115 +- (void)flagsChanged: (NSEvent *) event21.116 +{21.117 + int keycode = [event keyCode];21.118 + if ( isGrabbed && ([event modifierFlags] & NSControlKeyMask) && ([event modifierFlags] & NSAlternateKeyMask) ) {21.119 + // Release the display grab21.120 + isGrabbed = NO;21.121 + [NSCursor unhide];21.122 + CGAssociateMouseAndMouseCursorPosition(YES);21.123 + [((LxdreamMainWindow *)[self window]) setIsGrabbed: NO];21.124 + }21.125 +21.126 + if( flagsMask[keycode] == 0 ) {21.127 + input_event_keydown( NULL, keycode+1, 1 );21.128 + flagsMask[keycode] = 1;21.129 + } else {21.130 + input_event_keyup( NULL, keycode+1, 1 );21.131 + flagsMask[keycode] = 0;21.132 + }21.133 +}21.134 +- (void)mouseDown: (NSEvent *) event21.135 +{21.136 + if( isGrabbed ) {21.137 + buttonMask |= 1;21.138 + input_event_mouse( buttonMask, 0, 0 );21.139 + } else { // take display grab21.140 + isGrabbed = YES;21.141 + [NSCursor hide];21.142 + CGAssociateMouseAndMouseCursorPosition(NO);21.143 + [((LxdreamMainWindow *)[self window]) setIsGrabbed: YES];21.144 + }21.145 +}21.146 +- (void)mouseUp: (NSEvent *)event21.147 +{21.148 + buttonMask &= ~1;21.149 + input_event_mouse( buttonMask, 0, 0 );21.150 +}21.151 +21.152 +- (void)rightMouseDown: (NSEvent *) event21.153 +{21.154 + buttonMask |= 2;21.155 + input_event_mouse( buttonMask, 0, 0 );21.156 +}21.157 +- (void)rightMouseUp: (NSEvent *)event21.158 +{21.159 + buttonMask &= ~2;21.160 + input_event_mouse( buttonMask, 0, 0 );21.161 +}21.162 +- (void)otherMouseDown: (NSEvent *) event21.163 +{21.164 + buttonMask |= (1<< [event buttonNumber] );21.165 + input_event_mouse( buttonMask, 0, 0 );21.166 +}21.167 +- (void)otherMouseUp: (NSEvent *) event21.168 +{21.169 + buttonMask &= ~(1<< [event buttonNumber] );21.170 + input_event_mouse( buttonMask, 0, 0 );21.171 +}21.172 +- (void)mouseMoved: (NSEvent *) event21.173 +{21.174 + if( isGrabbed ) {21.175 + input_event_mouse( buttonMask, [event deltaX], [event deltaY] );21.176 + }21.177 +}21.178 +- (void)mouseDragged: (NSEvent *) event21.179 +{21.180 + if( isGrabbed ) {21.181 + input_event_mouse( buttonMask, [event deltaX], [event deltaY] );21.182 + }21.183 +}21.184 +- (void)rightMouseDragged: (NSEvent *) event21.185 +{21.186 + if( isGrabbed ) {21.187 + input_event_mouse( buttonMask, [event deltaX], [event deltaY] );21.188 + }21.189 +}21.190 +- (void)otherMouseDragged: (NSEvent *) event21.191 +{21.192 + if( isGrabbed ) {21.193 + input_event_mouse( buttonMask, [event deltaX], [event deltaY] );21.194 + }21.195 +}21.196 +21.197 +@end21.198 +21.199 +NSView *video_osx_create_drawable()21.200 +{21.201 + NSRect contentRect = {{0,0},{640,480}};21.202 + video_view = [[LxdreamVideoView alloc] initWithFrame: contentRect];21.203 + [video_view setAutoresizingMask: (NSViewWidthSizable|NSViewHeightSizable)];21.204 + return video_view;21.205 +}21.206 +21.207 +static gboolean video_osx_init()21.208 +{21.209 + if( video_view == NULL ) {21.210 + return FALSE;21.211 + }21.212 + if( !video_nsgl_init_driver(video_view, &display_osx_driver) ) {21.213 + return FALSE;21.214 + }21.215 + pvr2_setup_gl_context();21.216 + return TRUE;21.217 +}21.218 +21.219 +static void video_osx_shutdown()21.220 +{21.221 +}21.222 +21.223 +static void video_osx_display_blank( uint32_t colour )21.224 +{21.225 +}21.226 +21.227 +static int mac_keymap_cmp(const void *a, const void *b)21.228 +{21.229 + const gchar *key = a;21.230 + const struct mac_keymap_struct *kb = b;21.231 + return strcasecmp(key, kb->name);21.232 +}21.233 +21.234 +static uint16_t video_osx_resolve_keysym( const gchar *keysym )21.235 +{21.236 + struct mac_keymap_struct *result = bsearch( keysym, mac_keysyms, mac_keysym_count, sizeof(struct mac_keymap_struct), mac_keymap_cmp );21.237 + if( result == NULL ) {21.238 + return 0;21.239 + } else {21.240 + return result->keycode + 1;21.241 + }21.242 +}21.243 +21.244 +static uint16_t video_osx_keycode_to_dckeysym(uint16_t keycode)21.245 +{21.246 + if( keycode < 1 || keycode > 128 ) {21.247 + return DCKB_NONE;21.248 + } else {21.249 + return mac_keycode_to_dckeysym[keycode-1];21.250 + }21.251 +}21.252 +
22.1 --- a/src/gtkui/gtkui.c Sun Jun 01 00:46:15 2008 +000022.2 +++ b/src/gtkui/gtkui.c Sun Jun 01 00:47:45 2008 +000022.3 @@ -240,10 +240,14 @@22.4 }22.5 }22.7 -void gui_main_loop(void)22.8 +void gui_main_loop( gboolean run )22.9 {22.10 gtk_gui_update();22.11 - gtk_main();22.12 + if( run ) {22.13 + dreamcast_run();22.14 + } else {22.15 + gtk_main();22.16 + }22.17 }22.19 void gui_update_state(void)
23.1 --- a/src/gui.h Sun Jun 01 00:46:15 2008 +000023.2 +++ b/src/gui.h Sun Jun 01 00:47:45 2008 +000023.3 @@ -44,8 +44,10 @@23.4 /**23.5 * Enter the GUI main loop. If this method ever returns, the system will23.6 * exit normally.23.7 + *23.8 + * @param run TRUE if the system should start running immediately, otherwise23.9 */23.10 -void gui_main_loop(void);23.11 +void gui_main_loop( gboolean run );23.13 gboolean gui_error_dialog( const char *fmt, ... );
24.1 --- a/src/hook.h Sun Jun 01 00:46:15 2008 +000024.2 +++ b/src/hook.h Sun Jun 01 00:47:45 2008 +000024.3 @@ -79,4 +79,4 @@24.4 }24.7 -#endif /* !lxdream_hook_H */24.8 \ No newline at end of file24.9 +#endif /* !lxdream_hook_H */
25.1 --- a/src/main.c Sun Jun 01 00:46:15 2008 +000025.2 +++ b/src/main.c Sun Jun 01 00:47:45 2008 +000025.3 @@ -204,6 +204,7 @@25.5 sh4_set_use_xlat( use_xlat );25.7 + /*25.8 if( start_immediately ) {25.9 if( dreamcast_can_run() ) {25.10 if( time_nanos != 0 || time_secs != 0 ) {25.11 @@ -217,8 +218,9 @@25.12 ERROR( "Unable to start dreamcast: no program/bios loaded" );25.13 }25.14 }25.15 + */25.16 if( !headless ) {25.17 - gui_main_loop();25.18 + gui_main_loop( start_immediately && dreamcast_can_run() );25.19 }25.20 dreamcast_shutdown();25.21 return 0;
.