[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH ui/gtk 11/13] Add support for enabling build with GT
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH ui/gtk 11/13] Add support for enabling build with GTK3 |
Date: |
Mon, 25 Feb 2013 15:20:44 +0000 |
From: "Daniel P. Berrange" <address@hidden>
Add a arg to configure to switch from GTK2 (default) to
GTK3 (optional) build for QEMU.
./configure --with-gtkabi=3.0
will choose GTK3, while
./configure --with-gtkabi=2.0
will choose GTK2 (and remains the current default)
Signed-off-by: Daniel P. Berrange <address@hidden>
---
configure | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index dcaa67c..8b6309f 100755
--- a/configure
+++ b/configure
@@ -227,6 +227,7 @@ seccomp=""
glusterfs=""
virtio_blk_data_plane=""
gtk=""
+gtkabi="2.0"
# parse CC options first
for opt do
@@ -902,6 +903,8 @@ for opt do
;;
--enable-gtk) gtk="yes"
;;
+ --with-gtkabi=*) gtkabi="$optarg"
+ ;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
@@ -1644,12 +1647,22 @@ fi
# GTK probe
if test "$gtk" != "no"; then
- if $pkg_config --exists 'gtk+-2.0 >= 2.18.0' && \
- $pkg_config --exists 'vte >= 0.24.0'; then
- gtk_cflags=`$pkg_config --cflags gtk+-2.0 2>/dev/null`
- gtk_libs=`$pkg_config --libs gtk+-2.0 2>/dev/null`
- vte_cflags=`$pkg_config --cflags vte 2>/dev/null`
- vte_libs=`$pkg_config --libs vte 2>/dev/null`
+ gtkpackage="gtk+-$gtkabi"
+ if test "$gtkabi" = "3.0" ; then
+ gtkversion="3.0.0"
+ vtepackage="vte-2.90"
+ vteversion="0.32.0"
+ else
+ gtkversion="2.18.0"
+ vtepackage="vte"
+ vteversion="0.24.0"
+ fi
+ if $pkg_config --exists "$gtkpackage >= $gtkversion" && \
+ $pkg_config --exists "$vtepackage >= $vteversion"; then
+ gtk_cflags=`$pkg_config --cflags $gtkpackage 2>/dev/null`
+ gtk_libs=`$pkg_config --libs $gtkpackage 2>/dev/null`
+ vte_cflags=`$pkg_config --cflags $vtepackage 2>/dev/null`
+ vte_libs=`$pkg_config --libs $vtepackage 2>/dev/null`
libs_softmmu="$gtk_libs $vte_libs $libs_softmmu"
gtk="yes"
else
--
1.8.1.2
- [Qemu-devel] [PATCH ui/gtk 02/13] Remove use of gdk_drawable_get_{screen, display}, (continued)
- [Qemu-devel] [PATCH ui/gtk 02/13] Remove use of gdk_drawable_get_{screen, display}, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 05/13] Remove use of GtkVBox in GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 01/13] Add compat for gdk_drawable_get_size on GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 04/13] Conditionalize use of gdk_pointer_grab / gdk_pointer_ungrab, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 03/13] Conditionalize use of gdk_keyboard_grab / gdk_keyboard_ungrab, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 08/13] Conditionalize use of gtk_widget_size_request, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 07/13] Conditionalize use of gdk_display_warp_pointer, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 13/13] Add compat for GDK_KEY_XXX symbols, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 09/13] Replace expose-event handler with draw handler in GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 11/13] Add support for enabling build with GTK3,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH ui/gtk 10/13] Ensure x_keymap.o is built when GTK is enabled, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 06/13] Replace gtk_menu_append with gtk_menu_shell_append, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 12/13] Add compat macro for gtk_widget_get_realized, Daniel P. Berrange, 2013/02/25
- Re: [Qemu-devel] [PATCH ui/gtk 00/13] Add support for GTK3 & fix GTK 2.18, Daniel P. Berrange, 2013/02/27
- Re: [Qemu-devel] [PATCH ui/gtk 00/13] Add support for GTK3 & fix GTK 2.18, Anthony Liguori, 2013/02/27