[gegl] build: Add ability to specify GTK+ 3.0
- From: Jon Nordby <jonnor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] build: Add ability to specify GTK+ 3.0
- Date: Mon, 28 Mar 2011 19:08:20 +0000 (UTC)
commit 6fb98ba8173711ed6defc0d44d7c08900a6737c5
Author: Jon Nordby <jononor gmail com>
Date: Sun Mar 27 18:58:00 2011 +0000
build: Add ability to specify GTK+ 3.0
configure.ac | 64 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 334b0cd..fce2246 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,8 @@ m4_define([gimp_full_name], [Generic Graphical Library])
# required versions of external libraries
m4_define([babl_required_version], [0.1.4])
m4_define([glib_required_version], [2.22.0])
-m4_define([gtk_required_version], [2.18.0])
+m4_define([gtk2_required_version], [2.18.0])
+m4_define([gtk3_required_version], [3.0.0])
m4_define([lua_required_version], [5.1.0])
m4_define([cairo_required_version], [0.0.0])
m4_define([pango_required_version], [0.0.0])
@@ -118,9 +119,11 @@ gegltargetlib=libgegl-$GEGL_API_VERSION.la
AC_SUBST(gegltargetlib)
GLIB_REQUIRED_VERSION=glib_required_version
-GTK_REQUIRED_VERSION=gtk_required_version
+GTK2_REQUIRED_VERSION=gtk2_required_version
+GTK3_REQUIRED_VERSION=gtk3_required_version
AC_SUBST(GLIB_REQUIRED_VERSION)
-AC_SUBST(GTK_REQUIRED_VERSION)
+AC_SUBST(GTK2_REQUIRED_VERSION)
+AC_SUBST(GTK3_REQUIRED_VERSION)
LUA_REQUIRED_VERSION=lua_required_version
AC_SUBST(LUA_REQUIRED_VERSION)
@@ -434,19 +437,58 @@ AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes")
DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
-AC_ARG_WITH(gtk, [ --without-gtk build without gtk+ support])
+
+AC_MSG_CHECKING([which gtk+ version to compile against])
+AC_ARG_WITH([gtk],
+ [AS_HELP_STRING([--with-gtk=2.0|3.0|no],[which gtk+ version to compile against (default: 2.0)])],
+ [case "$with_gtk" in
+ 2.0|3.0|no) ;;
+ *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+ esac],
+ [with_gtk=2.0])
+AC_MSG_RESULT([$with_gtk])
+
+case "$with_gtk" in
+ 2.0) GTK_API_VERSION=2.0
+ GTK_REQUIRED=$GTK2_REQUIRED_VERSION
+ ;;
+ 3.0) GTK_API_VERSION=3.0
+ GTK_REQUIRED=GTK3_REQUIRED_VERSION
+ ;;
+esac
+
+have_gtk2="no"
+if test "x$with_gtk" = "x2.0"; then
+ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION,
+ have_gtk2="yes"
+ AC_DEFINE(HAVE_GTK2, 1, [Define to 1 to compile with gtk2 support.])
+ GTK_CFLAGS="$GTK2_CFLAGS"
+ GTK_LIBS="$GTK2_LIBS",
+ have_gtk2="no (gtk+ 2.0 not found)")
+fi
+
+have_gtk3="no"
+if test "x$with_gtk" = "x3.0"; then
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= $GTK2_REQUIRED_VERSION,
+ have_gtk3="yes"
+ AC_DEFINE(HAVE_GTK3, 1, [Define to 1 to compile with gtk3 support.])
+ GTK_CFLAGS="$GTK3_CFLAGS"
+ GTK_LIBS="$GTK3_LIBS",
+ have_gtk3="no (gtk+ 3.0 not found)")
+fi
have_gtk="no"
-if test "x$with_gtk" != "xno"; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
- have_gtk="yes"
+if test "$have_gtk2" = "yes"; then
+ have_gtk="2.0"
+ AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
+elif test "$have_gtk3" = "yes"; then
+ have_gtk="3.0"
AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
- GTK_CFLAGS="$GTK_CFLAGS"
- GTK_LIBS="$GTK_LIBS",
- have_gtk="no (gtk+ not found)")
fi
-AM_CONDITIONAL(HAVE_GTK, test "$have_gtk" = "yes")
+AM_CONDITIONAL(HAVE_GTK, test "$have_gtk" != "no")
+AM_CONDITIONAL(HAVE_GTK2, test "$have_gtk2" = "yes")
+AM_CONDITIONAL(HAVE_GTK3, test "$have_gtk3" = "yes")
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]