revision 924:195577c0445c
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 924:195577c0445c |
parent | 923:13ac59a786f4 |
child | 925:7cbcc51db63d |
author | nkeynes |
date | Thu Dec 11 23:29:12 2008 +0000 (13 years ago) |
Commit configure (missed from previous commit)
1.1 --- a/configure Thu Dec 11 23:28:50 2008 +00001.2 +++ b/configure Thu Dec 11 23:29:12 2008 +00001.3 @@ -6657,11 +6657,6 @@1.4 _ACEOF1.6 fi1.7 -1.8 -cat >>confdefs.h <<\_ACEOF1.9 -#define HAVE_FASTCALL 11.10 -_ACEOF1.11 -1.12 else1.13 CFLAGS="-g3"1.14 fi1.15 @@ -6676,6 +6671,81 @@1.16 fi1.19 +{ $as_echo "$as_me:$LINENO: checking support for fastcall calling conventions" >&51.20 +$as_echo_n "checking support for fastcall calling conventions... " >&6; };1.21 +if test "$cross_compiling" = yes; then1.22 + { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling1.23 +See \`config.log' for more details." >&51.24 +$as_echo "$as_me: error: cannot run test program while cross compiling1.25 +See \`config.log' for more details." >&2;}1.26 + { (exit 1); exit 1; }; }1.27 +else1.28 + cat >conftest.$ac_ext <<_ACEOF1.29 +1.30 + /* confdefs.h. */1.31 +_ACEOF1.32 +cat confdefs.h >>conftest.$ac_ext1.33 +cat >>conftest.$ac_ext <<_ACEOF1.34 +/* end confdefs.h. */1.35 +1.36 +int __attribute__((regparm(3))) foo(int a, int b) { return a+b; }1.37 +1.38 +int main(int argc, char *argv[])1.39 +{1.40 + return foo( 1, 2 ) == 3 ? 0 : 1;1.41 +}1.42 +_ACEOF1.43 +rm -f conftest$ac_exeext1.44 +if { (ac_try="$ac_link"1.45 +case "(($ac_try" in1.46 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;1.47 + *) ac_try_echo=$ac_try;;1.48 +esac1.49 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""1.50 +$as_echo "$ac_try_echo") >&51.51 + (eval "$ac_link") 2>&51.52 + ac_status=$?1.53 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&51.54 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext'1.55 + { (case "(($ac_try" in1.56 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;1.57 + *) ac_try_echo=$ac_try;;1.58 +esac1.59 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""1.60 +$as_echo "$ac_try_echo") >&51.61 + (eval "$ac_try") 2>&51.62 + ac_status=$?1.63 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&51.64 + (exit $ac_status); }; }; then1.65 +1.66 + { $as_echo "$as_me:$LINENO: result: yes" >&51.67 +$as_echo "yes" >&6; }1.68 +1.69 +1.70 +cat >>confdefs.h <<\_ACEOF1.71 +#define HAVE_FASTCALL 11.72 +_ACEOF1.73 +1.74 +1.75 +else1.76 + $as_echo "$as_me: program exited with status $ac_status" >&51.77 +$as_echo "$as_me: failed program was:" >&51.78 +sed 's/^/| /' conftest.$ac_ext >&51.79 +1.80 +( exit $ac_status )1.81 +1.82 + { $as_echo "$as_me:$LINENO: result: no" >&51.83 +$as_echo "no" >&6; }1.84 +1.85 +fi1.86 +rm -rf conftest.dSYM1.87 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext1.88 +fi1.89 +1.90 +1.91 +1.92 +1.93 +1.95 lxdream_save_cppflags="$CPPFLAGS"1.96 CPPFLAGS="$CPPFLAGS -x objective-c"1.97 @@ -7019,11 +7089,10 @@1.98 { $as_echo "$as_me:$LINENO: checking for LIBPNG" >&51.99 $as_echo_n "checking for LIBPNG... " >&6; }1.101 -if test -n "$PKG_CONFIG"; then1.102 - if test -n "$LIBPNG_CFLAGS"; then1.103 - pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"1.104 - else1.105 - if test -n "$PKG_CONFIG" && \1.106 +if test -n "$LIBPNG_CFLAGS"; then1.107 + pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"1.108 + elif test -n "$PKG_CONFIG"; then1.109 + if test -n "$PKG_CONFIG" && \1.110 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&51.111 ($PKG_CONFIG --exists --print-errors "libpng ") 2>&51.112 ac_status=$?1.113 @@ -7033,15 +7102,13 @@1.114 else1.115 pkg_failed=yes1.116 fi1.117 - fi1.118 -else1.119 - pkg_failed=untried1.120 -fi1.121 -if test -n "$PKG_CONFIG"; then1.122 - if test -n "$LIBPNG_LIBS"; then1.123 - pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"1.124 - else1.125 - if test -n "$PKG_CONFIG" && \1.126 + else1.127 + pkg_failed=untried1.128 +fi1.129 +if test -n "$LIBPNG_LIBS"; then1.130 + pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"1.131 + elif test -n "$PKG_CONFIG"; then1.132 + if test -n "$PKG_CONFIG" && \1.133 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng \"") >&51.134 ($PKG_CONFIG --exists --print-errors "libpng ") 2>&51.135 ac_status=$?1.136 @@ -7051,9 +7118,8 @@1.137 else1.138 pkg_failed=yes1.139 fi1.140 - fi1.141 -else1.142 - pkg_failed=untried1.143 + else1.144 + pkg_failed=untried1.145 fi1.148 @@ -7066,9 +7132,9 @@1.149 _pkg_short_errors_supported=no1.150 fi1.151 if test $_pkg_short_errors_supported = yes; then1.152 - LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng "`1.153 + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng " 2>&1`1.154 else1.155 - LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng "`1.156 + LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng " 2>&1`1.157 fi1.158 # Put the nasty error message in config.log where it belongs1.159 echo "$LIBPNG_PKG_ERRORS" >&51.160 @@ -7212,11 +7278,10 @@1.161 { $as_echo "$as_me:$LINENO: checking for GLIB" >&51.162 $as_echo_n "checking for GLIB... " >&6; }1.164 -if test -n "$PKG_CONFIG"; then1.165 - if test -n "$GLIB_CFLAGS"; then1.166 - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"1.167 - else1.168 - if test -n "$PKG_CONFIG" && \1.169 +if test -n "$GLIB_CFLAGS"; then1.170 + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"1.171 + elif test -n "$PKG_CONFIG"; then1.172 + if test -n "$PKG_CONFIG" && \1.173 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&51.174 ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&51.175 ac_status=$?1.176 @@ -7226,15 +7291,13 @@1.177 else1.178 pkg_failed=yes1.179 fi1.180 - fi1.181 -else1.182 - pkg_failed=untried1.183 -fi1.184 -if test -n "$PKG_CONFIG"; then1.185 - if test -n "$GLIB_LIBS"; then1.186 - pkg_cv_GLIB_LIBS="$GLIB_LIBS"1.187 - else1.188 - if test -n "$PKG_CONFIG" && \1.189 + else1.190 + pkg_failed=untried1.191 +fi1.192 +if test -n "$GLIB_LIBS"; then1.193 + pkg_cv_GLIB_LIBS="$GLIB_LIBS"1.194 + elif test -n "$PKG_CONFIG"; then1.195 + if test -n "$PKG_CONFIG" && \1.196 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&51.197 ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&51.198 ac_status=$?1.199 @@ -7244,9 +7307,8 @@1.200 else1.201 pkg_failed=yes1.202 fi1.203 - fi1.204 -else1.205 - pkg_failed=untried1.206 + else1.207 + pkg_failed=untried1.208 fi1.211 @@ -7259,9 +7321,9 @@1.212 _pkg_short_errors_supported=no1.213 fi1.214 if test $_pkg_short_errors_supported = yes; then1.215 - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`1.216 + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1`1.217 else1.218 - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`1.219 + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`1.220 fi1.221 # Put the nasty error message in config.log where it belongs1.222 echo "$GLIB_PKG_ERRORS" >&51.223 @@ -7324,11 +7386,10 @@1.224 { $as_echo "$as_me:$LINENO: checking for GTK" >&51.225 $as_echo_n "checking for GTK... " >&6; }1.227 -if test -n "$PKG_CONFIG"; then1.228 - if test -n "$GTK_CFLAGS"; then1.229 - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"1.230 - else1.231 - if test -n "$PKG_CONFIG" && \1.232 +if test -n "$GTK_CFLAGS"; then1.233 + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"1.234 + elif test -n "$PKG_CONFIG"; then1.235 + if test -n "$PKG_CONFIG" && \1.236 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&51.237 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&51.238 ac_status=$?1.239 @@ -7338,15 +7399,13 @@1.240 else1.241 pkg_failed=yes1.242 fi1.243 - fi1.244 -else1.245 - pkg_failed=untried1.246 -fi1.247 -if test -n "$PKG_CONFIG"; then1.248 - if test -n "$GTK_LIBS"; then1.249 - pkg_cv_GTK_LIBS="$GTK_LIBS"1.250 - else1.251 - if test -n "$PKG_CONFIG" && \1.252 + else1.253 + pkg_failed=untried1.254 +fi1.255 +if test -n "$GTK_LIBS"; then1.256 + pkg_cv_GTK_LIBS="$GTK_LIBS"1.257 + elif test -n "$PKG_CONFIG"; then1.258 + if test -n "$PKG_CONFIG" && \1.259 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&51.260 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&51.261 ac_status=$?1.262 @@ -7356,9 +7415,8 @@1.263 else1.264 pkg_failed=yes1.265 fi1.266 - fi1.267 -else1.268 - pkg_failed=untried1.269 + else1.270 + pkg_failed=untried1.271 fi1.274 @@ -7371,9 +7429,9 @@1.275 _pkg_short_errors_supported=no1.276 fi1.277 if test $_pkg_short_errors_supported = yes; then1.278 - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`1.279 + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1`1.280 else1.281 - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`1.282 + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1`1.283 fi1.284 # Put the nasty error message in config.log where it belongs1.285 echo "$GTK_PKG_ERRORS" >&51.286 @@ -8890,11 +8948,10 @@1.287 { $as_echo "$as_me:$LINENO: checking for PULSE" >&51.288 $as_echo_n "checking for PULSE... " >&6; }1.290 -if test -n "$PKG_CONFIG"; then1.291 - if test -n "$PULSE_CFLAGS"; then1.292 - pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"1.293 - else1.294 - if test -n "$PKG_CONFIG" && \1.295 +if test -n "$PULSE_CFLAGS"; then1.296 + pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"1.297 + elif test -n "$PKG_CONFIG"; then1.298 + if test -n "$PKG_CONFIG" && \1.299 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&51.300 ($PKG_CONFIG --exists --print-errors "libpulse-simple") 2>&51.301 ac_status=$?1.302 @@ -8904,15 +8961,13 @@1.303 else1.304 pkg_failed=yes1.305 fi1.306 - fi1.307 -else1.308 - pkg_failed=untried1.309 -fi1.310 -if test -n "$PKG_CONFIG"; then1.311 - if test -n "$PULSE_LIBS"; then1.312 - pkg_cv_PULSE_LIBS="$PULSE_LIBS"1.313 - else1.314 - if test -n "$PKG_CONFIG" && \1.315 + else1.316 + pkg_failed=untried1.317 +fi1.318 +if test -n "$PULSE_LIBS"; then1.319 + pkg_cv_PULSE_LIBS="$PULSE_LIBS"1.320 + elif test -n "$PKG_CONFIG"; then1.321 + if test -n "$PKG_CONFIG" && \1.322 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse-simple\"") >&51.323 ($PKG_CONFIG --exists --print-errors "libpulse-simple") 2>&51.324 ac_status=$?1.325 @@ -8922,9 +8977,8 @@1.326 else1.327 pkg_failed=yes1.328 fi1.329 - fi1.330 -else1.331 - pkg_failed=untried1.332 + else1.333 + pkg_failed=untried1.334 fi1.337 @@ -8937,9 +8991,9 @@1.338 _pkg_short_errors_supported=no1.339 fi1.340 if test $_pkg_short_errors_supported = yes; then1.341 - PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse-simple"`1.342 + PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse-simple" 2>&1`1.343 else1.344 - PULSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse-simple"`1.345 + PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse-simple" 2>&1`1.346 fi1.347 # Put the nasty error message in config.log where it belongs1.348 echo "$PULSE_PKG_ERRORS" >&51.349 @@ -8998,11 +9052,10 @@1.350 { $as_echo "$as_me:$LINENO: checking for ESOUND" >&51.351 $as_echo_n "checking for ESOUND... " >&6; }1.353 -if test -n "$PKG_CONFIG"; then1.354 - if test -n "$ESOUND_CFLAGS"; then1.355 - pkg_cv_ESOUND_CFLAGS="$ESOUND_CFLAGS"1.356 - else1.357 - if test -n "$PKG_CONFIG" && \1.358 +if test -n "$ESOUND_CFLAGS"; then1.359 + pkg_cv_ESOUND_CFLAGS="$ESOUND_CFLAGS"1.360 + elif test -n "$PKG_CONFIG"; then1.361 + if test -n "$PKG_CONFIG" && \1.362 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&51.363 ($PKG_CONFIG --exists --print-errors "esound") 2>&51.364 ac_status=$?1.365 @@ -9012,15 +9065,13 @@1.366 else1.367 pkg_failed=yes1.368 fi1.369 - fi1.370 -else1.371 - pkg_failed=untried1.372 -fi1.373 -if test -n "$PKG_CONFIG"; then1.374 - if test -n "$ESOUND_LIBS"; then1.375 - pkg_cv_ESOUND_LIBS="$ESOUND_LIBS"1.376 - else1.377 - if test -n "$PKG_CONFIG" && \1.378 + else1.379 + pkg_failed=untried1.380 +fi1.381 +if test -n "$ESOUND_LIBS"; then1.382 + pkg_cv_ESOUND_LIBS="$ESOUND_LIBS"1.383 + elif test -n "$PKG_CONFIG"; then1.384 + if test -n "$PKG_CONFIG" && \1.385 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"esound\"") >&51.386 ($PKG_CONFIG --exists --print-errors "esound") 2>&51.387 ac_status=$?1.388 @@ -9030,9 +9081,8 @@1.389 else1.390 pkg_failed=yes1.391 fi1.392 - fi1.393 -else1.394 - pkg_failed=untried1.395 + else1.396 + pkg_failed=untried1.397 fi1.400 @@ -9045,9 +9095,9 @@1.401 _pkg_short_errors_supported=no1.402 fi1.403 if test $_pkg_short_errors_supported = yes; then1.404 - ESOUND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "esound"`1.405 + ESOUND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "esound" 2>&1`1.406 else1.407 - ESOUND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "esound"`1.408 + ESOUND_PKG_ERRORS=`$PKG_CONFIG --print-errors "esound" 2>&1`1.409 fi1.410 # Put the nasty error message in config.log where it belongs1.411 echo "$ESOUND_PKG_ERRORS" >&51.412 @@ -9105,11 +9155,10 @@1.413 { $as_echo "$as_me:$LINENO: checking for ALSA" >&51.414 $as_echo_n "checking for ALSA... " >&6; }1.416 -if test -n "$PKG_CONFIG"; then1.417 - if test -n "$ALSA_CFLAGS"; then1.418 - pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"1.419 - else1.420 - if test -n "$PKG_CONFIG" && \1.421 +if test -n "$ALSA_CFLAGS"; then1.422 + pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"1.423 + elif test -n "$PKG_CONFIG"; then1.424 + if test -n "$PKG_CONFIG" && \1.425 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&51.426 ($PKG_CONFIG --exists --print-errors "alsa") 2>&51.427 ac_status=$?1.428 @@ -9119,15 +9168,13 @@1.429 else1.430 pkg_failed=yes1.431 fi1.432 - fi1.433 -else1.434 - pkg_failed=untried1.435 -fi1.436 -if test -n "$PKG_CONFIG"; then1.437 - if test -n "$ALSA_LIBS"; then1.438 - pkg_cv_ALSA_LIBS="$ALSA_LIBS"1.439 - else1.440 - if test -n "$PKG_CONFIG" && \1.441 + else1.442 + pkg_failed=untried1.443 +fi1.444 +if test -n "$ALSA_LIBS"; then1.445 + pkg_cv_ALSA_LIBS="$ALSA_LIBS"1.446 + elif test -n "$PKG_CONFIG"; then1.447 + if test -n "$PKG_CONFIG" && \1.448 { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa\"") >&51.449 ($PKG_CONFIG --exists --print-errors "alsa") 2>&51.450 ac_status=$?1.451 @@ -9137,9 +9184,8 @@1.452 else1.453 pkg_failed=yes1.454 fi1.455 - fi1.456 -else1.457 - pkg_failed=untried1.458 + else1.459 + pkg_failed=untried1.460 fi1.463 @@ -9152,9 +9198,9 @@1.464 _pkg_short_errors_supported=no1.465 fi1.466 if test $_pkg_short_errors_supported = yes; then1.467 - ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa"`1.468 + ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`1.469 else1.470 - ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa"`1.471 + ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`1.472 fi1.473 # Put the nasty error message in config.log where it belongs1.474 echo "$ALSA_PKG_ERRORS" >&51.475 @@ -10136,7 +10182,7 @@1.477 fi1.478 fi1.479 - USE_NLS=yes1.480 + USE_NLS=yes1.483 gt_cv_have_gettext=no1.484 @@ -11155,8 +11201,8 @@1.485 "Content-Transfer-Encoding: 8bit\n"1.487 _ACEOF1.488 -if { ($as_echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&51.489 - (msgfmt -c -o /dev/null conftest.foo) 2>&51.490 +if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&51.491 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&51.492 ac_status=$?1.493 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&51.494 (exit $ac_status); }; then
.