[seed] Fix build when using gtk3



commit f7b765ecefd2b8ff5748c4c2757f4594c2c26ed7
Author: Frederic Crozat <fred crozat net>
Date:   Thu Feb 17 07:26:32 2011 +0100

    Fix build when using gtk3
    
    Check gtk version used :
    some modules are hardcoding gtk2 / gdk2 in their configure.ac part.
    Fixes #641264

 configure.ac |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 091f49f..01b0353 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,11 @@ if test x"$want_canvas_module" == x"yes" ; then
 	PKG_CHECK_MODULES(CAIRO, cairo)
 	AC_SUBST(CAIRO_CFLAGS)
 	AC_SUBST(CAIRO_LDFLAGS)
-	PKG_CHECK_MODULES(GDK, gdk-2.0)
+	if test x"$with_webkit" == x"3.0" ; then
+		PKG_CHECK_MODULES(GDK, gdk-3.0)
+	else
+		PKG_CHECK_MODULES(GDK, gdk-2.0)
+	fi
 	AC_SUBST(GDK_CFLAGS)
 	AC_SUBST(GDK_LDFLAGS)
 fi
@@ -275,7 +279,11 @@ AC_ARG_ENABLE(gtkbuilder-module,
 			  [want_gtkbuilder_module=$enableval],[want_gtkbuilder_module="yes"])
 
 if test x"$want_gtkbuilder_module" == x"yes" ; then
-   PKG_CHECK_MODULES(GTK, gtk+-2.0)
+   if test x"$with_webkit" == x"3.0" ; then
+	PKG_CHECK_MODULES(GTK, gtk+-3.0)
+   else
+	PKG_CHECK_MODULES(GTK, gtk+-2.0)
+   fi
    AC_SUBST(GTK_CFLAGS)
    AC_SUBST(GTK_LDFLAGS)
 fi



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