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>

diff --git a/Makefile.am b/Makefile.am
index 140f95bfb2b8f63943ae77d67a504bcec08a1d0a..1401d7dda01da7165c00df7573a394b49dade722 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/acinclude.m4 b/acinclude.m4
index 38555a03fc4e9d0b0701b026aed8ee7aa47c6656..14a848883c8d884f4d660c2438fa9dd3c2d787fd 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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

diff --git a/configure.ac b/configure.ac
index 1ab3d29c4d366f16d3d4d35c784ce774d09af6e2..e170fb03b7d1a6f1cb590f920d262e43aa4b63a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"
 

diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index f276a9663f5bbba83a1f9ef82a90fda683590f45..bf9f8c82e51196895ced25a63c274fc7404cc11b 100644 (file)
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -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