forked from osmocom/wireshark
autotools: Use Qt flags only for building Qt GUI
Change-Id: I041e2fab6de948c803cc059e78358077000efee8 Reviewed-on: https://code.wireshark.org/review/14006 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
parent
a795a3033a
commit
1b3ae81e9e
|
@ -429,6 +429,7 @@ wireshark_LDADD = \
|
|||
ui/qt/libqtui.a \
|
||||
$(wireshark_common_ldadd) \
|
||||
@Qt_LIBS@
|
||||
wireshark_CPPFLAGS = $(AM_CPPFLAGS) $(Qt_CFLAGS)
|
||||
endif
|
||||
|
||||
if HAVE_GTK
|
||||
|
|
|
@ -2104,8 +2104,6 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
|
|||
|
||||
AC_WIRESHARK_QT_ADD_PIC_IF_NEEDED
|
||||
|
||||
AC_SUBST(Qt_LIBS)
|
||||
|
||||
# Run Action-If-Found
|
||||
ifelse([$3], , :, [$3])
|
||||
else
|
||||
|
|
|
@ -1644,8 +1644,8 @@ if test "x$enable_wireshark" = "xyes"; then
|
|||
#
|
||||
AC_WIRESHARK_QT_CHECK($QT_MIN_VERSION, "$with_qt",
|
||||
[
|
||||
WS_CFLAGS="$WS_CFLAGS $Qt_CFLAGS"
|
||||
WS_CXXFLAGS="$WS_CXXFLAGS $Qt_CFLAGS"
|
||||
AC_SUBST(Qt_CFLAGS)
|
||||
AC_SUBST(Qt_LIBS)
|
||||
have_qt=yes
|
||||
GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-qt"
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
include Makefile.common
|
||||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS)
|
||||
AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(Qt_CFLAGS)
|
||||
|
||||
noinst_LIBRARIES = libqtui.a
|
||||
|
||||
|
|
Loading…
Reference in New Issue