minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

Make zenity compile with GTK2 and GTK3

Browse Source 
GNOME 2.32 will use GTK2 but Zenity is ready for GNOME 3.0
This commit is contained in:
Luis Medinas 2010-07-29 22:19:48 +01:00
parent 03081cf046
commit 6d0c1a586e
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure.in
View File

@ -18,9 +18,28 @@ IT_PROG_INTLTOOL([0.40.0])
AC_PROG_CC AC_PROG_CC
GTK_REQUIRED=2.90.2 GTK_REQUIRED=2.18.0
PKG_CHECK_MODULES([ZENITY],[gtk+-3.0 >= $GTK_REQUIRED glib-2.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])
AC_SUBST([ZENITY_CFLAGS]) AC_SUBST([ZENITY_CFLAGS])
AC_SUBST([ZENITY_LIBS]) AC_SUBST([ZENITY_LIBS])
@ -30,7 +49,7 @@ dnl *************************
zenity_save_cflags="$CFLAGS" zenity_save_cflags="$CFLAGS"
# pull in the CFLAGS to locate gdkconfig.h # pull in the CFLAGS to locate gdkconfig.h
CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([
#include <gdkconfig.h> #include <gdkconfig.h>