summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Michael Lauer <mickey@vanille-media.de>2018-03-05 15:13:59 +0100
committerPhilip Withnall <withnall@endlessm.com>2018-03-05 16:48:07 +0000
commitcc50c19544a6aa930b83b53f2690f4d126ddb443 (patch)
tree5b5f1abc37275c2fc9c664b4cb78e0a93e107dda
parentb03c37cf3bec82a0164ab1e0b84adac3cf05c1c1 (diff)
downloadglib-cc50c19544a6aa930b83b53f2690f4d126ddb443.tar.gz
configure.ac: link to AppKit on macOS.
This is actually only necessary for gio, not for the other libraries. https://bugzilla.gnome.org/show_bug.cgi?id=793565
-rw-r--r--configure.ac2
-rw-r--r--meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index de97a8f68..1f6875b73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,7 +230,7 @@ AC_SUBST([CARBON_LIBS])
ac_cv_have_os_x_9_or_later="no"
AS_IF([test "x$glib_have_cocoa" = "xyes"], [
AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
- COCOA_LIBS="-Wl,-framework,Foundation"
+ COCOA_LIBS="-Wl,-framework,Foundation -Wl,-framework,AppKit"
LDFLAGS="$LDFLAGS $COCOA_LIBS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <AvailabilityMacros.h>
diff --git a/meson.build b/meson.build
index de12b8811..ab377981d 100644
--- a/meson.build
+++ b/meson.build
@@ -524,7 +524,7 @@ glib_have_cocoa = cc.compiles('''#include <Cocoa/Cocoa.h>
if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true)
- COCOA_LIBS='-Wl,-framework,Foundation' # FIXME: propagate to .pc files as well
+ COCOA_LIBS='-Wl,-framework,Foundation -Wl,-framework,AppKit' # FIXME: propagate to .pc files as well
platform_ldflags += [COCOA_LIBS]
else
COCOA_LIBS=''