Skip to content
Browse files

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...
1 parent 6b09480 commit 270c098e625be97b5e055af0887c2a4d7b855fb6 @bl8 bl8 committed
Showing with 6 additions and 3 deletions.
  1. +3 −3 Makefile.am
  2. +3 −0 configure.ac
View
6 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
View
3 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=""

0 comments on commit 270c098

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