gobject-introspection: fix g-i build for uninstalled setup

Requires gst-plugins-base git (> 0.10.31.2).

diff --git a/configure.ac b/configure.ac
index f83f35d..6cc68d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,8 @@ AG_GST_ARG_GCOV
 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/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
index 8be1f59..02a0bd7 100644 (file)
--- a/gst/rtsp-server/Makefile.am
+++ b/gst/rtsp-server/Makefile.am
@@ -60,6 +60,8 @@ GstRtspServer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@G
                -DIN_GOBJECT_INTROSPECTION=1 \
                --c-include='gst/gst.h' \
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-0.10` \
                --library=libgstrtspserver-0.10.la \
                --include=Gst-0.10 \
                --include=GstRtsp-0.10 \
@@ -81,7 +83,13 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       --includedir=$(srcdir) \
+       --includedir=$(builddir) \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-rtsp-0.10` \
+       --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-sdp-0.10` \
+       $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif