use gstreamer, if available

diff --git a/configure.ac b/configure.ac
index 86c2de251d1c0390619ebda615844a42c4eed543..c3bb9e55145a495f68bab44f778e1d3317e9ce40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,13 @@ 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(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

 
 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
 
 if test "$withsdl" = "yes" ; then
        TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)


@@ -34,9 +41,9 @@ if test "$withsdl" = "yes" ; then
 fi
 
 CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)'
 fi
 
 CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)'

-CPPFLAGS="$CPPFLAGS -D_REENTRANT $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS"
+CPPFLAGS="$CPPFLAGS -D_REENTRANT $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS $GSTREAMER_CFLAGS"

 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"

-LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS"
+LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS"

 
 TUXBOX_APPS_GETTEXT
 
 
 TUXBOX_APPS_GETTEXT
 

diff --git a/main/Makefile.am b/main/Makefile.am
index bcf99ca56e2b069941abe6867dcedd645225b209..33f54aee2c02a8f2220913ec5b115b1eb06b28d1 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -27,6 +27,7 @@ enigma2_LDADD = \
        @SIGC_LIBS@ \
        @DVBSI_LIBS@ \
        @FRIBIDI_LIBS@ \
        @SIGC_LIBS@ \
        @DVBSI_LIBS@ \
        @FRIBIDI_LIBS@ \

+       @GSTREAMER_LIBS@ \

        -ldl -lpthread -lcrypt -lresolv
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
        -ldl -lpthread -lcrypt -lresolv
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)