diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-01-08 01:36:13 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-01-08 01:36:13 +0000 |
| commit | 9637de0afd0d905720f63ebe38158dee1c548ab6 (patch) | |
| tree | 2d92d832340599e44739ad9f727e9ea9327b52b8 | |
| parent | e6f5bc0f13029dfeedbfe4ecef37eeeb7499055a (diff) | |
gobject-introspection: fix g-i build for uninstalled setup
Requires gst-plugins-base git (> 0.10.31.2) to actually work.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ges/Makefile.am | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0818c306f2..dd14885b07 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,8 @@ AG_GST_ARG_WITH_PKG_CONFIG_PATH AG_GST_ARG_WITH_PACKAGE_NAME AG_GST_ARG_WITH_PACKAGE_ORIGIN +AG_GST_PKG_CONFIG_PATH + dnl *** checks for platform *** dnl * hardware/architecture * diff --git a/ges/Makefile.am b/ges/Makefile.am index 4de293385e..9de2ae8020 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -126,7 +126,8 @@ GES-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libges-@GST_MAJORMINOR@.la $(gir_cincludes) \ -I$(top_srcdir) \ -I$(top_builddir) \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10 gstreamer-pbutils-0.10` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \ --library=libges-@GST_MAJORMINOR@.la \ --include=Gst-@GST_MAJORMINOR@ \ --include=GstPbutils-@GST_MAJORMINOR@ \ @@ -148,11 +149,13 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(AM_V_GEN)$(INTROSPECTION_COMPILER) \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ + $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(srcdir)/../video \ --includedir=$(builddir) \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10 gstreamer-pbutils-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \ + --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |