diff options
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7b3026f2da..700df49789 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1964,7 +1964,7 @@ AC_DEFUN([AC_WIRESHARK_QT_MODULE_CHECK], # case "$3" in - yes) + yes|unspecified) # # Check for all versions of Qt we support. # diff --git a/configure.ac b/configure.ac index 3e8b031af7..1856a4f6be 100644 --- a/configure.ac +++ b/configure.ac @@ -1640,10 +1640,23 @@ if test "x$enable_wireshark" = "xyes"; then CXXFLAGS="$CXXFLAGS $Qt_CFLAGS" have_qt=yes GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-qt" + + # + # XXX - greasy hack to make ui/gtk/recent.c + # compile. + # + CPPFLAGS="-DQT_GUI_LIB" ], [ case "$with_qt" in + unspecified) + # + # They didn't explicitly ask for Qt, + # so just don't build with it. + # + ;; + yes) AC_MSG_ERROR([Qt is not available]) ;; @@ -1657,12 +1670,6 @@ if test "x$enable_wireshark" = "xyes"; then ;; esac ]) - - # - # XXX - greasy hack to make ui/gtk/recent.c - # compile. - # - CPPFLAGS="-DQT_GUI_LIB" fi if test "x$with_gtk3" = "xyes"; then |