From 2cf2f36fb3cc2c114c8ba1220f345f10e458fb87 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 5 May 2015 22:37:25 -0700 Subject: 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 --- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index de9477378c..166f3653ae 100644 --- a/configure.ac +++ b/configure.ac @@ -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 # -- cgit v1.2.3