summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-07-28 11:37:49 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-07-28 11:37:49 +0000
commit4729506b06b1fdc86d9aaa1250c1a93c212776d9 (patch)
treec11a960bbaf3197bf4b5b91fd9671b586eba9538 /configure.ac
parentf6c63528fe62bc748f6a2e6d037ca4c3ef55fed4 (diff)
downloadgst-plugins-bad-4729506b06b1fdc86d9aaa1250c1a93c212776d9.tar.gz
gst-plugins-bad-4729506b06b1fdc86d9aaa1250c1a93c212776d9.tar.bz2
gst-plugins-bad-4729506b06b1fdc86d9aaa1250c1a93c212776d9.zip
second attempt fixing gdkpixbuf stuff
Original commit message from CVS: second attempt fixing gdkpixbuf stuff
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac15
1 files changed, 13 insertions, 2 deletions
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 ***