From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 17 Mar 2006 16:43:33 +0000 (+0000)
Subject: fix: gstreamer is supposed to be optional.
X-Git-Tag: 2.6.0~3801
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/8fe79ba2f6ea1cb50225d7e9343ec9cd47632cd0

fix: gstreamer is supposed to be optional.
---

diff --git a/acinclude.m4 b/acinclude.m4
index e58d2751..a2a623c4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -246,6 +246,18 @@ AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
+AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL,[
+PKG_CHECK_MODULES($1,$2,$3="yes",$3="no")
+if test "x$3" = "xyes"; then
+	AC_DEFINE($3, 1, [$2 available])
+else
+	$1_CFLAGS=""
+	$1_LIBS=""
+fi
+AC_SUBST($1_CFLAGS)
+AC_SUBST($1_LIBS)
+])
+
 AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 if test -z "$$1_CFLAGS" ; then
diff --git a/configure.ac b/configure.ac
index c3bb9e55..59e7c539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,13 +27,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2)
 TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++)
-_TUXBOX_APPS_LIB_PKGCONFIG(GSTREAMER,gstreamer)
-
-if test -z "$GSTREAMER_CFLAGS" ; then
-  AC_MSG_WARN([could not find package GSTREAMER]);
-else
-	AC_DEFINE_UNQUOTED([HAVE_GSTREAMER],1,[Define to 1 if you have gstreamer])
-fi
+_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(GSTREAMER,gstreamer >= 0.10,HAVE_GSTREAMER)
 
 if test "$withsdl" = "yes" ; then
 	TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)