lxdream 0.9.1revision 977:8514fb4bc101
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz | changeset | 977:8514fb4bc101 |
| parent | 976:e57a25d9eb7d |
| child | 978:eed5089fcfdb |
| author | nkeynes |
| date | Mon Feb 02 01:40:13 2009 +0000 (13 years ago) |
Fix Objective-C checking to be a little more circumspec (to whit, not aborting if no
OBJC compiler is found) - slightly tricky becuase AC_CHECK_HEADER was requiring
preprocessor checks, which ran before we checked if there was in fact an OBJC compiler
in the first place... Fix there was to change the AC_CHECK_HEADER invocation to use the
new (compiler-only) style.
OBJC compiler is found) - slightly tricky becuase AC_CHECK_HEADER was requiring
preprocessor checks, which ran before we checked if there was in fact an OBJC compiler
in the first place... Fix there was to change the AC_CHECK_HEADER invocation to use the
new (compiler-only) style.
 | acinclude.m4 | view | annotate | diff | log | |
| configure | view | annotate | diff | log | |
| configure.in | view | annotate | diff | log |
1.1 --- a/acinclude.m4 Mon Jan 26 12:32:23 2009 +00001.2 +++ b/acinclude.m4 Mon Feb 02 01:40:13 2009 +00001.3 @@ -89,3 +89,17 @@1.4 [ $3 ]1.5 fi1.6 ]);1.7 +1.8 +# AC_HAVE_OBJC([if-present],[if-not-present])1.9 +# Check if we have a working Objective-C compiler1.10 +AC_DEFUN([AC_HAVE_OBJC], [1.11 +AC_PROG_OBJC1.12 +AC_MSG_CHECKING([for a working Objective-C compiler])1.13 +AC_LANG_PUSH([Objective C])dnl1.14 +_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@interface Foo @end]], [])],1.15 + [AC_MSG_RESULT([yes])1.16 + $1 ],1.17 + [AC_MSG_RESULT([No])1.18 + $2 ]);1.19 +AC_LANG_POP([Objective C])1.20 +]);
2.1 --- a/configure Mon Jan 26 12:32:23 2009 +00002.2 +++ b/configure Mon Feb 02 01:40:13 2009 +00002.3 @@ -734,7 +734,6 @@2.4 am__fastdepOBJC_FALSE2.5 POD2MAN2.6 POD2HTML2.7 -OBJCPP2.8 GUI_COCOA_TRUE2.9 GUI_COCOA_FALSE2.10 PKG_CONFIG2.11 @@ -835,7 +834,6 @@2.12 CCAS2.13 CCASFLAGS2.14 CPP2.15 -OBJCPP2.16 PKG_CONFIG2.17 LIBPNG_CFLAGS2.18 LIBPNG_LIBS2.19 @@ -1514,7 +1512,6 @@2.20 CCAS assembler compiler command (defaults to CC)2.21 CCASFLAGS assembler compiler flags (defaults to CFLAGS)2.22 CPP C preprocessor2.23 - OBJCPP Objective C preprocessor2.24 PKG_CONFIG path to pkg-config utility2.25 LIBPNG_CFLAGS2.26 C compiler flags for LIBPNG, overriding pkg-config2.27 @@ -7214,6 +7211,551 @@2.28 fi2.31 +2.32 +2.33 +2.34 +ac_ext=m2.35 +ac_cpp='$OBJCPP $CPPFLAGS'2.36 +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.37 +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.38 +ac_compiler_gnu=$ac_cv_objc_compiler_gnu2.39 +if test -n "$ac_tool_prefix"; then2.40 + for ac_prog in gcc objcc objc cc CC2.41 + do2.42 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.2.43 +set dummy $ac_tool_prefix$ac_prog; ac_word=$22.44 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&52.45 +$as_echo_n "checking for $ac_word... " >&6; }2.46 +if test "${ac_cv_prog_OBJC+set}" = set; then2.47 + $as_echo_n "(cached) " >&62.48 +else2.49 + if test -n "$OBJC"; then2.50 + ac_cv_prog_OBJC="$OBJC" # Let the user override the test.2.51 +else2.52 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR2.53 +for as_dir in $PATH2.54 +do2.55 + IFS=$as_save_IFS2.56 + test -z "$as_dir" && as_dir=.2.57 + for ac_exec_ext in '' $ac_executable_extensions; do2.58 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then2.59 + ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"2.60 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52.61 + break 22.62 + fi2.63 +done2.64 +done2.65 +IFS=$as_save_IFS2.66 +2.67 +fi2.68 +fi2.69 +OBJC=$ac_cv_prog_OBJC2.70 +if test -n "$OBJC"; then2.71 + { $as_echo "$as_me:$LINENO: result: $OBJC" >&52.72 +$as_echo "$OBJC" >&6; }2.73 +else2.74 + { $as_echo "$as_me:$LINENO: result: no" >&52.75 +$as_echo "no" >&6; }2.76 +fi2.77 +2.78 +2.79 + test -n "$OBJC" && break2.80 + done2.81 +fi2.82 +if test -z "$OBJC"; then2.83 + ac_ct_OBJC=$OBJC2.84 + for ac_prog in gcc objcc objc cc CC2.85 +do2.86 + # Extract the first word of "$ac_prog", so it can be a program name with args.2.87 +set dummy $ac_prog; ac_word=$22.88 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&52.89 +$as_echo_n "checking for $ac_word... " >&6; }2.90 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then2.91 + $as_echo_n "(cached) " >&62.92 +else2.93 + if test -n "$ac_ct_OBJC"; then2.94 + ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # Let the user override the test.2.95 +else2.96 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR2.97 +for as_dir in $PATH2.98 +do2.99 + IFS=$as_save_IFS2.100 + test -z "$as_dir" && as_dir=.2.101 + for ac_exec_ext in '' $ac_executable_extensions; do2.102 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then2.103 + ac_cv_prog_ac_ct_OBJC="$ac_prog"2.104 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&52.105 + break 22.106 + fi2.107 +done2.108 +done2.109 +IFS=$as_save_IFS2.110 +2.111 +fi2.112 +fi2.113 +ac_ct_OBJC=$ac_cv_prog_ac_ct_OBJC2.114 +if test -n "$ac_ct_OBJC"; then2.115 + { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJC" >&52.116 +$as_echo "$ac_ct_OBJC" >&6; }2.117 +else2.118 + { $as_echo "$as_me:$LINENO: result: no" >&52.119 +$as_echo "no" >&6; }2.120 +fi2.121 +2.122 +2.123 + test -n "$ac_ct_OBJC" && break2.124 +done2.125 +2.126 + if test "x$ac_ct_OBJC" = x; then2.127 + OBJC="gcc"2.128 + else2.129 + case $cross_compiling:$ac_tool_warned in2.130 +yes:)2.131 +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools2.132 +whose name does not start with the host triplet. If you think this2.133 +configuration is useful to you, please write to autoconf@gnu.org." >&52.134 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools2.135 +whose name does not start with the host triplet. If you think this2.136 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}2.137 +ac_tool_warned=yes ;;2.138 +esac2.139 + OBJC=$ac_ct_OBJC2.140 + fi2.141 +fi2.142 +2.143 +# Provide some information about the compiler.2.144 +$as_echo "$as_me:$LINENO: checking for Objective C compiler version" >&52.145 +set X $ac_compile2.146 +ac_compiler=$22.147 +{ (ac_try="$ac_compiler --version >&5"2.148 +case "(($ac_try" in2.149 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.150 + *) ac_try_echo=$ac_try;;2.151 +esac2.152 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.153 +$as_echo "$ac_try_echo") >&52.154 + (eval "$ac_compiler --version >&5") 2>&52.155 + ac_status=$?2.156 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.157 + (exit $ac_status); }2.158 +{ (ac_try="$ac_compiler -v >&5"2.159 +case "(($ac_try" in2.160 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.161 + *) ac_try_echo=$ac_try;;2.162 +esac2.163 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.164 +$as_echo "$ac_try_echo") >&52.165 + (eval "$ac_compiler -v >&5") 2>&52.166 + ac_status=$?2.167 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.168 + (exit $ac_status); }2.169 +{ (ac_try="$ac_compiler -V >&5"2.170 +case "(($ac_try" in2.171 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.172 + *) ac_try_echo=$ac_try;;2.173 +esac2.174 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.175 +$as_echo "$ac_try_echo") >&52.176 + (eval "$ac_compiler -V >&5") 2>&52.177 + ac_status=$?2.178 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.179 + (exit $ac_status); }2.180 +2.181 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Objective C compiler" >&52.182 +$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }2.183 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then2.184 + $as_echo_n "(cached) " >&62.185 +else2.186 + cat >conftest.$ac_ext <<_ACEOF2.187 +/* confdefs.h. */2.188 +_ACEOF2.189 +cat confdefs.h >>conftest.$ac_ext2.190 +cat >>conftest.$ac_ext <<_ACEOF2.191 +/* end confdefs.h. */2.192 +2.193 +int2.194 +main ()2.195 +{2.196 +#ifndef __GNUC__2.197 + choke me2.198 +#endif2.199 +2.200 + ;2.201 + return 0;2.202 +}2.203 +_ACEOF2.204 +rm -f conftest.$ac_objext2.205 +if { (ac_try="$ac_compile"2.206 +case "(($ac_try" in2.207 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.208 + *) ac_try_echo=$ac_try;;2.209 +esac2.210 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.211 +$as_echo "$ac_try_echo") >&52.212 + (eval "$ac_compile") 2>conftest.er12.213 + ac_status=$?2.214 + grep -v '^ *+' conftest.er1 >conftest.err2.215 + rm -f conftest.er12.216 + cat conftest.err >&52.217 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.218 + (exit $ac_status); } && {2.219 + test -z "$ac_objc_werror_flag" ||2.220 + test ! -s conftest.err2.221 + } && test -s conftest.$ac_objext; then2.222 + ac_compiler_gnu=yes2.223 +else2.224 + $as_echo "$as_me: failed program was:" >&52.225 +sed 's/^/| /' conftest.$ac_ext >&52.226 +2.227 + ac_compiler_gnu=no2.228 +fi2.229 +2.230 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext2.231 +ac_cv_objc_compiler_gnu=$ac_compiler_gnu2.232 +2.233 +fi2.234 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objc_compiler_gnu" >&52.235 +$as_echo "$ac_cv_objc_compiler_gnu" >&6; }2.236 +if test $ac_compiler_gnu = yes; then2.237 + GOBJC=yes2.238 +else2.239 + GOBJC=2.240 +fi2.241 +ac_test_OBJCFLAGS=${OBJCFLAGS+set}2.242 +ac_save_OBJCFLAGS=$OBJCFLAGS2.243 +{ $as_echo "$as_me:$LINENO: checking whether $OBJC accepts -g" >&52.244 +$as_echo_n "checking whether $OBJC accepts -g... " >&6; }2.245 +if test "${ac_cv_prog_objc_g+set}" = set; then2.246 + $as_echo_n "(cached) " >&62.247 +else2.248 + ac_save_objc_werror_flag=$ac_objc_werror_flag2.249 + ac_objc_werror_flag=yes2.250 + ac_cv_prog_objc_g=no2.251 + OBJCFLAGS="-g"2.252 + cat >conftest.$ac_ext <<_ACEOF2.253 +/* confdefs.h. */2.254 +_ACEOF2.255 +cat confdefs.h >>conftest.$ac_ext2.256 +cat >>conftest.$ac_ext <<_ACEOF2.257 +/* end confdefs.h. */2.258 +2.259 +int2.260 +main ()2.261 +{2.262 +2.263 + ;2.264 + return 0;2.265 +}2.266 +_ACEOF2.267 +rm -f conftest.$ac_objext2.268 +if { (ac_try="$ac_compile"2.269 +case "(($ac_try" in2.270 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.271 + *) ac_try_echo=$ac_try;;2.272 +esac2.273 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.274 +$as_echo "$ac_try_echo") >&52.275 + (eval "$ac_compile") 2>conftest.er12.276 + ac_status=$?2.277 + grep -v '^ *+' conftest.er1 >conftest.err2.278 + rm -f conftest.er12.279 + cat conftest.err >&52.280 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.281 + (exit $ac_status); } && {2.282 + test -z "$ac_objc_werror_flag" ||2.283 + test ! -s conftest.err2.284 + } && test -s conftest.$ac_objext; then2.285 + ac_cv_prog_objc_g=yes2.286 +else2.287 + $as_echo "$as_me: failed program was:" >&52.288 +sed 's/^/| /' conftest.$ac_ext >&52.289 +2.290 + OBJCFLAGS=""2.291 + cat >conftest.$ac_ext <<_ACEOF2.292 +/* confdefs.h. */2.293 +_ACEOF2.294 +cat confdefs.h >>conftest.$ac_ext2.295 +cat >>conftest.$ac_ext <<_ACEOF2.296 +/* end confdefs.h. */2.297 +2.298 +int2.299 +main ()2.300 +{2.301 +2.302 + ;2.303 + return 0;2.304 +}2.305 +_ACEOF2.306 +rm -f conftest.$ac_objext2.307 +if { (ac_try="$ac_compile"2.308 +case "(($ac_try" in2.309 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.310 + *) ac_try_echo=$ac_try;;2.311 +esac2.312 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.313 +$as_echo "$ac_try_echo") >&52.314 + (eval "$ac_compile") 2>conftest.er12.315 + ac_status=$?2.316 + grep -v '^ *+' conftest.er1 >conftest.err2.317 + rm -f conftest.er12.318 + cat conftest.err >&52.319 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.320 + (exit $ac_status); } && {2.321 + test -z "$ac_objc_werror_flag" ||2.322 + test ! -s conftest.err2.323 + } && test -s conftest.$ac_objext; then2.324 + :2.325 +else2.326 + $as_echo "$as_me: failed program was:" >&52.327 +sed 's/^/| /' conftest.$ac_ext >&52.328 +2.329 + ac_objc_werror_flag=$ac_save_objc_werror_flag2.330 + OBJCFLAGS="-g"2.331 + cat >conftest.$ac_ext <<_ACEOF2.332 +/* confdefs.h. */2.333 +_ACEOF2.334 +cat confdefs.h >>conftest.$ac_ext2.335 +cat >>conftest.$ac_ext <<_ACEOF2.336 +/* end confdefs.h. */2.337 +2.338 +int2.339 +main ()2.340 +{2.341 +2.342 + ;2.343 + return 0;2.344 +}2.345 +_ACEOF2.346 +rm -f conftest.$ac_objext2.347 +if { (ac_try="$ac_compile"2.348 +case "(($ac_try" in2.349 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.350 + *) ac_try_echo=$ac_try;;2.351 +esac2.352 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.353 +$as_echo "$ac_try_echo") >&52.354 + (eval "$ac_compile") 2>conftest.er12.355 + ac_status=$?2.356 + grep -v '^ *+' conftest.er1 >conftest.err2.357 + rm -f conftest.er12.358 + cat conftest.err >&52.359 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.360 + (exit $ac_status); } && {2.361 + test -z "$ac_objc_werror_flag" ||2.362 + test ! -s conftest.err2.363 + } && test -s conftest.$ac_objext; then2.364 + ac_cv_prog_objc_g=yes2.365 +else2.366 + $as_echo "$as_me: failed program was:" >&52.367 +sed 's/^/| /' conftest.$ac_ext >&52.368 +2.369 +2.370 +fi2.371 +2.372 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext2.373 +fi2.374 +2.375 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext2.376 +fi2.377 +2.378 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext2.379 + ac_objc_werror_flag=$ac_save_objc_werror_flag2.380 +fi2.381 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_objc_g" >&52.382 +$as_echo "$ac_cv_prog_objc_g" >&6; }2.383 +if test "$ac_test_OBJCFLAGS" = set; then2.384 + OBJCFLAGS=$ac_save_OBJCFLAGS2.385 +elif test $ac_cv_prog_objc_g = yes; then2.386 + if test "$GOBJC" = yes; then2.387 + OBJCFLAGS="-g -O2"2.388 + else2.389 + OBJCFLAGS="-g"2.390 + fi2.391 +else2.392 + if test "$GOBJC" = yes; then2.393 + OBJCFLAGS="-O2"2.394 + else2.395 + OBJCFLAGS=2.396 + fi2.397 +fi2.398 +ac_ext=c2.399 +ac_cpp='$CPP $CPPFLAGS'2.400 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.401 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.402 +ac_compiler_gnu=$ac_cv_c_compiler_gnu2.403 +2.404 +{ $as_echo "$as_me:$LINENO: checking for a working Objective-C compiler" >&52.405 +$as_echo_n "checking for a working Objective-C compiler... " >&6; }2.406 +ac_ext=m2.407 +ac_cpp='$OBJCPP $CPPFLAGS'2.408 +ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.409 +ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.410 +ac_compiler_gnu=$ac_cv_objc_compiler_gnu2.411 +cat >conftest.$ac_ext <<_ACEOF2.412 +/* confdefs.h. */2.413 +_ACEOF2.414 +cat confdefs.h >>conftest.$ac_ext2.415 +cat >>conftest.$ac_ext <<_ACEOF2.416 +/* end confdefs.h. */2.417 +@interface Foo @end2.418 +int2.419 +main ()2.420 +{2.421 +2.422 + ;2.423 + return 0;2.424 +}2.425 +_ACEOF2.426 +rm -f conftest.$ac_objext2.427 +if { (ac_try="$ac_compile"2.428 +case "(($ac_try" in2.429 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.430 + *) ac_try_echo=$ac_try;;2.431 +esac2.432 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.433 +$as_echo "$ac_try_echo") >&52.434 + (eval "$ac_compile") 2>conftest.er12.435 + ac_status=$?2.436 + grep -v '^ *+' conftest.er1 >conftest.err2.437 + rm -f conftest.er12.438 + cat conftest.err >&52.439 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.440 + (exit $ac_status); } && {2.441 + test -z "$ac_objc_werror_flag" ||2.442 + test ! -s conftest.err2.443 + } && test -s conftest.$ac_objext; then2.444 + { $as_echo "$as_me:$LINENO: result: yes" >&52.445 +$as_echo "yes" >&6; }2.446 +2.447 + { $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&52.448 +$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }2.449 +if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then2.450 + $as_echo_n "(cached) " >&62.451 +else2.452 + cat >conftest.$ac_ext <<_ACEOF2.453 +/* confdefs.h. */2.454 +_ACEOF2.455 +cat confdefs.h >>conftest.$ac_ext2.456 +cat >>conftest.$ac_ext <<_ACEOF2.457 +/* end confdefs.h. */2.458 +$ac_includes_default2.459 +2.460 +#include <Cocoa/Cocoa.h>2.461 +_ACEOF2.462 +rm -f conftest.$ac_objext2.463 +if { (ac_try="$ac_compile"2.464 +case "(($ac_try" in2.465 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.466 + *) ac_try_echo=$ac_try;;2.467 +esac2.468 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.469 +$as_echo "$ac_try_echo") >&52.470 + (eval "$ac_compile") 2>conftest.er12.471 + ac_status=$?2.472 + grep -v '^ *+' conftest.er1 >conftest.err2.473 + rm -f conftest.er12.474 + cat conftest.err >&52.475 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.476 + (exit $ac_status); } && {2.477 + test -z "$ac_objc_werror_flag" ||2.478 + test ! -s conftest.err2.479 + } && test -s conftest.$ac_objext; then2.480 + ac_cv_header_Cocoa_Cocoa_h=yes2.481 +else2.482 + $as_echo "$as_me: failed program was:" >&52.483 +sed 's/^/| /' conftest.$ac_ext >&52.484 +2.485 + ac_cv_header_Cocoa_Cocoa_h=no2.486 +fi2.487 +2.488 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext2.489 +fi2.490 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&52.491 +$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }2.492 +if test $ac_cv_header_Cocoa_Cocoa_h = yes; then2.493 +2.494 + HAVE_COCOA='yes'2.495 + APPLE_BUILD='yes'2.496 + LIBS="$LIBS -framework AppKit"2.497 + LIBS="$LIBS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -framework OpenGL"2.498 + CPPFLAGS="$CPPFLAGS -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4 -mdynamic-no-pic"2.499 + LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"2.500 +2.501 +cat >>confdefs.h <<\_ACEOF2.502 +#define HAVE_COCOA 12.503 +_ACEOF2.504 +2.505 +2.506 +cat >>confdefs.h <<\_ACEOF2.507 +#define APPLE_BUILD 12.508 +_ACEOF2.509 +2.510 + if test "x$with_gtk" = "xx11"; then2.511 + with_gtk=no2.512 + fi2.513 +2.514 +fi2.515 +2.516 +2.517 +2.518 +2.519 +{ $as_echo "$as_me:$LINENO: checking OBJC version" >&52.520 +$as_echo_n "checking OBJC version... " >&6; }2.521 +if test -n "$OBJC"; then2.522 + _GOBJC_VERSION=`$OBJC --version | $SED -ne '/(GCC)/p'`2.523 + if test -n "$_GOBJC_VERSION"; then2.524 + { $as_echo "$as_me:$LINENO: result: GCC" >&52.525 +$as_echo "GCC" >&6; }2.526 + OBJCOPT="-O2 -msse2 -mfpmath=sse"2.527 + OBJCFLAGS="$OBJCFLAGS -fno-strict-aliasing"2.528 + else2.529 + { $as_echo "$as_me:$LINENO: result: Unknown" >&52.530 +$as_echo "Unknown" >&6; }2.531 + OBJCOPT="-O2"2.532 + fi2.533 +else2.534 + { $as_echo "$as_me:$LINENO: result: None" >&52.535 +$as_echo "None" >&6; }2.536 +2.537 +fi2.538 +2.539 +2.540 +else2.541 + $as_echo "$as_me: failed program was:" >&52.542 +sed 's/^/| /' conftest.$ac_ext >&52.543 +2.544 + { $as_echo "$as_me:$LINENO: result: No" >&52.545 +$as_echo "No" >&6; }2.546 +2.547 +fi2.548 +2.549 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;2.550 +ac_ext=c2.551 +ac_cpp='$CPP $CPPFLAGS'2.552 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.553 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.554 +ac_compiler_gnu=$ac_cv_c_compiler_gnu2.555 +2.556 +2.557 +2.558 +2.559 +2.560 +if test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"; then2.561 + GUI_COCOA_TRUE=2.562 + GUI_COCOA_FALSE='#'2.563 +else2.564 + GUI_COCOA_TRUE='#'2.565 + GUI_COCOA_FALSE=2.566 +fi2.567 +2.568 +if test "x$HAVE_COCOA" = 'xyes' -a "x$with_gtk" = "xno"; then2.569 +2.570 +cat >>confdefs.h <<\_ACEOF2.571 +#define OSX_BUNDLE 12.572 +_ACEOF2.573 +2.574 +fi2.575 +2.576 CFLAGS="-g -fexceptions"2.577 OBJCFLAGS="-g -fexceptions"2.579 @@ -7243,27 +7785,6 @@2.580 fi2.583 -{ $as_echo "$as_me:$LINENO: checking OBJC version" >&52.584 -$as_echo_n "checking OBJC version... " >&6; }2.585 -if test -n "$OBJC"; then2.586 - _GOBJC_VERSION=`$OBJC --version | $SED -ne '/(GCC)/p'`2.587 - if test -n "$_GOBJC_VERSION"; then2.588 - { $as_echo "$as_me:$LINENO: result: GCC" >&52.589 -$as_echo "GCC" >&6; }2.590 - OBJCOPT="-O2 -msse2 -mfpmath=sse"2.591 - OBJCFLAGS="$OBJCFLAGS -fno-strict-aliasing"2.592 - else2.593 - { $as_echo "$as_me:$LINENO: result: Unknown" >&52.594 -$as_echo "Unknown" >&6; }2.595 - OBJCOPT="-O2"2.596 - fi2.597 -else2.598 - { $as_echo "$as_me:$LINENO: result: None" >&52.599 -$as_echo "None" >&6; }2.600 -2.601 -fi2.602 -2.603 -2.604 if test "x$enable_optimized" = "xyes"; then2.605 CFLAGS="$CFLAGS $CCOPT"2.606 OBJCFLAGS="$OBJCFLAGS $OBJCOPT"2.607 @@ -7452,423 +7973,6 @@2.611 -ac_ext=m2.612 -ac_cpp='$OBJCPP $CPPFLAGS'2.613 -ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.614 -ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.615 -ac_compiler_gnu=$ac_cv_objc_compiler_gnu2.616 -2.617 -2.618 -2.619 -ac_ext=m2.620 -ac_cpp='$OBJCPP $CPPFLAGS'2.621 -ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.622 -ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.623 -ac_compiler_gnu=$ac_cv_objc_compiler_gnu2.624 -{ $as_echo "$as_me:$LINENO: checking how to run the Objective C preprocessor" >&52.625 -$as_echo_n "checking how to run the Objective C preprocessor... " >&6; }2.626 -if test -z "$OBJCPP"; then2.627 - if test "${ac_cv_prog_OBJCPP+set}" = set; then2.628 - $as_echo_n "(cached) " >&62.629 -else2.630 - # Double quotes because OBJCPP needs to be expanded2.631 - for OBJCPP in "$OBJC -E" "/lib/cpp"2.632 - do2.633 - ac_preproc_ok=false2.634 -for ac_objc_preproc_warn_flag in '' yes2.635 -do2.636 - # Use a header file that comes with gcc, so configuring glibc2.637 - # with a fresh cross-compiler works.2.638 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since2.639 - # <limits.h> exists even on freestanding compilers.2.640 - # On the NeXT, cc -E runs the code through the compiler's parser,2.641 - # not just through cpp. "Syntax error" is here to catch this case.2.642 - cat >conftest.$ac_ext <<_ACEOF2.643 -/* confdefs.h. */2.644 -_ACEOF2.645 -cat confdefs.h >>conftest.$ac_ext2.646 -cat >>conftest.$ac_ext <<_ACEOF2.647 -/* end confdefs.h. */2.648 -#ifdef __STDC__2.649 -# include <limits.h>2.650 -#else2.651 -# include <assert.h>2.652 -#endif2.653 - Syntax error2.654 -_ACEOF2.655 -if { (ac_try="$ac_cpp conftest.$ac_ext"2.656 -case "(($ac_try" in2.657 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.658 - *) ac_try_echo=$ac_try;;2.659 -esac2.660 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.661 -$as_echo "$ac_try_echo") >&52.662 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er12.663 - ac_status=$?2.664 - grep -v '^ *+' conftest.er1 >conftest.err2.665 - rm -f conftest.er12.666 - cat conftest.err >&52.667 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.668 - (exit $ac_status); } >/dev/null && {2.669 - test -z "$ac_objc_preproc_warn_flag$ac_objc_werror_flag" ||2.670 - test ! -s conftest.err2.671 - }; then2.672 - :2.673 -else2.674 - $as_echo "$as_me: failed program was:" >&52.675 -sed 's/^/| /' conftest.$ac_ext >&52.676 -2.677 - # Broken: fails on valid input.2.678 -continue2.679 -fi2.680 -2.681 -rm -f conftest.err conftest.$ac_ext2.682 -2.683 - # OK, works on sane cases. Now check whether nonexistent headers2.684 - # can be detected and how.2.685 - cat >conftest.$ac_ext <<_ACEOF2.686 -/* confdefs.h. */2.687 -_ACEOF2.688 -cat confdefs.h >>conftest.$ac_ext2.689 -cat >>conftest.$ac_ext <<_ACEOF2.690 -/* end confdefs.h. */2.691 -#include <ac_nonexistent.h>2.692 -_ACEOF2.693 -if { (ac_try="$ac_cpp conftest.$ac_ext"2.694 -case "(($ac_try" in2.695 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.696 - *) ac_try_echo=$ac_try;;2.697 -esac2.698 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.699 -$as_echo "$ac_try_echo") >&52.700 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er12.701 - ac_status=$?2.702 - grep -v '^ *+' conftest.er1 >conftest.err2.703 - rm -f conftest.er12.704 - cat conftest.err >&52.705 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.706 - (exit $ac_status); } >/dev/null && {2.707 - test -z "$ac_objc_preproc_warn_flag$ac_objc_werror_flag" ||2.708 - test ! -s conftest.err2.709 - }; then2.710 - # Broken: success on invalid input.2.711 -continue2.712 -else2.713 - $as_echo "$as_me: failed program was:" >&52.714 -sed 's/^/| /' conftest.$ac_ext >&52.715 -2.716 - # Passes both tests.2.717 -ac_preproc_ok=:2.718 -break2.719 -fi2.720 -2.721 -rm -f conftest.err conftest.$ac_ext2.722 -2.723 -done2.724 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.2.725 -rm -f conftest.err conftest.$ac_ext2.726 -if $ac_preproc_ok; then2.727 - break2.728 -fi2.729 -2.730 - done2.731 - ac_cv_prog_OBJCPP=$OBJCPP2.732 -2.733 -fi2.734 - OBJCPP=$ac_cv_prog_OBJCPP2.735 -else2.736 - ac_cv_prog_OBJCPP=$OBJCPP2.737 -fi2.738 -{ $as_echo "$as_me:$LINENO: result: $OBJCPP" >&52.739 -$as_echo "$OBJCPP" >&6; }2.740 -ac_preproc_ok=false2.741 -for ac_objc_preproc_warn_flag in '' yes2.742 -do2.743 - # Use a header file that comes with gcc, so configuring glibc2.744 - # with a fresh cross-compiler works.2.745 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since2.746 - # <limits.h> exists even on freestanding compilers.2.747 - # On the NeXT, cc -E runs the code through the compiler's parser,2.748 - # not just through cpp. "Syntax error" is here to catch this case.2.749 - cat >conftest.$ac_ext <<_ACEOF2.750 -/* confdefs.h. */2.751 -_ACEOF2.752 -cat confdefs.h >>conftest.$ac_ext2.753 -cat >>conftest.$ac_ext <<_ACEOF2.754 -/* end confdefs.h. */2.755 -#ifdef __STDC__2.756 -# include <limits.h>2.757 -#else2.758 -# include <assert.h>2.759 -#endif2.760 - Syntax error2.761 -_ACEOF2.762 -if { (ac_try="$ac_cpp conftest.$ac_ext"2.763 -case "(($ac_try" in2.764 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.765 - *) ac_try_echo=$ac_try;;2.766 -esac2.767 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.768 -$as_echo "$ac_try_echo") >&52.769 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er12.770 - ac_status=$?2.771 - grep -v '^ *+' conftest.er1 >conftest.err2.772 - rm -f conftest.er12.773 - cat conftest.err >&52.774 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.775 - (exit $ac_status); } >/dev/null && {2.776 - test -z "$ac_objc_preproc_warn_flag$ac_objc_werror_flag" ||2.777 - test ! -s conftest.err2.778 - }; then2.779 - :2.780 -else2.781 - $as_echo "$as_me: failed program was:" >&52.782 -sed 's/^/| /' conftest.$ac_ext >&52.783 -2.784 - # Broken: fails on valid input.2.785 -continue2.786 -fi2.787 -2.788 -rm -f conftest.err conftest.$ac_ext2.789 -2.790 - # OK, works on sane cases. Now check whether nonexistent headers2.791 - # can be detected and how.2.792 - cat >conftest.$ac_ext <<_ACEOF2.793 -/* confdefs.h. */2.794 -_ACEOF2.795 -cat confdefs.h >>conftest.$ac_ext2.796 -cat >>conftest.$ac_ext <<_ACEOF2.797 -/* end confdefs.h. */2.798 -#include <ac_nonexistent.h>2.799 -_ACEOF2.800 -if { (ac_try="$ac_cpp conftest.$ac_ext"2.801 -case "(($ac_try" in2.802 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.803 - *) ac_try_echo=$ac_try;;2.804 -esac2.805 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.806 -$as_echo "$ac_try_echo") >&52.807 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er12.808 - ac_status=$?2.809 - grep -v '^ *+' conftest.er1 >conftest.err2.810 - rm -f conftest.er12.811 - cat conftest.err >&52.812 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.813 - (exit $ac_status); } >/dev/null && {2.814 - test -z "$ac_objc_preproc_warn_flag$ac_objc_werror_flag" ||2.815 - test ! -s conftest.err2.816 - }; then2.817 - # Broken: success on invalid input.2.818 -continue2.819 -else2.820 - $as_echo "$as_me: failed program was:" >&52.821 -sed 's/^/| /' conftest.$ac_ext >&52.822 -2.823 - # Passes both tests.2.824 -ac_preproc_ok=:2.825 -break2.826 -fi2.827 -2.828 -rm -f conftest.err conftest.$ac_ext2.829 -2.830 -done2.831 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.2.832 -rm -f conftest.err conftest.$ac_ext2.833 -if $ac_preproc_ok; then2.834 - :2.835 -else2.836 - { { $as_echo "$as_me:$LINENO: error: Objective C preprocessor \"$OBJCPP\" fails sanity check2.837 -See \`config.log' for more details." >&52.838 -$as_echo "$as_me: error: Objective C preprocessor \"$OBJCPP\" fails sanity check2.839 -See \`config.log' for more details." >&2;}2.840 - { (exit 1); exit 1; }; }2.841 -fi2.842 -2.843 -ac_ext=m2.844 -ac_cpp='$OBJCPP $CPPFLAGS'2.845 -ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.846 -ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.847 -ac_compiler_gnu=$ac_cv_objc_compiler_gnu2.848 -2.849 -2.850 -if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then2.851 - { $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&52.852 -$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }2.853 -if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then2.854 - $as_echo_n "(cached) " >&62.855 -fi2.856 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&52.857 -$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }2.858 -else2.859 - # Is the header compilable?2.860 -{ $as_echo "$as_me:$LINENO: checking Cocoa/Cocoa.h usability" >&52.861 -$as_echo_n "checking Cocoa/Cocoa.h usability... " >&6; }2.862 -cat >conftest.$ac_ext <<_ACEOF2.863 -/* confdefs.h. */2.864 -_ACEOF2.865 -cat confdefs.h >>conftest.$ac_ext2.866 -cat >>conftest.$ac_ext <<_ACEOF2.867 -/* end confdefs.h. */2.868 -$ac_includes_default2.869 -#include <Cocoa/Cocoa.h>2.870 -_ACEOF2.871 -rm -f conftest.$ac_objext2.872 -if { (ac_try="$ac_compile"2.873 -case "(($ac_try" in2.874 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.875 - *) ac_try_echo=$ac_try;;2.876 -esac2.877 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.878 -$as_echo "$ac_try_echo") >&52.879 - (eval "$ac_compile") 2>conftest.er12.880 - ac_status=$?2.881 - grep -v '^ *+' conftest.er1 >conftest.err2.882 - rm -f conftest.er12.883 - cat conftest.err >&52.884 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.885 - (exit $ac_status); } && {2.886 - test -z "$ac_objc_werror_flag" ||2.887 - test ! -s conftest.err2.888 - } && test -s conftest.$ac_objext; then2.889 - ac_header_compiler=yes2.890 -else2.891 - $as_echo "$as_me: failed program was:" >&52.892 -sed 's/^/| /' conftest.$ac_ext >&52.893 -2.894 - ac_header_compiler=no2.895 -fi2.896 -2.897 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext2.898 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&52.899 -$as_echo "$ac_header_compiler" >&6; }2.900 -2.901 -# Is the header present?2.902 -{ $as_echo "$as_me:$LINENO: checking Cocoa/Cocoa.h presence" >&52.903 -$as_echo_n "checking Cocoa/Cocoa.h presence... " >&6; }2.904 -cat >conftest.$ac_ext <<_ACEOF2.905 -/* confdefs.h. */2.906 -_ACEOF2.907 -cat confdefs.h >>conftest.$ac_ext2.908 -cat >>conftest.$ac_ext <<_ACEOF2.909 -/* end confdefs.h. */2.910 -#include <Cocoa/Cocoa.h>2.911 -_ACEOF2.912 -if { (ac_try="$ac_cpp conftest.$ac_ext"2.913 -case "(($ac_try" in2.914 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;2.915 - *) ac_try_echo=$ac_try;;2.916 -esac2.917 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""2.918 -$as_echo "$ac_try_echo") >&52.919 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er12.920 - ac_status=$?2.921 - grep -v '^ *+' conftest.er1 >conftest.err2.922 - rm -f conftest.er12.923 - cat conftest.err >&52.924 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&52.925 - (exit $ac_status); } >/dev/null && {2.926 - test -z "$ac_objc_preproc_warn_flag$ac_objc_werror_flag" ||2.927 - test ! -s conftest.err2.928 - }; then2.929 - ac_header_preproc=yes2.930 -else2.931 - $as_echo "$as_me: failed program was:" >&52.932 -sed 's/^/| /' conftest.$ac_ext >&52.933 -2.934 - ac_header_preproc=no2.935 -fi2.936 -2.937 -rm -f conftest.err conftest.$ac_ext2.938 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&52.939 -$as_echo "$ac_header_preproc" >&6; }2.940 -2.941 -# So? What about this header?2.942 -case $ac_header_compiler:$ac_header_preproc:$ac_objc_preproc_warn_flag in2.943 - yes:no: )2.944 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&52.945 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: accepted by the compiler, rejected by the preprocessor!" >&2;}2.946 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&52.947 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the compiler's result" >&2;}2.948 - ac_header_preproc=yes2.949 - ;;2.950 - no:yes:* )2.951 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&52.952 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: present but cannot be compiled" >&2;}2.953 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&52.954 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: check for missing prerequisite headers?" >&2;}2.955 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&52.956 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: see the Autoconf documentation" >&2;}2.957 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&52.958 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: section \"Present But Cannot Be Compiled\"" >&2;}2.959 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&52.960 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: proceeding with the preprocessor's result" >&2;}2.961 - { $as_echo "$as_me:$LINENO: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&52.962 -$as_echo "$as_me: WARNING: Cocoa/Cocoa.h: in the future, the compiler will take precedence" >&2;}2.963 -2.964 - ;;2.965 -esac2.966 -{ $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&52.967 -$as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }2.968 -if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then2.969 - $as_echo_n "(cached) " >&62.970 -else2.971 - ac_cv_header_Cocoa_Cocoa_h=$ac_header_preproc2.972 -fi2.973 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Cocoa_Cocoa_h" >&52.974 -$as_echo "$ac_cv_header_Cocoa_Cocoa_h" >&6; }2.975 -2.976 -fi2.977 -if test $ac_cv_header_Cocoa_Cocoa_h = yes; then2.978 -2.979 - HAVE_COCOA='yes'2.980 - APPLE_BUILD='yes'2.981 - LIBS="$LIBS -framework AppKit"2.982 - LIBS="$LIBS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -framework OpenGL"2.983 - CPPFLAGS="$CPPFLAGS -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4 -mdynamic-no-pic"2.984 - LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"2.985 -2.986 -cat >>confdefs.h <<\_ACEOF2.987 -#define HAVE_COCOA 12.988 -_ACEOF2.989 -2.990 -2.991 -cat >>confdefs.h <<\_ACEOF2.992 -#define APPLE_BUILD 12.993 -_ACEOF2.994 -2.995 - if test "x$with_gtk" = "xx11"; then2.996 - with_gtk=no2.997 - fi2.998 -2.999 -fi2.1000 -2.1001 -2.1002 -2.1003 -2.1004 -2.1005 -if test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"; then2.1006 - GUI_COCOA_TRUE=2.1007 - GUI_COCOA_FALSE='#'2.1008 -else2.1009 - GUI_COCOA_TRUE='#'2.1010 - GUI_COCOA_FALSE=2.1011 -fi2.1012 -2.1013 -if test "x$HAVE_COCOA" = 'xyes' -a "x$with_gtk" = "xno"; then2.1014 -2.1015 -cat >>confdefs.h <<\_ACEOF2.1016 -#define OSX_BUNDLE 12.1017 -_ACEOF2.1018 -2.1019 -fi2.1020 -2.1021 -ac_ext=c2.1022 -ac_cpp='$CPP $CPPFLAGS'2.1023 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'2.1024 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'2.1025 -ac_compiler_gnu=$ac_cv_c_compiler_gnu2.1026 -2.1027 -2.1030 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
3.1 --- a/configure.in Mon Jan 26 12:32:23 2009 +00003.2 +++ b/configure.in Mon Feb 02 01:40:13 2009 +00003.3 @@ -64,7 +64,35 @@3.4 AC_ARG_WITH( pulse,3.5 AS_HELP_STRING( [--with-pulse], [Build with support for the PulseAudio audio system]) )3.7 -dnl ------------------ Compiler flags -----------------------3.8 +dnl ------------ Check if we're building on Darwin --------------3.9 +3.10 +dnl For starters, do we have a working objective-c compiler?3.11 +AC_HAVE_OBJC([3.12 + AC_CHECK_HEADER([Cocoa/Cocoa.h], [3.13 + HAVE_COCOA='yes'3.14 + APPLE_BUILD='yes'3.15 + LIBS="$LIBS -framework AppKit"3.16 + LIBS="$LIBS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -framework OpenGL"3.17 + CPPFLAGS="$CPPFLAGS -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4 -mdynamic-no-pic"3.18 + LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"3.19 + AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework])3.20 + AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])3.21 + if test "x$with_gtk" = "xx11"; then3.22 + with_gtk=no3.23 + fi3.24 + ], [], [AC_INCLUDES_DEFAULT])3.25 +3.26 + AC_OBJC_VERSION([ OBJCOPT="-O2 -msse2 -mfpmath=sse"3.27 + OBJCFLAGS="$OBJCFLAGS -fno-strict-aliasing" ],3.28 + [ OBJCOPT="-O2" ], [] )3.29 +])3.30 +3.31 +AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"])3.32 +if test "x$HAVE_COCOA" = 'xyes' -a "x$with_gtk" = "xno"; then3.33 + AC_DEFINE(OSX_BUNDLE, [1], [Generating a bundled application])3.34 +fi3.35 +3.36 +dnl ------------------ C Compiler flags -----------------------3.37 CFLAGS="-g -fexceptions"3.38 OBJCFLAGS="-g -fexceptions"3.39 AC_DEFINE(HAVE_EXCEPTIONS, [1], [Have exception stack-frame information])3.40 @@ -73,9 +101,6 @@3.41 CFLAGS="$CFLAGS -fno-strict-aliasing" ],3.42 [ CCOPT="$CFLAGS -fast" ],3.43 [ CCOPT="$CFLAGS -O2" ])3.44 -AC_OBJC_VERSION([ OBJCOPT="-O2 -msse2 -mfpmath=sse"3.45 - OBJCFLAGS="$OBJCFLAGS -fno-strict-aliasing" ],3.46 - [ OBJCOPT="-O2" ], [] )3.48 if test "x$enable_optimized" = "xyes"; then3.49 CFLAGS="$CFLAGS $CCOPT"3.50 @@ -109,31 +134,6 @@3.51 ], [ AC_MSG_WARN([Memory exceptions will be slow]) ])3.54 -dnl ------------ Check if we're building on Darwin --------------3.55 -3.56 -dnl For starters, do we have a working objective-c compiler?3.57 -AC_LANG_OBJC3.58 -3.59 -AC_CHECK_HEADER([Cocoa/Cocoa.h], [3.60 - HAVE_COCOA='yes'3.61 - APPLE_BUILD='yes'3.62 - LIBS="$LIBS -framework AppKit"3.63 - LIBS="$LIBS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -framework OpenGL"3.64 - CPPFLAGS="$CPPFLAGS -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4 -mdynamic-no-pic"3.65 - LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"3.66 - AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework])3.67 - AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])3.68 - if test "x$with_gtk" = "xx11"; then3.69 - with_gtk=no3.70 - fi3.71 -])3.72 -3.73 -AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"])3.74 -if test "x$HAVE_COCOA" = 'xyes' -a "x$with_gtk" = "xno"; then3.75 - AC_DEFINE(OSX_BUNDLE, [1], [Generating a bundled application])3.76 -fi3.77 -3.78 -AC_LANG_C3.80 dnl ----------- Check for mandatory dependencies --------------3.81 dnl Check for libpng (required)
.