luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Include Cocoa/Carbon in Libs.private if targetting Mac OS X

Browse Source 
This allows static linking against GIO on OS X, which would previously
fail due to unresolved symbols from the above two frameworks.

https://bugzilla.gnome.org/show_bug.cgi?id=668152
This commit is contained in:
Philip Withnall 2014-03-20 12:32:36 +00:00 committed by Philip Withnall
parent 638993f5ac
commit 8d037c678d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -213,13 +213,17 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
AS_IF([test "x$glib_have_carbon" = "xyes"], [ AS_IF([test "x$glib_have_carbon" = "xyes"], [
AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
LDFLAGS="$LDFLAGS -Wl,-framework,Carbon" CARBON_LIBS="-Wl,-framework,Carbon"
]) LDFLAGS="$LDFLAGS $CARBON_LIBS"
], [CARBON_LIBS=""])
if test "x$glib_have_cocoa" = "xyes"; then AS_IF([test "x$glib_have_cocoa" = "xyes"], [
AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available]) AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
LDFLAGS="$LDFLAGS -Wl,-framework,Foundation" COCOA_LIBS="-Wl,-framework,Foundation"
fi LDFLAGS="$LDFLAGS $COCOA_LIBS"
], [COCOA_LIBS=""])
AC_SUBST([COCOA_LIBS])
dnl declare --enable-* args and collect ac_help strings dnl declare --enable-* args and collect ac_help strings
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,

2
gio-2.0.pc.in
View File

@ -14,5 +14,5 @@ Version: @VERSION@
Requires: glib-2.0 gobject-2.0 Requires: glib-2.0 gobject-2.0
Requires.private: gmodule-no-export-2.0 Requires.private: gmodule-no-export-2.0
Libs: -L${libdir} -lgio-2.0 Libs: -L${libdir} -lgio-2.0
Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
Cflags: Cflags:

2
glib-2.0.pc.in
View File

@ -12,5 +12,5 @@ Description: C Utility Library
Version: @VERSION@ Version: @VERSION@
Requires.private: @PCRE_REQUIRES@ Requires.private: @PCRE_REQUIRES@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@
Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@