From 270c098e625be97b5e055af0887c2a4d7b855fb6 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Date: Sun, 22 May 2011 12:33:24 +0200
Subject: [PATCH] build: Use variables from PKG_CHECK_MODULES instead of -pkg

The -pkg compiler option doesn't follow the PKG_CONFIG_PATH environment
variable, causing errors in some build environment, like bockbuild or
possibly jhbuild. Use the variables set by the various PKG_CHECK_MODULES
calls instead.
---
 Makefile.am  | 6 +++---
 configure.ac | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e6b0f46..f351ffe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,9 @@ SRCS =						\
 	$(GDK_SRCS)
 
 ASSEMBLIES =					\
-	-pkg:glib-sharp-2.0			\
-	-pkg:gio-sharp-2.0			\
-	-pkg:gtk-sharp-2.0
+	$(GLIBSHARP_LIBS)			\
+	$(GIOSHARP_LIBS)			\
+	$(GTKSHARP_LIBS)
 
 all: gtk-sharp-beans.dll
 
diff --git a/configure.ac b/configure.ac
index 9e2e681..36be64e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,11 @@ AC_SUBST(GACUTIL)
 AC_SUBST(GACUTIL_FLAGS)
 
 PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12)
+AC_SUBST(GTKSHARP_LIBS)
 PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= 2.12)
+AC_SUBST(GLIBSHARP_LIBS)
 PKG_CHECK_MODULES(GIOSHARP, gio-sharp-2.0 >= 2.18)
+AC_SUBST(GIOSHARP_LIBS)
 PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.0)
 
 CSC_DEFINES=""