# HG changeset patch # User nkeynes # Date 1214197409 0 # Node ID 2c1d6f8e69e745cdd3192cb0b118ee6b76097ae3 # Parent 585c66692be7a3e57fe7b493bbf3ab7079c908b9 Move with_gtk no default into the apple block, not the 'we have a working objective-c compiler' block. --- a/configure Sun Jun 22 21:27:28 2008 +0000 +++ b/configure Mon Jun 23 05:03:29 2008 +0000 @@ -6774,14 +6774,13 @@ #define APPLE_BUILD 1 _ACEOF - -fi - - - - if test "x$with_gtk" = "xx11"; then - with_gtk=no - fi + if test "x$with_gtk" = "xx11"; then + with_gtk=no + fi + +fi + + else --- a/configure.in Sun Jun 22 21:27:28 2008 +0000 +++ b/configure.in Mon Jun 23 05:03:29 2008 +0000 @@ -54,12 +54,11 @@ 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" AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework]) AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...]) + if test "x$with_gtk" = "xx11"; then + with_gtk=no + fi ]) - if test "x$with_gtk" = "xx11"; then - with_gtk=no - fi - ], [CPPFLAGS="$lxdream_save_cppflags"] ) AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"])