filename | configure |
changeset | 1029:7138bbb9537c |
prev | 1024:c67f2d61ab97 |
next | 1031:a9938ed3bfe8 |
author | nkeynes |
date | Sun Jun 14 21:46:05 2009 +0000 (14 years ago) |
permissions | -rw-r--r-- |
last change | Add -framework Carbon to go with previous change (SetSystemUIMode is tucked away in Carbon) |
file | annotate | diff | log | raw |
1.1 --- a/configure Sat Jun 13 00:50:48 2009 +00001.2 +++ b/configure Sun Jun 14 21:46:05 2009 +00001.3 @@ -3595,12 +3595,14 @@1.7 -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&51.8 -$as_echo_n "checking for library containing strerror... " >&6; }1.9 -if test "${ac_cv_search_strerror+set}" = set; then1.10 - $as_echo_n "(cached) " >&61.11 -else1.12 - ac_func_search_save_LIBS=$LIBS1.13 +1.14 + { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&51.15 +$as_echo_n "checking for strerror in -lcposix... " >&6; }1.16 +if test "${ac_cv_lib_cposix_strerror+set}" = set; then1.17 + $as_echo_n "(cached) " >&61.18 +else1.19 + ac_check_lib_save_LIBS=$LIBS1.20 +LIBS="-lcposix $LIBS"1.21 cat >conftest.$ac_ext <<_ACEOF1.22 /* confdefs.h. */1.23 _ACEOF1.24 @@ -3623,64 +3625,47 @@1.25 return 0;1.26 }1.27 _ACEOF1.28 -for ac_lib in '' cposix; do1.29 - if test -z "$ac_lib"; then1.30 - ac_res="none required"1.31 - else1.32 - ac_res=-l$ac_lib1.33 - LIBS="-l$ac_lib $ac_func_search_save_LIBS"1.34 - fi1.35 - rm -f conftest.$ac_objext conftest$ac_exeext1.36 -if { (ac_try="$ac_link"1.37 -case "(($ac_try" in1.38 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;1.39 - *) ac_try_echo=$ac_try;;1.40 -esac1.41 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""1.42 -$as_echo "$ac_try_echo") >&51.43 - (eval "$ac_link") 2>conftest.er11.44 - ac_status=$?1.45 - grep -v '^ *+' conftest.er1 >conftest.err1.46 - rm -f conftest.er11.47 - cat conftest.err >&51.48 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&51.49 - (exit $ac_status); } && {1.50 - test -z "$ac_c_werror_flag" ||1.51 - test ! -s conftest.err1.52 - } && test -s conftest$ac_exeext && {1.53 - test "$cross_compiling" = yes ||1.54 - $as_test_x conftest$ac_exeext1.55 - }; then1.56 - ac_cv_search_strerror=$ac_res1.57 -else1.58 - $as_echo "$as_me: failed program was:" >&51.59 -sed 's/^/| /' conftest.$ac_ext >&51.60 -1.61 -1.62 -fi1.63 -1.64 -rm -rf conftest.dSYM1.65 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \1.66 - conftest$ac_exeext1.67 - if test "${ac_cv_search_strerror+set}" = set; then1.68 - break1.69 -fi1.70 -done1.71 -if test "${ac_cv_search_strerror+set}" = set; then1.72 - :1.73 -else1.74 - ac_cv_search_strerror=no1.75 -fi1.76 -rm conftest.$ac_ext1.77 -LIBS=$ac_func_search_save_LIBS1.78 -fi1.79 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&51.80 -$as_echo "$ac_cv_search_strerror" >&6; }1.81 -ac_res=$ac_cv_search_strerror1.82 -if test "$ac_res" != no; then1.83 - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"1.84 -1.85 -fi1.86 +rm -f conftest.$ac_objext conftest$ac_exeext1.87 +if { (ac_try="$ac_link"1.88 +case "(($ac_try" in1.89 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;1.90 + *) ac_try_echo=$ac_try;;1.91 +esac1.92 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""1.93 +$as_echo "$ac_try_echo") >&51.94 + (eval "$ac_link") 2>conftest.er11.95 + ac_status=$?1.96 + grep -v '^ *+' conftest.er1 >conftest.err1.97 + rm -f conftest.er11.98 + cat conftest.err >&51.99 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&51.100 + (exit $ac_status); } && {1.101 + test -z "$ac_c_werror_flag" ||1.102 + test ! -s conftest.err1.103 + } && test -s conftest$ac_exeext && {1.104 + test "$cross_compiling" = yes ||1.105 + $as_test_x conftest$ac_exeext1.106 + }; then1.107 + ac_cv_lib_cposix_strerror=yes1.108 +else1.109 + $as_echo "$as_me: failed program was:" >&51.110 +sed 's/^/| /' conftest.$ac_ext >&51.111 +1.112 + ac_cv_lib_cposix_strerror=no1.113 +fi1.114 +1.115 +rm -rf conftest.dSYM1.116 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \1.117 + conftest$ac_exeext conftest.$ac_ext1.118 +LIBS=$ac_check_lib_save_LIBS1.119 +fi1.120 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&51.121 +$as_echo "$ac_cv_lib_cposix_strerror" >&6; }1.122 +if test "x$ac_cv_lib_cposix_strerror" = x""yes; then1.123 + LIBS="$LIBS -lcposix"1.124 +fi1.125 +1.126 +1.128 ac_ext=c1.129 ac_cpp='$CPP $CPPFLAGS'1.130 @@ -7714,7 +7699,7 @@1.132 HAVE_COCOA='yes'1.133 APPLE_BUILD='yes'1.134 - LIBS="$LIBS -framework AppKit"1.135 + LIBS="$LIBS -framework AppKit -framework Carbon"1.136 LIBS="$LIBS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -framework OpenGL"1.137 LXDREAMCPPFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4 -mdynamic-no-pic"1.138 LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"
.