[gimp/gtk3-port: 236/246] configure.ac: use the new GTK_CHECK_BACKEND() macro



commit 3e100532b0fc16d6c99dfb975d3b8a4c5d80e49d
Author: Michael Natterer <mitch gimp org>
Date:   Wed Feb 16 20:49:33 2011 +0100

    configure.ac: use the new GTK_CHECK_BACKEND() macro
    
    so GTK+ target detection works again.

 app/gui/gui.c |    2 +-
 configure.ac  |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/app/gui/gui.c b/app/gui/gui.c
index c4c4434..3f07f62 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -248,7 +248,7 @@ gui_sanity_check (void)
 {
 #define GTK_REQUIRED_MAJOR 3
 #define GTK_REQUIRED_MINOR 0
-#define GTK_REQUIRED_MICRO 0
+#define GTK_REQUIRED_MICRO 1
 
   const gchar *mismatch = gtk_check_version (GTK_REQUIRED_MAJOR,
                                              GTK_REQUIRED_MINOR,
diff --git a/configure.ac b/configure.ac
index 6242dc9..319256d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
 m4_define([babl_required_version], [0.1.4])
 m4_define([gegl_required_version], [0.1.6])
 m4_define([glib_required_version], [2.26.0])
-m4_define([gtk_required_version], [3.0.0])
+m4_define([gtk_required_version], [3.0.1])
 m4_define([gdk_pixbuf_required_version], [2.22.1])
 m4_define([cairo_required_version], [1.10.0])
 m4_define([cairo_pdf_required_version], [1.10.0])
@@ -934,11 +934,12 @@ AC_ARG_ENABLE(gimp-remote,
 ################################
 
 # Check if building for GTK+-X11
-gdk_target=`$PKG_CONFIG --variable=target gtk+-3.0`
+GTK_CHECK_BACKEND([x11], [gtk_required_version],
+                  [have_gtk_x11=yes], [have_gtk_x11=no])
 
-have_libxmu="no (building for $gdk_target)"
+have_libxmu="no (building for `pkg-config --variable=targets gtk-3.0`)"
 
-if test "$gdk_target" = x11; then
+if test "x$have_gtk_x11" = "xyes"; then
 
    # doc-shooter is X11 specific
    DOC_SHOOTER=doc-shooter
@@ -1233,7 +1234,7 @@ gimp_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS"
 gimp_save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $X_LIBS"
-if test "$gdk_target" = x11; then
+if test "x$have_gtk_x11" = "xyes"; then
   lib_X11=-lX11
 fi
 have_libxpm=no



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]