[zenity] Make zenity compile only with GTK+-3.0
- From: Luis Medinas <lmedinas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [zenity] Make zenity compile only with GTK+-3.0
- Date: Sat, 2 Oct 2010 19:58:51 +0000 (UTC)
commit a9dabc7737f73cdf02fa067426f26f113a771205
Author: Luis Medinas <lmedinas gnome org>
Date: Sat Oct 2 20:57:53 2010 +0100
Make zenity compile only with GTK+-3.0
In preparation for GNOME 3.0.
configure.in | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3eb1808..3348f95 100644
--- a/configure.in
+++ b/configure.in
@@ -18,28 +18,9 @@ IT_PROG_INTLTOOL([0.40.0])
AC_PROG_CC
-GTK_REQUIRED=2.18.0
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
- [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
- [case "$with_gtk" in
- 2.0|3.0) ;;
- *) 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=2.18.0
- ;;
- 3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=2.90.4
- ;;
-esac
-
-PKG_CHECK_MODULES([ZENITY],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0])
+GTK_REQUIRED=2.91.0
+
+PKG_CHECK_MODULES([ZENITY],[gtk+-3.0 >= $GTK_REQUIRED glib-2.0])
AC_SUBST([ZENITY_CFLAGS])
AC_SUBST([ZENITY_LIBS])
@@ -49,7 +30,7 @@ dnl *************************
zenity_save_cflags="$CFLAGS"
# pull in the CFLAGS to locate gdkconfig.h
-CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0`
AC_COMPILE_IFELSE([
#include <gdkconfig.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]