gir-repository r183 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Thu Oct 30 21:18:04 2008
New Revision: 183
URL: http://svn.gnome.org/viewvc/gir-repository?rev=183&view=rev

Log:
Link Gdk-custom with gdk, not gtk

	* configure.ac: Get cflags and libs for gdk-2.0
	* gir/Makefile.am: Link Gdk-custom with gdk, not gtk. Fixes link
	error on osx

Modified:
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Oct 30 21:18:04 2008
@@ -78,6 +78,8 @@
 GDK_TARGET=
 GDK_TARGET_GIRS=
 if $have_gtk; then
+    PKG_CHECK_MODULES(GDK, gdk-2.0)
+
     GDK_TARGET="$($PKG_CONFIG --variable=target gtk+-2.0)"
     if test "$GDK_TARGET" = x11; then
         GDK_TARGET_GIRS=xlib-2.0

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Oct 30 21:18:04 2008
@@ -235,10 +235,10 @@
 lib_LTLIBRARIES += libgirepo-Gdk-custom.la
 
 libgirepo_Gdk_custom_la_CPPFLAGS = \
-	$(GTK_CFLAGS)
+	$(GDK_CFLAGS)
 
 libgirepo_Gdk_custom_la_LIBADD = \
-	$(GTK_LIBS)
+	$(GDK_LIBS)
 
 libgirepo_Gdk_custom_la_LDFLAGS=$(COMMON_CUSTOM_LDFLAGS)