osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix configuration with --without-qt and with no --with-gtk[23]. 

If building with Wireshark wasn't explicitly disabled - i.e., if we are
building Wireshark, which means we are building an application with a
GUI - and Qt was explicitly disabled, and neither GTK+ 2 nor GTK+ 3 were
explicitly enabled, look for GTK+ 3.

Change-Id: Ib913355f7b483d065e766605aa88a71fa9984f36
Reviewed-on: https://code.wireshark.org/review/8306
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-05-05 22:37:25 -07:00
parent b5ef92efc0
commit 2cf2f36fb3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -1601,10 +1601,19 @@ if test "x$enable_wireshark" = "xyes"; then
"x$with_gtk3" = "xunspecified" -a \
"x$with_qt" = "xunspecified"; then
#
# No GUI toolkit was explicitly specified; pick Qt and GTK+ 3.
# No GUI toolkits were explicitly specified; pick Qt
# and GTK+ 3.
#
with_qt=yes
with_gtk3=yes
elif test "x$with_gtk2" = "xunspecified" -a \
"x$with_gtk3" = "xunspecified" -a \
"x$with_qt" = "xno"; then
#
# Qt was explicitly disabled, and neither GTK+ 2 nor
# GTK+ 3 were explicitly specified; pick GTK+ 3.
#
with_gtk3=yes
fi
if test "x$with_qt" != "xno"; then
#