From 2154455db891f130beb606743561eebdb1e54267 Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Sun, 20 Jul 2014 03:52:58 +0200 Subject: [PATCH] Add gio-sharp dependency --- configure.ac | 7 ++++++- sources/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b6958b36f2..8d8f57aa00 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ AC_SUBST(GACUTIL_FLAGS) AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) -dnl Check for gtk-sharp +dnl Check for glib-sharp PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.3) AC_SUBST(GLIB_SHARP_CFLAGS) AC_SUBST(GLIB_SHARP_LIBS) @@ -82,6 +82,11 @@ gapidir=`pkg-config --variable=gapidir gtk-sharp-3.0` AC_SUBST(gtksharp_prefix) AC_SUBST(gapidir) +dnl Check for gio-sharp +PKG_CHECK_MODULES(GIO_SHARP, gio-sharp-3.0 >= 2.99.3) +AC_SUBST(GIO_SHARP_CFLAGS) +AC_SUBST(GIO_SHARP_LIBS) + dnl Find GAPI PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.3) diff --git a/sources/Makefile.am b/sources/Makefile.am index 87b95e54b8..5680a89ddf 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -32,14 +32,14 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) generated-stamp: $(API) rm -rf generated/* && \ - $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) \ + $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) $(GIO_SHARP_CFLAGS) \ --outdir=generated \ --glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.0.dll \ --glue-includes=gst/gst.h,`cd $(GST_INCLUDEDIR);find gst -type f -name "*.h" -not -path "gst/gl/*" | tr "\n" ","` \ --assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp $(DLL): $(build_sources) generated-stamp - $(CSC) -nowarn:169 -nowarn:108 -nowarn:114 -unsafe -target:library $(GLIB_SHARP_LIBS) \ + $(CSC) -nowarn:169 -nowarn:108 -nowarn:114 -unsafe -target:library $(GLIB_SHARP_LIBS) $(GIO_SHARP_LIBS) \ $(build_sources) generated/*/*.cs -out:$(DLL) install-data-local: