Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.
  • Loading branch information...
commit 270c098e625be97b5e055af0887c2a4d7b855fb6 1 parent 6b09480
Bertrand Lorentz authored

Showing 2 changed files with 6 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  Makefile.am
  2. 3  configure.ac
6  Makefile.am
@@ -31,9 +31,9 @@ SRCS =						\
31 31
 	$(GDK_SRCS)
32 32
 
33 33
 ASSEMBLIES =					\
34  
-	-pkg:glib-sharp-2.0			\
35  
-	-pkg:gio-sharp-2.0			\
36  
-	-pkg:gtk-sharp-2.0
  34
+	$(GLIBSHARP_LIBS)			\
  35
+	$(GIOSHARP_LIBS)			\
  36
+	$(GTKSHARP_LIBS)
37 37
 
38 38
 all: gtk-sharp-beans.dll
39 39
 
3  configure.ac
@@ -20,8 +20,11 @@ AC_SUBST(GACUTIL)
20 20
 AC_SUBST(GACUTIL_FLAGS)
21 21
 
22 22
 PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12)
  23
+AC_SUBST(GTKSHARP_LIBS)
23 24
 PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= 2.12)
  25
+AC_SUBST(GLIBSHARP_LIBS)
24 26
 PKG_CHECK_MODULES(GIOSHARP, gio-sharp-2.0 >= 2.18)
  27
+AC_SUBST(GIOSHARP_LIBS)
25 28
 PKG_CHECK_MODULES(GAPI, gapi-2.0 >= 2.12.0)
26 29
 
27 30
 CSC_DEFINES=""

0 notes on commit 270c098

Please sign in to comment.
Something went wrong with that request. Please try again.