summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REQUIREMENTS4
-rw-r--r--configure.ac15
2 files changed, 17 insertions, 2 deletions
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 864924e6..e0823b1e 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -65,6 +65,10 @@ raw1394/linux1394 (for the dv plugin)
libdvdread (for the dvdsrc)
http://www.dtek.chalmers.se/groups/dvd/
(optional: libcss for encrypted DVDs)
+libdvdnav (for the dvdnavsrc)
+ http://dvd.sourceforge.net/
+ (optional: libcss for encrypted DVDs)
+ >= 0.1.9
libesound (for the esd sink
ftp.gnome.org/pub/GNOME/stable/sources/esound)
gnome-vfs (for the gnome-vfs src)
diff --git a/configure.ac b/configure.ac
index 2a549229..3f7347e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,18 @@ dnl Check for essential libraries first:
dnl ====================================
GST_GLIB2_CHECK()
-PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
+
+dnl GTK
+HAVE_GTK=NO
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)
+if test "x$HAVE_GTK_22" = "xyes"; then
+ HAVE_GTK=yes
+else
+ PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
+fi
+if test "x$HAVE_GTK_20" = "xyes"; then
+ HAVE_GTK=yes
+fi
GTK_CFLAGS=$GTK2_CFLAGS
GTK_LIBS=$GTK2_LIBS
AC_SUBST(GTK_LIBS)
@@ -684,7 +695,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
dnl *** GDK pixbuf ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
- if test $HAVE_GTK = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
+ if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
])
dnl *** Gnome VFS ***