From 1963b18a8dc0a972b23e58dfea099235832cacf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= Date: Thu, 10 Oct 2013 11:44:39 +0200 Subject: [PATCH] configure: require 2.99.2 Also, we now check for glib-sharp instead of gtk-sharp, because even if they are hosted in the same repository named "gtk-sharp", that could change in the future, and glib-sharp provides its own .pc file as well. --- configure.ac | 9 ++++++--- sources/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index c975fa95b4..bb67858c02 100644 --- a/configure.ac +++ b/configure.ac @@ -73,12 +73,15 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) dnl Check for gtk-sharp -PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-3.0) -AC_SUBST(GTK_SHARP_CFLAGS) -AC_SUBST(GTK_SHARP_LIBS) +PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.2) +AC_SUBST(GLIB_SHARP_CFLAGS) +AC_SUBST(GLIB_SHARP_LIBS) gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-3.0` AC_SUBST(gtksharp_prefix) +dnl Find GAPI +PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.2) + dnl Check for gapi AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no) if test "x$GAPI_PARSER" = "xno"; then diff --git a/sources/Makefile.am b/sources/Makefile.am index 04fbede867..9878d52046 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -30,14 +30,14 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(GAPI_FIXUP) --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) - $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GTK_SHARP_CFLAGS) \ + $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) \ --outdir=generated \ --glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.6.so \ --glue-includes=gst/gst.h \ --assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp $(DLL): $(build_sources) generated-stamp - $(CSC) -nowarn:169 -unsafe -target:library $(GTK_SHARP_LIBS) \ + $(CSC) -nowarn:169 -unsafe -target:library $(GLIB_SHARP_LIBS) \ $(build_sources) generated/*.cs -out:$(DLL) install-data-local: