diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2013-02-25 15:20:44 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-26 13:29:54 -0600 |
| commit | 528de90ab7133e22df7c1da4632a6dcd525e88f0 (patch) | |
| tree | 5b83613d13eac7dd5187bf99dbd6ae54de67c314 | |
| parent | 0d20664018a401120af28ff80ac8d22fbc887956 (diff) | |
| download | qemu-528de90ab7133e22df7c1da4632a6dcd525e88f0.zip qemu-528de90ab7133e22df7c1da4632a6dcd525e88f0.tar.gz qemu-528de90ab7133e22df7c1da4632a6dcd525e88f0.tar.bz2 | |
Add support for enabling build with GTK3
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 <berrange@redhat.com>
Message-id: 1361805646-6425-12-git-send-email-berrange@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rwxr-xr-x | configure | 25 |
1 files changed, 19 insertions, 6 deletions
@@ -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 |