1.1 --- a/configure Wed Apr 16 12:43:52 2008 +0000
1.2 +++ b/configure Thu Apr 17 00:01:40 2008 +0000
1.14 @@ -5873,6 +5873,9 @@
1.19 +lxdream_save_cppflags="$CPPFLAGS"
1.20 +CPPFLAGS="$CPPFLAGS -x objective-c"
1.21 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
1.24 @@ -5945,7 +5948,42 @@
1.28 -if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then
1.29 +cat >conftest.$ac_ext <<_ACEOF
1.32 +cat confdefs.h >>conftest.$ac_ext
1.33 +cat >>conftest.$ac_ext <<_ACEOF
1.34 +/* end confdefs.h. */
1.35 +@interface Foo @end
1.44 +rm -f conftest.$ac_objext
1.45 +if { (ac_try="$ac_compile"
1.46 +case "(($ac_try" in
1.47 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.48 + *) ac_try_echo=$ac_try;;
1.50 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1.51 +$as_echo "$ac_try_echo") >&5
1.52 + (eval "$ac_compile") 2>conftest.er1
1.54 + grep -v '^ *+' conftest.er1 >conftest.err
1.55 + rm -f conftest.er1
1.56 + cat conftest.err >&5
1.57 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.58 + (exit $ac_status); } && {
1.59 + test -z "$ac_c_werror_flag" ||
1.60 + test ! -s conftest.err
1.61 + } && test -s conftest.$ac_objext; then
1.64 + if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then
1.65 { $as_echo "$as_me:$LINENO: checking for Cocoa/Cocoa.h" >&5
1.66 $as_echo_n "checking for Cocoa/Cocoa.h... " >&6; }
1.67 if test "${ac_cv_header_Cocoa_Cocoa_h+set}" = set; then
1.68 @@ -6074,10 +6112,10 @@
1.70 if test $ac_cv_header_Cocoa_Cocoa_h = yes; then
1.74 - LIBS="$LIBS -framework AppKit"
1.75 - 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.78 + LIBS="$LIBS -framework AppKit"
1.79 + 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.81 cat >>confdefs.h <<\_ACEOF
1.82 #define HAVE_COCOA 1
1.83 @@ -6094,12 +6132,22 @@
1.88 + $as_echo "$as_me: failed program was:" >&5
1.89 +sed 's/^/| /' conftest.$ac_ext >&5
1.91 + CPPFLAGS="$lxdream_save_cppflags"
1.94 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.97 if test "$HAVE_COCOA" = 'yes'; then
1.99 - GUI_CARBON_FALSE='#'
1.101 - GUI_CARBON_TRUE='#'
1.102 - GUI_CARBON_FALSE=
1.104 + GUI_COCOA_FALSE='#'
1.106 + GUI_COCOA_TRUE='#'
1.111 @@ -10314,10 +10362,10 @@
1.112 Usually this means the macro was only invoked conditionally." >&2;}
1.113 { (exit 1); exit 1; }; }
1.115 -if test -z "${GUI_CARBON_TRUE}" && test -z "${GUI_CARBON_FALSE}"; then
1.116 - { { $as_echo "$as_me:$LINENO: error: conditional \"GUI_CARBON\" was never defined.
1.117 -Usually this means the macro was only invoked conditionally." >&5
1.118 -$as_echo "$as_me: error: conditional \"GUI_CARBON\" was never defined.
1.119 +if test -z "${GUI_COCOA_TRUE}" && test -z "${GUI_COCOA_FALSE}"; then
1.120 + { { $as_echo "$as_me:$LINENO: error: conditional \"GUI_COCOA\" was never defined.
1.121 +Usually this means the macro was only invoked conditionally." >&5
1.122 +$as_echo "$as_me: error: conditional \"GUI_COCOA\" was never defined.
1.123 Usually this means the macro was only invoked conditionally." >&2;}
1.124 { (exit 1); exit 1; }; }