1.1 --- a/configure.in	Wed Apr 16 12:43:52 2008 +0000
     1.2 +++ b/configure.in	Wed Apr 16 23:47:32 2008 +0000
     1.3 @@ -27,18 +27,26 @@
     1.4     [], [with_osmesa=no])
     1.5  
     1.6  
     1.7 +dnl ------------ Check if we're building on Darwn --------------
     1.8 +
     1.9 +dnl For starters, do we have a working objective-c compiler?
    1.10 +lxdream_save_cppflags="$CPPFLAGS"
    1.11 +CPPFLAGS="$CPPFLAGS -x objective-c"
    1.12 +AC_TRY_COMPILE([@interface Foo @end],, [
    1.13 +
    1.14 +   AC_CHECK_HEADER([Cocoa/Cocoa.h], [
    1.15 +      HAVE_COCOA='yes'
    1.16 +      APPLE_BUILD='yes'
    1.17 +      LIBS="$LIBS -framework AppKit"
    1.18 +      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.19 +      AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework])
    1.20 +      AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])
    1.21 +   ])
    1.22 +
    1.23 +], [CPPFLAGS="$lxdream_save_cppflags"] )
    1.24 +AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes'])
    1.25 +
    1.26  dnl ----------- Check for mandatory dependencies --------------
    1.27 -dnl Building on MAC?
    1.28 -AC_CHECK_HEADER([Cocoa/Cocoa.h], [
    1.29 -   HAVE_COCOA='yes'
    1.30 -   APPLE_BUILD='yes'
    1.31 -   LIBS="$LIBS -framework AppKit"
    1.32 -   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.33 -   AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework])
    1.34 -   AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])
    1.35 -])
    1.36 -AM_CONDITIONAL(GUI_CARBON, [test "$HAVE_COCOA" = 'yes'])
    1.37 -
    1.38  dnl Check for libpng (required)
    1.39  PKG_CHECK_MODULES(LIBPNG, [libpng] )
    1.40