diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-07-28 11:37:49 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-07-28 11:37:49 +0000 |
| commit | 4729506b06b1fdc86d9aaa1250c1a93c212776d9 (patch) | |
| tree | c11a960bbaf3197bf4b5b91fd9671b586eba9538 | |
| parent | f6c63528fe62bc748f6a2e6d037ca4c3ef55fed4 (diff) | |
| download | gstreamer-plugins-bad-4729506b06b1fdc86d9aaa1250c1a93c212776d9.tar.gz | |
second attempt fixing gdkpixbuf stuff
Original commit message from CVS:
second attempt
fixing gdkpixbuf stuff
| -rw-r--r-- | REQUIREMENTS | 4 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/REQUIREMENTS b/REQUIREMENTS index 864924e66..e0823b1ef 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 2a549229b..3f7347e0f 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 *** |