From 8b1ec41d0858fe257d2aa5db1e450e4c726d00a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 8 Jan 2011 01:15:35 +0000 Subject: [PATCH] gobject-introspection: fix g-i build for uninstalled setup Requires gst-plugins-base git (> 0.10.31.2). --- configure.ac | 2 ++ gst/rtsp-server/Makefile.am | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f83f35d820..6cc68d7262 100644 --- 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 8be1f593b5..02a0bd7787 100644 --- 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