Check for gtk-sharp and glib-sharp and conditionally compile the samples

diff --git a/configure.ac b/configure.ac
index 986c4aef957d39e42d49aa2be9fe1124ef681524..1139fe2e62b080772ff5933bd95de1d1b8f3bf38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,14 @@ PKG_CHECK_MODULES(GST,
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
 
+# glib-sharp and gtk-sharp are currently only needed for the samples
+PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= 2.12, have_glibsharp=yes, have_glibsharp=no)
+PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12, have_gtksharp=yes, have_gtksharp=no)
+AC_SUBST(GLIBSHARP_LIBS)
+AC_SUBST(GTKSHARP_LIBS)
+AM_CONDITIONAL(HAVE_GLIB_SHARP, test "x$have_glibsharp" = "xyes")
+AM_CONDITIONAL(HAVE_GTK_SHARP, test "x$have_gtksharp" = "xyes")
+
 AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
 
 ## Check for the gapi programs

diff --git a/samples/Makefile.am b/samples/Makefile.am
index 43c7fe054615ba43be2e9bad677637c18e55469f..b6fa410ab832d0c4b7c962e1a17733e2c5d62113 100644 (file)
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1,13 +1,17 @@
-if USE_MONO_COMPILER
-MCS_TARGETS = gtk-video-player.exe
+TARGETS =
+
+if HAVE_GLIB_SHARP
+TARGETS += playbin-player.exe decodebin-transcoder.exe helloworld.exe typefind.exe metadata.exe appsrc.exe
+if HAVE_GTK_SHARP
+TARGETS += gtk-video-player.exe
+endif
 endif
-TARGETS = playbin-player.exe decodebin-transcoder.exe helloworld.exe typefind.exe metadata.exe appsrc.exe $(MCS_TARGETS)
 DEBUGS = $(addsuffix .mdb, $(TARGETS))
 
 all: $(TARGETS) link
 
 assemblies=$(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll
-references=$(addprefix -r:, $(assemblies)) -pkg:glib-sharp-2.0
+references=$(addprefix -r:, $(assemblies)) $(GLIBSHARP_LIBS)
 
 playbin-player.exe: $(srcdir)/PlayBinPlayer.cs $(assemblies)
        $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(srcdir)/PlayBinPlayer.cs
@@ -34,7 +38,7 @@ appsrc.exe: $(srcdir)/AppSrc.cs $(assemblies)
        $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) -r:Mono.Cairo.dll $(srcdir)/AppSrc.cs
 
 gtk-video-player.exe: $(srcdir)/GtkVideoPlayer.cs $(assemblies)
-       $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) -pkg:gtk-sharp-2.0 $(srcdir)/GtkVideoPlayer.cs
+       $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(GTKSHARP_LIBS) $(srcdir)/GtkVideoPlayer.cs
 
 link:
        ln -sf $(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll gstreamer-sharp.dll
@@ -49,4 +53,8 @@ EXTRA_DIST = \
        PlayBinPlayer.cs \
        DecodeBinTranscoder.cs \
        HelloWorld.cs \
-       TypeFind.cs
+       TypeFind.cs \
+       MetaData.cs \
+       AppSrc.cs \
+       GtkVideoPlayer.cs
+