revision 704:2c1d6f8e69e7
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 704:2c1d6f8e69e7 |
parent | 703:585c66692be7 |
child | 705:03dd1ea35c69 |
author | nkeynes |
date | Mon Jun 23 05:03:29 2008 +0000 (15 years ago) |
Move with_gtk no default into the apple block, not the 'we have a working objective-c compiler' block.
1.1 --- a/configure Sun Jun 22 21:27:28 2008 +00001.2 +++ b/configure Mon Jun 23 05:03:29 2008 +00001.3 @@ -6774,14 +6774,13 @@1.4 #define APPLE_BUILD 11.5 _ACEOF1.7 -1.8 -fi1.9 -1.10 -1.11 -1.12 - if test "x$with_gtk" = "xx11"; then1.13 - with_gtk=no1.14 - fi1.15 + if test "x$with_gtk" = "xx11"; then1.16 + with_gtk=no1.17 + fi1.18 +1.19 +fi1.20 +1.21 +1.24 else
2.1 --- a/configure.in Sun Jun 22 21:27:28 2008 +00002.2 +++ b/configure.in Mon Jun 23 05:03:29 2008 +00002.3 @@ -54,12 +54,11 @@2.4 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.5 AC_DEFINE(HAVE_COCOA,[1],[Have Cocoa framework])2.6 AC_DEFINE(APPLE_BUILD,[1],[Building on an apple platform. Things are different...])2.7 + if test "x$with_gtk" = "xx11"; then2.8 + with_gtk=no2.9 + fi2.10 ])2.12 - if test "x$with_gtk" = "xx11"; then2.13 - with_gtk=no2.14 - fi2.15 -2.16 ], [CPPFLAGS="$lxdream_save_cppflags"] )2.17 AM_CONDITIONAL(GUI_COCOA, [test "$HAVE_COCOA" = 'yes' -a "$with_gtk" = "no"])
.