aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-03-16 17:51:43 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-03-16 17:51:43 +0000
commit667a16847d5d76bd5602c722528bfe543e752c25 (patch)
treea11b9a0035792e7645c9a725ca3aad526817da5c
parente617623ad35cfdf823d61b7488b6b7d6ba26d608 (diff)
downloadenigma2-667a16847d5d76bd5602c722528bfe543e752c25.tar.gz
enigma2-667a16847d5d76bd5602c722528bfe543e752c25.zip
use gstreamer, if available
-rw-r--r--configure.ac11
-rw-r--r--main/Makefile.am1
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 86c2de25..c3bb9e55 100644
--- 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(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)
@@ -34,9 +41,9 @@ if test "$withsdl" = "yes" ; then
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"
-LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS"
+LDFLAGS="$LDFLAGS -pthread $PYTHON_LDFLAGS $SDL_LDFLAGS $GSTREAMER_LDFLAGS"
TUXBOX_APPS_GETTEXT
diff --git a/main/Makefile.am b/main/Makefile.am
index bcf99ca5..33f54aee 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -27,6 +27,7 @@ enigma2_LDADD = \
@SIGC_LIBS@ \
@DVBSI_LIBS@ \
@FRIBIDI_LIBS@ \
+ @GSTREAMER_LIBS@ \
-ldl -lpthread -lcrypt -lresolv
enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)