diff options
| author | Luis Medinas <lmedinas@gnome.org> | 2010-10-02 20:57:53 +0100 |
|---|---|---|
| committer | Luis Medinas <metalgod@heisenberg.site> | 2010-10-02 20:58:54 +0100 |
| commit | a9dabc7737f73cdf02fa067426f26f113a771205 (patch) | |
| tree | 09c29b4d93f87b6f7cf805eb9fa5257cc53f8b9c | |
| parent | Remove GDK_DISPLAY() usage. Fixes build with GTK+-3.0 (diff) | |
| download | zenity-a9dabc7737f73cdf02fa067426f26f113a771205.tar.gz zenity-a9dabc7737f73cdf02fa067426f26f113a771205.tar.bz2 zenity-a9dabc7737f73cdf02fa067426f26f113a771205.zip | |
Make zenity compile only with GTK+-3.0
In preparation for GNOME 3.0.
| -rw-r--r-- | configure.in | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/configure.in b/configure.in index 3eb18089..3348f954 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> |