configure.ac: Require at least Gtk 2.8.0 for the demos (that's the oldest I can test...

Original commit message from CVS:
* configure.ac:
Require at least Gtk 2.8.0 for the demos (that's the oldest I can
test with; I'm fairly certain Gtk 2.0.0 is not good enough any
longer); clean up some unused Gtk-related configure cruft.
* examples/scaletempo/demo-gui.c:
Define Gtk 2.12 function to noop when compiling against older Gtk.

diff --git a/ChangeLog b/ChangeLog
index b697f77..74c64db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-30  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+       * configure.ac:
+         Require at least Gtk 2.8.0 for the demos (that's the oldest I can
+         test with; I'm fairly certain Gtk 2.0.0 is not good enough any
+         longer); clean up some unused Gtk-related configure cruft.
+
+       * examples/scaletempo/demo-gui.c:
+         Define Gtk 2.12 function to noop when compiling against older Gtk.
+
 2008-10-30  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * gst/speexresample/gstspeexresample.c:

diff --git a/configure.ac b/configure.ac
index e644d5f..7c983ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -190,27 +190,7 @@ AC_SUBST(GSTPB_PREFIX)
 
 dnl GTK is optional and used in examples
 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
-  GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-  AC_SUBST(GTK_VERSION)
-  GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
-  AC_SUBST(GTK_BASE_DIR)
-  GDK_PIXBUF_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
-  GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
-  AC_SUBST(GTK_BASE_DIR)
-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)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(HAVE_GTK)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0, HAVE_GTK=yes, HAVE_GTK=no)
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
 dnl libglade is optional and only used in examples

diff --git a/examples/scaletempo/demo-gui.c b/examples/scaletempo/demo-gui.c
index f5a774f..01df999 100644 (file)
--- a/examples/scaletempo/demo-gui.c
+++ b/examples/scaletempo/demo-gui.c
@@ -27,6 +27,10 @@
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "demo-gui"
 
+#if !GTK_CHECK_VERSION(2,12,0)
+#define gtk_widget_error_bell(w)        /* nop */
+#endif
+
 enum
 {
   SIGNAL_ERROR,