commit 313c7a9e35854d73325d33b6968a76eaac28fb41
parent ffd71bccf7aeca04f7491a0c37285ed16ce121bd
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Wed, 23 Jun 2010 10:46:07 +1000
[osx] ige-mac-integration autofu
Diffstat:
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
@@ -26,6 +26,17 @@ AC_SUBST(SPEK_PACKAGES)
AC_CHECK_LIB(m, log10f)
+# Check for GDK Quartz and MacOSX integration package
+_gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
+AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
+if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
+ AC_SUBST(IGE_MAC_LIBS)
+ AC_SUBST(IGE_MAC_CFLAGS)
+ IGE_MAC_VALA="-D MAC_INTEGRATION"
+ AC_SUBST(IGE_MAC_VALA)
+fi
+
GETTEXT_PACKAGE=spek
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
AC_SUBST(GETTEXT_PACKAGE)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,13 +10,16 @@ spek_SOURCES = \
INCLUDES = \
-include config.h \
$(SPEK_CFLAGS) \
+ $(IGE_MAC_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DPKGLIBDIR=\""$(pkglibdir)"\"
VALAFLAGS = \
--vapidir=$(srcdir)/../vapi --pkg config \
+ $(IGE_MAC_VALA) \
@SPEK_PACKAGES@
spek_LDADD = \
- $(SPEK_LIBS)
+ $(SPEK_LIBS) \
+ $(IGE_MAC_LIBS)