Revision 528de90a configure
| b/configure | ||
|---|---|---|
| 227 | 227 |
glusterfs="" |
| 228 | 228 |
virtio_blk_data_plane="" |
| 229 | 229 |
gtk="" |
| 230 |
gtkabi="2.0" |
|
| 230 | 231 |
|
| 231 | 232 |
# parse CC options first |
| 232 | 233 |
for opt do |
| ... | ... | |
| 902 | 903 |
;; |
| 903 | 904 |
--enable-gtk) gtk="yes" |
| 904 | 905 |
;; |
| 906 |
--with-gtkabi=*) gtkabi="$optarg" |
|
| 907 |
;; |
|
| 905 | 908 |
*) echo "ERROR: unknown option $opt"; show_help="yes" |
| 906 | 909 |
;; |
| 907 | 910 |
esac |
| ... | ... | |
| 1644 | 1647 |
# GTK probe |
| 1645 | 1648 |
|
| 1646 | 1649 |
if test "$gtk" != "no"; then |
| 1647 |
if $pkg_config --exists 'gtk+-2.0 >= 2.18.0' && \ |
|
| 1648 |
$pkg_config --exists 'vte >= 0.24.0'; then |
|
| 1649 |
gtk_cflags=`$pkg_config --cflags gtk+-2.0 2>/dev/null` |
|
| 1650 |
gtk_libs=`$pkg_config --libs gtk+-2.0 2>/dev/null` |
|
| 1651 |
vte_cflags=`$pkg_config --cflags vte 2>/dev/null` |
|
| 1652 |
vte_libs=`$pkg_config --libs vte 2>/dev/null` |
|
| 1650 |
gtkpackage="gtk+-$gtkabi" |
|
| 1651 |
if test "$gtkabi" = "3.0" ; then |
|
| 1652 |
gtkversion="3.0.0" |
|
| 1653 |
vtepackage="vte-2.90" |
|
| 1654 |
vteversion="0.32.0" |
|
| 1655 |
else |
|
| 1656 |
gtkversion="2.18.0" |
|
| 1657 |
vtepackage="vte" |
|
| 1658 |
vteversion="0.24.0" |
|
| 1659 |
fi |
|
| 1660 |
if $pkg_config --exists "$gtkpackage >= $gtkversion" && \ |
|
| 1661 |
$pkg_config --exists "$vtepackage >= $vteversion"; then |
|
| 1662 |
gtk_cflags=`$pkg_config --cflags $gtkpackage 2>/dev/null` |
|
| 1663 |
gtk_libs=`$pkg_config --libs $gtkpackage 2>/dev/null` |
|
| 1664 |
vte_cflags=`$pkg_config --cflags $vtepackage 2>/dev/null` |
|
| 1665 |
vte_libs=`$pkg_config --libs $vtepackage 2>/dev/null` |
|
| 1653 | 1666 |
libs_softmmu="$gtk_libs $vte_libs $libs_softmmu" |
| 1654 | 1667 |
gtk="yes" |
| 1655 | 1668 |
else |
Also available in: Unified diff