[patch] glib-2.40.2-osx.patch

glib-2.40.2-osx.patch (text/plain), 2.95 KB, created by Guilherme Amadio on 2014-10-31 20:55:54 UTC

--- a/configure.ac	2014-09-22 14:50:23.000000000 -0300
+++ b/configure.ac	2014-10-31 18:46:44.000000000 -0200
@@ -169,32 +169,10 @@
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
 
-glib_have_carbon=no
-AC_MSG_CHECKING([for Mac OS X Carbon support])
-AC_TRY_CPP([
-#include <Carbon/Carbon.h>
-#include <CoreServices/CoreServices.h>
-], glib_have_carbon=yes)
-
-AC_MSG_RESULT([$glib_have_carbon])
-
-glib_have_cocoa=no
-AC_MSG_CHECKING([for Mac OS X Cocoa support])
-AC_TRY_CPP([
-#include <Cocoa/Cocoa.h>
-#ifdef GNUSTEP_BASE_VERSION
-#error "Detected GNUstep, not Cocoa"
-#endif
-], glib_have_cocoa=yes)
-
-AC_MSG_RESULT([$glib_have_cocoa])
-
 AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"])
 AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"])
 AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"])
 AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
-AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
-AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
 
 AS_IF([test "$glib_native_win32" = "yes"], [
   AC_CHECK_TOOL(WINDRES, windres, no)
@@ -211,17 +189,48 @@
 ])
 AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
 
-AS_IF([test "x$glib_have_carbon" = "xyes"], [
-  AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
-  LDFLAGS="$LDFLAGS -Wl,-framework,Carbon"
+dnl declare --enable-* args and collect ac_help strings
+
+AC_ARG_ENABLE(framework,
+            AS_HELP_STRING([--enable-framework=@<:@no/yes@:>@],
+                           [turn on carbon/cocoa support @<:@default=no@:>@]),,
+            enable_framework=no)
+
+glib_have_carbon=no
+glib_have_cocoa=no
+AS_IF([test "x$enable_framework" = "xyes"], [
+  AC_MSG_CHECKING([for Mac OS X Carbon support])
+  AC_TRY_CPP([
+  #include <Carbon/Carbon.h>
+  #include <CoreServices/CoreServices.h>
+  ], glib_have_carbon=yes)
+
+  AC_MSG_RESULT([$glib_have_carbon])
+
+  AS_IF([test "$glib_have_carbon" = "yes"], [
+    AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is enabled])
+    LDFLAGS="$LDFLAGS -Wl,-framework,Carbon"
+  ])
+
+  AC_MSG_CHECKING([for Mac OS X Cocoa support])
+  AC_TRY_CPP([
+  #include <Cocoa/Cocoa.h>
+  #ifdef GNUSTEP_BASE_VERSION
+  #error "Detected GNUstep, not Cocoa"
+  #endif
+  ], glib_have_cocoa=yes)
+
+  AC_MSG_RESULT([$glib_have_cocoa])
+
+  AS_IF([test "$glib_have_cocoa" = "yes"], [
+    AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is enabled])
+    LDFLAGS="$LDFLAGS -Wl,-framework,Foundation"
+  ])
 ])
 
-if test "x$glib_have_cocoa" = "xyes"; then
-  AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
-  LDFLAGS="$LDFLAGS -Wl,-framework,Foundation"
-fi
+AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
+AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
 
-dnl declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug,
               AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
                              [turn on debugging @<:@default=glib_debug_default@:>@]),,