osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up --with-qt handling. 

If you don't specify --with-qt or --without-qt, we build with Qt iff we
find it; we don't fail if we don't find it.

If you specify --with-qt, we build with Qt if we find it and fail if we
don't find it.

If you specify --without-qt, we don't look for Qt and don't build with
it.

This is all independent of --with-gtk2 or --with-gtk3.

Change-Id: I508d3281192bda9168fc46aba6011687c83ef818
Reviewed-on: https://code.wireshark.org/review/8861
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-06-09 16:37:12 -07:00
parent cc1849b67e
commit 3944e55633
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -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.
#

19
configure.ac
View File

@ -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