From f0fb79d534c4276d30838bb25fc624e3eabce83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Fri, 19 Feb 2016 08:20:35 +0000
Subject: autotools: Use pkg-config autoconf macros for GLib/GTK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset
of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add
dependency flags explicitly instead of using WS_CPPFLAGS.

Some minor improvements and fixes for missing/unnecessary variables (no impact
on our test builds).

Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671
Reviewed-on: https://code.wireshark.org/review/14005
Reviewed-by: João Valverde <j@v6e.pt>
---
 Makefile.am                        | 136 +++++++++++------------
 Makefile.am.inc                    |  24 ++--
 aclocal-fallback/glib-2.0.m4       | 212 ------------------------------------
 aclocal-fallback/gtk-2.0.m4        | 191 --------------------------------
 aclocal-fallback/gtk-3.0.m4        | 218 -------------------------------------
 capchild/Makefile.am               |   2 +
 caputils/Makefile.am               |   2 +
 codecs/Makefile.am                 |   7 +-
 configure.ac                       | 136 ++++++++++-------------
 echld/Makefile.am                  |   3 +-
 epan/Makefile.am                   |   8 +-
 epan/compress/Makefile.am          |   2 +
 epan/crypt/Makefile.am             |   2 +
 epan/dfilter/Makefile.am           |   5 +-
 epan/dissectors/Makefile.am        |   4 +-
 epan/dissectors/dcerpc/Makefile.am |   4 +-
 epan/ftypes/Makefile.am            |   5 +-
 epan/nghttp2/Makefile.am           |   3 +-
 epan/wmem/Makefile.am              |   3 +-
 epan/wslua/Makefile.am             |   3 +-
 extcap/Makefile.am                 |   2 +
 plugins/Makefile.am.inc            |   4 +
 plugins/docsis/Makefile.am         |   4 +
 plugins/ethercat/Makefile.am       |   4 +
 plugins/gryphon/Makefile.am        |   4 +
 plugins/irda/Makefile.am           |   4 +
 plugins/m2m/Makefile.am            |   4 +
 plugins/mate/Makefile.am           |   4 +-
 plugins/opcua/Makefile.am          |   4 +
 plugins/profinet/Makefile.am       |   4 +
 plugins/stats_tree/Makefile.am     |   4 +
 plugins/tpg/Makefile.am            |   4 +
 plugins/unistim/Makefile.am        |   4 +
 plugins/wimax/Makefile.am          |   4 +
 plugins/wimaxasncp/Makefile.am     |   4 +-
 plugins/wimaxmacphy/Makefile.am    |   4 +
 randpkt_core/Makefile.am           |   2 +
 ui/Makefile.am                     |   4 +-
 ui/cli/Makefile.am                 |   3 +-
 ui/gtk/Makefile.am                 |   3 +-
 ui/qt/Makefile.am                  |   2 +-
 wiretap/Makefile.am                |   4 +-
 wsutil/Makefile.am                 |   5 +-
 43 files changed, 253 insertions(+), 802 deletions(-)
 delete mode 100644 aclocal-fallback/glib-2.0.m4
 delete mode 100644 aclocal-fallback/gtk-2.0.m4
 delete mode 100644 aclocal-fallback/gtk-3.0.m4

diff --git a/Makefile.am b/Makefile.am
index 53295a8298..c7440e7626 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,9 @@ AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
 ACLOCAL_AMFLAGS = `./aclocal-flags`
 
 # Common headers
-AM_CPPFLAGS += $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) \
-	$(LUA_CFLAGS) $(KRB5_CFLAGS)
+COMMONCPPFLAGS =
+
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(COMMONCPPFLAGS)
 
 bin_PROGRAMS = \
 	@wireshark_bin@		\
@@ -362,19 +363,9 @@ endif		# HAVE_PLUGINS
 include Makefile.common
 
 if ENABLE_STATIC
-if HAVE_GTK
-wireshark_gtk_LDFLAGS = -Wl,-static -all-static
-endif
-if HAVE_Qt
-wireshark_LDFLAGS = -Wl,-static -all-static
-endif
+EXTRALINKFLAGS = -Wl,-static -all-static
 else
-if HAVE_GTK
-wireshark_gtk_LDFLAGS = -export-dynamic
-endif
-if HAVE_Qt
-wireshark_LDFLAGS = -export-dynamic @Qt_LDFLAGS@
-endif
+EXTRALINKFLAGS = -export-dynamic
 endif
 
 # Libraries and plugin flags with which to link wireshark.
@@ -385,19 +376,8 @@ endif
 # needed for X applications, and GTK+ applications are X applications
 # if the version of GTK+ they're built with runs atop X11).
 #
-# However, it *does* have to be linked with @GLIB_LIBS@; not all of
-# the necessary GLib libraries are included in @GTK_LIBS@.  To quote
-# Gentoo bug 423743 at
-#
-#	https://bugs.gentoo.org/show_bug.cgi?id=423743
-#
-# "The Makefile.am claims including GLIB_LIBS when linking wireshark is
-# unnecessary, because wireshark links to GTK_LIBS which is a superset.
-# It is not actually a superset: gmodule is included in GLIB_LIBS but
-# not in GTK_LIBS (unless accidentally on older glibs/gtks)."
-#
-# although it's also possible that -lgmodule is in GTK_LIBS but not
-# GLIB_LIBS (that's the case on my machine right now, for example).
+# GTK_CFLAGS/GTK_LIBS is a strict superset of GLIB_CFLAGS/GLIB_LIBS
+# (see configure.ac for pkg-config modules used).
 #
 wireshark_common_ldadd = \
 	capchild/libcapchild.a		\
@@ -419,34 +399,39 @@ wireshark_common_ldadd = \
 	@COREFOUNDATION_FRAMEWORKS@	\
 	@LIBGCRYPT_LIBS@		\
 	@LIBGNUTLS_LIBS@		\
-	@LIBSMI_LDFLAGS@		\
-	@GLIB_LIBS@
+	@LIBSMI_LDFLAGS@
 
 if HAVE_Qt
 wireshark_SOURCES = $(WIRESHARK_COMMON_SRC) wireshark-qt.cpp
-wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
+
+wireshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(Qt_CFLAGS)
+
+wireshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS) $(Qt_LDFLAGS)
+
 wireshark_LDADD = \
-	ui/qt/libqtui.a \
-	$(wireshark_common_ldadd) \
-	@Qt_LIBS@
-wireshark_CPPFLAGS = $(AM_CPPFLAGS) $(Qt_CFLAGS)
+	ui/qt/libqtui.a			\
+	$(wireshark_common_ldadd)	\
+	$(GLIB_LIBS)			\
+	$(Qt_LIBS)
 endif
 
 if HAVE_GTK
 wireshark_gtk_SOURCES = $(WIRESHARK_COMMON_SRC)
-wireshark_gtk_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
+
+wireshark_gtk_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS)
+
+wireshark_gtk_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
+
 wireshark_gtk_LDADD = \
-	ui/gtk/libgtkui.a \
-	$(wireshark_common_ldadd) \
-	@PORTAUDIO_LIBS@		\
-	@GTK_LIBS@
+	ui/gtk/libgtkui.a		\
+	$(wireshark_common_ldadd)	\
+	$(GTK_LIBS)			\
+	@PORTAUDIO_LIBS@
 endif
 
-if ENABLE_STATIC
-tshark_LDFLAGS = -Wl,-static -all-static
-else
-tshark_LDFLAGS = -export-dynamic
-endif
+tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
+tshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
 
 # Libraries and plugin flags with which to link tshark.
 tshark_LDADD = \
@@ -472,11 +457,9 @@ tshark_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
 
-if ENABLE_STATIC
-tfshark_LDFLAGS = -Wl,-static -all-static
-else
-tfshark_LDFLAGS = -export-dynamic
-endif
+tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
+tfshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
 
 # Libraries and plugin flags with which to link tfshark.
 tfshark_LDADD = \
@@ -497,11 +480,9 @@ tfshark_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
 
-if ENABLE_STATIC
-rawshark_LDFLAGS = -Wl,-static -all-static
-else
-rawshark_LDFLAGS = -export-dynamic
-endif
+rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
+rawshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
 
 # Libraries and plugin flags with which to link rawshark.
 rawshark_LDADD = \
@@ -525,10 +506,7 @@ rawshark_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
 
-# Libraries with which to link text2pcap.
-text2pcap_LDADD = \
-	wsutil/libwsutil.la		\
-	@GLIB_LIBS@
+text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
 # Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c
 # which is generated (and therefore not always clean).
@@ -536,12 +514,21 @@ text2pcap_LDADD = \
 # doesn't seem worth the effort.
 text2pcap_CFLAGS = $(GENERATED_CFLAGS)
 
+# Libraries with which to link text2pcap.
+text2pcap_LDADD = \
+	wsutil/libwsutil.la		\
+	@GLIB_LIBS@
+
+mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries with which to link mergecap.
 mergecap_LDADD = \
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
+capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries with which to link capinfos.
 capinfos_LDADD = \
 	wiretap/libwiretap.la		\
@@ -549,24 +536,32 @@ capinfos_LDADD = \
 	@GLIB_LIBS@			\
 	@LIBGCRYPT_LIBS@
 
+captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries with which to link captype.
 captype_LDADD = \
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
+editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries with which to link editcap.
 editcap_LDADD = \
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
+reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries with which to link reordercap.
 reordercap_LDADD = \
 	wiretap/libwiretap.la		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
+randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries with which to link randpkt.
 randpkt_LDADD = \
 	randpkt_core/librandpkt_core.a	\
@@ -579,6 +574,8 @@ randpkt_LDADD = \
 	@C_ARES_LIBS@			\
 	@ADNS_LIBS@
 
+dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 # Libraries and plugin flags with which to link dftest.
 dftest_LDADD = \
 	ui/libui.a			\
@@ -598,6 +595,8 @@ dftest_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@
 
+echld_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
 echld_test_LDADD = \
 	epan/libwireshark.la		\
 	echld/libechld.la		\
@@ -613,6 +612,12 @@ echld_test_DEPENDENCIES = \
 	echld/libechld.la \
 	epan/libwireshark.la
 
+dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
+dumpcap_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS)
+
+dumpcap_LDFLAGS = $(AM_LDFLAGS) $(PIE_LDFLAGS)
+
 # Libraries with which to link dumpcap.
 dumpcap_LDADD = \
 	caputils/libcaputils.a		\
@@ -624,8 +629,6 @@ dumpcap_LDADD = \
 	@SYSTEMCONFIGURATION_FRAMEWORKS@	\
 	@COREFOUNDATION_FRAMEWORKS@	\
 	@LIBCAP_LIBS@
-dumpcap_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS)
-dumpcap_LDFLAGS = $(PIE_LDFLAGS)
 
 #
 # Build the version string
@@ -699,16 +702,13 @@ EXTRA_DIST = \
 	README.vmware		\
 	README.windows		\
 	abi-descriptor.template	\
-	aclocal-fallback/libsmi.m4 \
-	aclocal-fallback/libgcrypt.m4 \
-	aclocal-fallback/glib-2.0.m4 \
-	aclocal-fallback/gtk-2.0.m4 \
-	aclocal-fallback/gtk-3.0.m4 \
-	aclocal-fallback/ax_append_flag.m4	\
+	aclocal-fallback/ax_append_flag.m4		\
 	aclocal-fallback/ax_check_compile_flag.m4	\
-	aclocal-fallback/ax_gcc_x86_cpuid.m4	\
-	aclocal-fallback/ax_ext.m4	\
+	aclocal-fallback/ax_gcc_x86_cpuid.m4		\
+	aclocal-fallback/ax_ext.m4			\
 	aclocal-fallback/ax_gcc_x86_avx_xgetbv.m4	\
+	aclocal-fallback/libsmi.m4			\
+	aclocal-fallback/libgcrypt.m4			\
 	aclocal-flags		\
 	adns_dll.dep		\
 	adns_dll.rc		\
diff --git a/Makefile.am.inc b/Makefile.am.inc
index 5f5d10125a..531b2307a3 100644
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -27,21 +27,23 @@ LEMON = $(top_builddir)/tools/lemon/lemon$(EXEEXT)
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 
-AM_CPPFLAGS = $(WS_CPPFLAGS) -I$(top_srcdir)
-
-AM_CFLAGS = $(WS_CFLAGS)
-
 if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS += -Werror
+WERROR = -Werror
+else
+WERROR =
 endif
 
+INCLUDEDIRS = -I$(top_srcdir)
+
+#AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS)
+
+AM_CFLAGS = $(WERROR) $(WS_CFLAGS)
+
 GENERATED_CFLAGS = $(WS_CFLAGS)
 
-AM_CXXFLAGS = $(WS_CXXFLAGS)
+AM_CXXFLAGS = $(WERROR) $(WS_CXXFLAGS)
 
-if HAVE_WARNINGS_AS_ERRORS
-AM_CXXFLAGS += -Werror
-endif
+GENERATED_CXXFLAGS = $(WS_CXXFLAGS)
 
 AM_LDFLAGS = $(WS_LDFLAGS)
 
@@ -83,9 +85,9 @@ am__v_YACC_0 = @echo "  YACC    " $@;
 # abi-compliance-checker descriptor
 abi_incdirs = $(subst -I,NEWLINE,$(filter -I%,$(WS_CFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir)))
 abi_sysdirs = $(subst -isystem,NEWLINE,$(filter -isystem%,$(WS_CFLAGS)))
-INCLUDE_DIRS = $(abi_incdirs) $(abi_sysdirs)
+abi_includes = $(abi_incdirs) $(abi_sysdirs)
 abi-descriptor.xml: ../abi-descriptor.template
 	$(AM_V_SED)$(SED) \
-		-e 's|@INCLUDE_DIRS@|$(INCLUDE_DIRS)|g' \
+		-e 's|@INCLUDE_DIRS@|$(abi_includes)|g' \
 		-e 's/ *NEWLINE/\n    /g' \
 		-e 's|@LIBRARY_OUTPUT_PATH@|{RELPATH}/.libs|' $< > $@
diff --git a/aclocal-fallback/glib-2.0.m4 b/aclocal-fallback/glib-2.0.m4
deleted file mode 100644
index 6d37a33a1b..0000000000
--- a/aclocal-fallback/glib-2.0.m4
+++ /dev/null
@@ -1,212 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule)
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export)
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject)
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-         gio*)
-             pkg_config_args="$pkg_config_args $module-2.0"
-         ;;
-      esac
-  done
-
-  PKG_PROG_PKG_CONFIG([0.16])
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    AC_WIRESHARK_GCC_SYSTEM_INCLUDE(GLIB_CFLAGS)
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  unsigned int major, minor, micro;
-
-  fclose (fopen ("conf.glibtest", "w"));
-
-  if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     GLIB_COMPILE_RESOURCES=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  AC_SUBST(GLIB_COMPILE_RESOURCES)
-  rm -f conf.glibtest
-])
diff --git a/aclocal-fallback/gtk-2.0.m4 b/aclocal-fallback/gtk-2.0.m4
deleted file mode 100644
index ca5df6c5d2..0000000000
--- a/aclocal-fallback/gtk-2.0.m4
+++ /dev/null
@@ -1,191 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_module=gtk+-2.0
-  for module in . $4
-  do
-      # No modules to check for now
-      :
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version and < 3.0)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_module; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_module; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_module`
-    AC_WIRESHARK_GCC_SYSTEM_INCLUDE(GTK_CFLAGS)
-    GTK_LIBS=`$PKG_CONFIG --libs $pkg_config_module`
-    gtk_config_major_version=`$PKG_CONFIG --modversion $pkg_config_module | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion $pkg_config_module | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion $pkg_config_module | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-
-  system ("touch conf.gtktest");
-
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion $pkg_config_module' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
diff --git a/aclocal-fallback/gtk-3.0.m4 b/aclocal-fallback/gtk-3.0.m4
deleted file mode 100644
index 968e5ee03e..0000000000
--- a/aclocal-fallback/gtk-3.0.m4
+++ /dev/null
@@ -1,218 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_3_0],
-[m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead])
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-  min_gtk_version=ifelse([$1], [], [3.0.0], [$1])
-
-  pkg_config_args="gtk+-3.0 >= $min_gtk_version"
-  for module in . $4
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    AC_WIRESHARK_GCC_SYSTEM_INCLUDE(GTK_CFLAGS)
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  unsigned int major, minor, micro;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
-dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl   Tests for BACKEND-NAME in the GTK targets list
-dnl
-AC_DEFUN([GTK_CHECK_BACKEND],
-[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0]) or similar instead])
-  pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0)
-  min_gtk_version=ifelse([$2],,3.0.0,$2)
-  pkg_config_args="$pkg_config_args >= $min_gtk_version"
-
-  AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
-
-  if $PKG_CONFIG $pkg_config_args ; then
-    target_found=yes
-  else
-    target_found=no
-  fi
-
-  if test "x$target_found" = "xno"; then
-    ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
-  else
-    ifelse([$3],,[:],[$3])
-  fi
-])
diff --git a/capchild/Makefile.am b/capchild/Makefile.am
index 9bdb3871f3..cf21234cbe 100644
--- a/capchild/Makefile.am
+++ b/capchild/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LIBRARIES = libcapchild.a
 
 CLEANFILES = \
diff --git a/caputils/Makefile.am b/caputils/Makefile.am
index 7ccf86c6c5..f53c070a49 100644
--- a/caputils/Makefile.am
+++ b/caputils/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LIBRARIES = libcaputils.a
 
 PLATFORM_CAPUTILS_SRC = \
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
index 50111154c2..0505d3c295 100644
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -DWS_BUILD_DLL
+AM_CPPFLAGS = -DWS_BUILD_DLL $(INCLUDEDIRS) $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(SBC_CFLAGS)
 
 lib_LTLIBRARIES = libwscodecs.la
 
@@ -35,12 +36,10 @@ libwscodecs_la_SOURCES = \
 	$(LIBWSCODECS_SRC) \
 	$(noinst_HEADERS)
 
-libwscodecs_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS)
-
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
-libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(SBC_LIBS)
+libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(GLIB_LIBS) $(SBC_LIBS)
 
 libwscodecs_la_DEPENDENCIES = $(top_builddir)/wsutil/libwsutil.la
 
diff --git a/configure.ac b/configure.ac
index 454f625e41..f6e9dbf00d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1538,6 +1538,45 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+GLIB_MIN_VERSION=2.16.0
+AC_SUBST(GLIB_MIN_VERSION)
+# GLib checks; we require GLib $GLIB_MIN_VERSION or later, and require gmodule
+# support, as we need that for dynamically loading plugins.
+#
+# Release dates for GLib versions:
+# 2.14.0: 03 Aug 2007
+# 2.16.0: 10 Mar 2008
+# 2.18.0: 02 Sep 2008
+# 2.20.0: 13 Mar 2009
+# 2.22.0: 22 Sep 2009
+# 2.24.0: 28 Mar 2010
+# 2.26.0: 27 Sep 2010
+# 2.28.0: 08 Feb 2011
+# 2.30.0: 27 Sep 2011
+# 2.32.0: 24 Mar 2012
+# 2.34.0: 24 Sep 2012
+# 2.36.0: 25 Mar 2013
+# 2.38.0: 23 Sep 2013
+# 2.40.0: 24 Mar 2014
+# 2.42.0: 22 Sep 2014
+# 2.44.0: 23 Mar 2014
+# 2.46.0: 25 Sep 2015
+
+PKG_WIRESHARK_CHECK_SYSTEM_MODULES([GLIB],
+	[glib-2.0 >= $GLIB_MIN_VERSION gthread-2.0 >= $GLIB_MIN_VERSION gmodule-2.0 >= $GLIB_MIN_VERSION],
+	[],
+	[AC_MSG_ERROR([GLib $GLIB_MIN_VERSION or later not found.])])
+
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+# Check for GResource support
+PKG_CHECK_EXISTS([gio-2.0 >= 2.32 gdk-pixbuf-2.0 >= 2.26], [have_gresource=yes], [have_gresource=no])
+AM_CONDITIONAL(HAVE_GRESOURCE, test "x$have_gresource" = "xyes")
+if test "x$have_gresource" = "xyes"; then
+	AC_DEFINE(HAVE_GRESOURCE, 1, [Defined if GLib GResource is supported])
+fi
+
 GTK2_MIN_VERSION=2.12.0
 AC_SUBST(GTK2_MIN_VERSION)
 GTK3_MIN_VERSION=3.0.0
@@ -1715,66 +1754,33 @@ if test "x$enable_wireshark" = "xyes"; then
 		#
 		# Make sure we have GTK+ 3.
 		#
-		AM_PATH_GTK_3_0(3.0.0,
-		[
-			WS_CFLAGS="$WS_CFLAGS $GTK_CFLAGS"
-			WS_CXXFLAGS="$WS_CXXFLAGS $GTK_CFLAGS"
-			have_gtk=yes
-			GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-gtk3"
-		],
-		[AC_MSG_ERROR([GTK+ 3 is not available])])
+		PKG_WIRESHARK_CHECK_SYSTEM_MODULES([GTK],
+			[gtk+-3.0 >= $GTK3_MIN_VERSION glib-2.0 >= $GLIB_MIN_VERSION gthread-2.0 >= $GLIB_MIN_VERSION gmodule-2.0 >= $GLIB_MIN_VERSION],
+			[
+				have_gtk=yes
+				GTK_VERSION=`$PKG_CONFIG --modversion gtk+-3.0`
+				GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-gtk3"
+			],
+			[AC_MSG_ERROR([GTK+ 3 is not available])])
 	elif test "x$with_gtk2" = "xyes"; then
 		#
 		# GTK+ 3 wasn't specified, and GTK+ 2 was specified;
 		# make sure we have GTK+ 2.
 		#
-		AM_PATH_GTK_2_0($GTK2_MIN_VERSION,
-		[
-			WS_CFLAGS="$WS_CFLAGS $GTK_CFLAGS"
-			WS_CXXFLAGS="$WS_CXXFLAGS $GTK_CFLAGS"
-			have_gtk=yes
-			GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-gtk2"
-		],
-		[AC_MSG_ERROR([GTK+ 2 is not available])])
+		PKG_WIRESHARK_CHECK_SYSTEM_MODULES([GTK],
+			[gtk+-2.0 >= $GTK2_MIN_VERSION glib-2.0 >= $GLIB_MIN_VERSION gthread-2.0 >= $GLIB_MIN_VERSION gmodule-2.0 >= $GLIB_MIN_VERSION],
+			[
+				have_gtk=yes
+				GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
+				GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-gtk2"
+			],
+			[AC_MSG_ERROR([GTK+ 2 is not available])])
 	fi
 fi
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 AC_SUBST(GUI_CONFIGURE_FLAGS)
 
-GLIB_MIN_VERSION=2.16.0
-AC_SUBST(GLIB_MIN_VERSION)
-# GLib checks; we require GLib $GLIB_MIN_VERSION or later, and require gmodule
-# support, as we need that for dynamically loading plugins.
-# If we found GTK+, this doesn't add GLIB_CFLAGS to CFLAGS, because
-# AM_PATH_GTK will add GTK_CFLAGS to CFLAGS, and GTK_CFLAGS is a
-# superset of GLIB_CFLAGS.  If we didn't find GTK+, it does add
-# GLIB_CFLAGS to CFLAGS.
-# However, this means that both @GLIB_LIBS@ and @GTK_LIBS@ will be
-# set when generating the Makefile, so we can make programs that require
-# only GLib link with @GLIB_LIBS@ and make programs that require GTK+
-# link with @GTK_LIBS@ (which includes @GLIB_LIBS@).
-# We don't add $GLIB_LIBS to LIBS, because we don't want to force all
-# programs to be built with GLib.
-#
-# Release dates for GLib versions:
-# 2.14.0: 03 Aug 2007
-# 2.16.0: 10 Mar 2008
-# 2.18.0: 02 Sep 2008
-# 2.20.0: 13 Mar 2009
-# 2.22.0: 22 Sep 2009
-# 2.24.0: 28 Mar 2010
-# 2.26.0: 27 Sep 2010
-# 2.28.0: 08 Feb 2011
-# 2.30.0: 27 Sep 2011
-# 2.32.0: 24 Mar 2012
-# 2.34.0: 24 Sep 2012
-# 2.36.0: 25 Mar 2013
-# 2.38.0: 23 Sep 2013
-# 2.40.0: 24 Mar 2014
-# 2.42.0: 22 Sep 2014
-# 2.44.0: 23 Mar 2014
-# 2.46.0: 25 Sep 2015
-
-use_glib_cflags="true"
 if test "$have_gtk" = "yes" -a "$have_qt" = "yes" ; then
 	# We have both GTK and Qt and thus will be building both wireshark
 	# and wireshark-gtk.
@@ -1822,6 +1828,8 @@ fi
 
 if test "$have_gtk" = "yes" ; then
 	# If we have GTK then add flags for it.
+	gtk_config_major_version=`echo $GTK_VERSION | cut -d. -f1`
+	gtk_config_minor_version=`echo $GTK_VERSION | cut -d. -f2`
 
 	WS_CPPFLAGS="-DGDK_DISABLE_DEPRECATED $WS_CPPFLAGS"
 	if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
@@ -1839,26 +1847,6 @@ if test "$have_gtk" = "yes" ; then
 	fi
 fi
 
-# XXX - Is this really necessary?  When we build with both Gtk+ and Qt it works...
-if test "$use_glib_cflags" = "true"; then
-	# Use GLIB_CFLAGS
-	AM_PATH_GLIB_2_0($GLIB_MIN_VERSION,
-	[
-		WS_CFLAGS="$WS_CFLAGS $GLIB_CFLAGS"
-		WS_CXXFLAGS="$WS_CXXFLAGS $GLIB_CFLAGS"
-	], AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
-else
-	# Don't use GLIB_CFLAGS
-	AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
-fi
-
-# Check for GResource support
-PKG_CHECK_EXISTS([gio-2.0 >= 2.32 gdk-pixbuf-2.0 >= 2.26], [have_gresource=yes], [have_gresource=no])
-AM_CONDITIONAL(HAVE_GRESOURCE, test "x$have_gresource" = "xyes")
-if test "x$have_gresource" = "xyes"; then
-	AC_DEFINE(HAVE_GRESOURCE, 1, [Defined if GLib GResource is supported])
-fi
-
 # Error out if a glib header other than a "top level" header
 #  (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
 #  is used.
@@ -3315,11 +3303,7 @@ dnl AC_CONFIG_FILES([tools/setuid-root.pl], [chmod +x tools/setuid-root.pl])
 # Pretty messages
 
 if test "x$have_gtk" = "xyes"; then
-	if test "x$with_gtk3" = "xyes"; then
-		gtk_lib_message=" (with GTK+ 3"
-	else
-		gtk_lib_message=" (with GTK+ 2"
-	fi
+	gtk_lib_message=" (with GTK+ v$GTK_VERSION"
 	if test "x$have_ige_mac" = "xyes"; then
 		gtk_lib_message="$gtk_lib_message and OS X integration)"
 	else
diff --git a/echld/Makefile.am b/echld/Makefile.am
index 8b0898808e..ce54a69b09 100644
--- a/echld/Makefile.am
+++ b/echld/Makefile.am
@@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.am.inc
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += -DWS_BUILD_DLL
+AM_CPPFLAGS = -DWS_BUILD_DLL $(INCLUDEDIRS) $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS)
 
 # Optional objects that I know how to build. These will be
 # linked into libechld.
diff --git a/epan/Makefile.am b/epan/Makefile.am
index f61866b67c..fa0d5edc7f 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -40,8 +40,10 @@ DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += -I$(builddir)/wslua $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \
-	$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(KRB5_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \
+	$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \
+	$(KRB5_CFLAGS)
 
 noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
 lib_LTLIBRARIES = libwireshark.la
@@ -55,11 +57,13 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 libwireshark_la_SOURCES = \
 	$(LIBWIRESHARK_SRC)	\
 	$(LIBWIRESHARK_INCLUDES)
+
 libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
 
 libwireshark_generated_la_SOURCES = \
 	$(LIBWIRESHARK_GENERATED_C_FILES) \
 	$(LIBWIRESHARK_GENERATED_HEADER_FILES)
+
 libwireshark_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
 nodist_libwireshark_generated_la_SOURCES = \
diff --git a/epan/compress/Makefile.am b/epan/compress/Makefile.am
index 967334e826..f0d8b84e9e 100644
--- a/epan/compress/Makefile.am
+++ b/epan/compress/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LTLIBRARIES = liblzxpress.la
 
 CLEANFILES = \
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index ad0bad3803..c8da5b7c03 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LTLIBRARIES = libairpdcap.la
 
 CLEANFILES = \
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 9d54e2f973..e364c2429d 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/epan -I$(lemon_srcdir)
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan -I$(lemon_srcdir) \
+	$(WS_CPPFLAGS) $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libdfilter_generated.la libdfilter.la
 
@@ -54,6 +55,7 @@ libdfilter_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
 libdfilter_generated_la_SOURCES = \
 	$(GENERATED_C_FILES)	\
 	$(GENERATED_HEADER_FILES)
+
 libdfilter_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
 nodist_libdfilter_generated_la_SOURCES = \
@@ -61,6 +63,7 @@ nodist_libdfilter_generated_la_SOURCES = \
 	$(NODIST_GENERATED_HEADER_FILES)
 
 libdfilter_la_LIBADD = libdfilter_generated.la
+
 libdfilter_la_DEPENDENCIES = libdfilter_generated.la
 
 EXTRA_DIST = \
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 964d0f350d..9538d33d05 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -21,13 +21,15 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/epan $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 noinst_LTLIBRARIES = libdirtydissectors.la libfiledissectors.la libdissectors.la
 
 libdirtydissectors_la_SOURCES = \
 	$(DIRTY_ASN1_DISSECTOR_SRC) \
 	$(DIRTY_CORBA_IDL_DISSECTOR_SRC)
+
 libdirtydissectors_la_CFLAGS = $(GENERATED_CFLAGS)
 
 libfiledissectors_la_SOURCES = \
diff --git a/epan/dissectors/dcerpc/Makefile.am b/epan/dissectors/dcerpc/Makefile.am
index 2333c4bb09..a15169a8f7 100644
--- a/epan/dissectors/dcerpc/Makefile.am
+++ b/epan/dissectors/dcerpc/Makefile.am
@@ -20,6 +20,8 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 EXTRA_DIST = \
 	CMakeLists.txt				\
 	Makefile.inc				\
@@ -47,7 +49,7 @@ bin_PROGRAMS = idl2wrs
 
 idl2wrs_SOURCES = idl2wrs.c
 
-idl2wrs_LDADD = @GLIB_LIBS@
+idl2wrs_LDADD = $(GLIB_LIBS)
 
 #
 # Editor modelines  -  https://www.wireshark.org/tools/modelines.html
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 1246769e9f..96a586f2ad 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -21,7 +21,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/epan
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 noinst_LTLIBRARIES = libftypes.la
 
@@ -35,8 +36,6 @@ MAINTAINERCLEANFILES = \
 
 libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
 
-libftypes_la_LIBADD = @GLIB_LIBS@
-
 EXTRA_DIST = \
 	Makefile.common		\
 	Makefile.nmake
diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am
index 54d964b7b0..931fc0e8e6 100644
--- a/epan/nghttp2/Makefile.am
+++ b/epan/nghttp2/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBNGHTTP2_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBNGHTTP2_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libnghttp2.la
 
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am
index 0b46b6a5e0..2b56a3849d 100644
--- a/epan/wmem/Makefile.am
+++ b/epan/wmem/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBWMEM_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBWMEM_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwmem.la
 
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index fca56d132f..48b20925c1 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -21,7 +21,8 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LUA_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LUA_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwslua.la
 
diff --git a/extcap/Makefile.am b/extcap/Makefile.am
index 432b85d804..46eeb5cc8b 100644
--- a/extcap/Makefile.am
+++ b/extcap/Makefile.am
@@ -23,6 +23,8 @@ include ../Makefile.am.inc
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 extcap_PROGRAMS = \
 	@androiddump_bin@	\
 	@randpktdump_bin@	\
diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc
index 7513ca7912..8423121e05 100644
--- a/plugins/Makefile.am.inc
+++ b/plugins/Makefile.am.inc
@@ -22,6 +22,10 @@
 
 LIBS = @PLUGIN_LIBS@
 
+PLUGIN_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
+PLUGIN_CFLAGS =
+
 PLUGIN_LDFLAGS = -module -avoid-version
 
 #
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 39708d6c2d..53dae04c73 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -32,6 +32,10 @@ docsis_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+docsis_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+docsis_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 docsis_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
index 427773e6ba..e0986faef5 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/ethercat/Makefile.am
@@ -32,6 +32,10 @@ ethercat_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+ethercat_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+ethercat_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 ethercat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index 41e57a6871..87ef9b9ba3 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -34,6 +34,10 @@ gryphon_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+gryphon_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+gryphon_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 gryphon_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index a9a7d62189..bfd3a19ff4 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -32,6 +32,10 @@ irda_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+irda_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+irda_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 irda_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am
index e60b5f41f4..9299675484 100644
--- a/plugins/m2m/Makefile.am
+++ b/plugins/m2m/Makefile.am
@@ -32,6 +32,10 @@ m2m_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+m2m_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+m2m_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 m2m_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 634a9b4b94..fe1cc4d6ad 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -43,7 +43,9 @@ nodist_mate_la_SOURCES = \
 	$(NODIST_SRC_FILES) \
 	$(NODIST_HEADER_FILES)
 
-mate_la_CFLAGS = $(GENERATED_CFLAGS)
+mate_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+mate_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS)
 
 mate_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
index 97358600d9..619d3bfaa0 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/opcua/Makefile.am
@@ -33,6 +33,10 @@ opcua_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+opcua_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+opcua_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 opcua_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index e15192daff..90f78ae9a4 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -32,6 +32,10 @@ profinet_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+profinet_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+profinet_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 profinet_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index 065a2964e2..07c9ffa049 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -30,6 +30,10 @@ stats_tree_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+stats_tree_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+stats_tree_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 stats_tree_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am
index e45f8c880e..c8d1220cda 100644
--- a/plugins/tpg/Makefile.am
+++ b/plugins/tpg/Makefile.am
@@ -32,6 +32,10 @@ tpg_la_SOURCES = \
 	http-parser.h \
 	packet-http.c
 
+tpg_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+tpg_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 tpg_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
index 10b576bf0f..635846b83a 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/unistim/Makefile.am
@@ -33,6 +33,10 @@ unistim_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+unistim_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+unistim_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 unistim_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
index 7dea8a681f..a270766439 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/wimax/Makefile.am
@@ -32,6 +32,10 @@ wimax_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+wimax_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+wimax_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 wimax_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index 6f3d00c492..e4f4cd7f2f 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/wimaxasncp/Makefile.am
@@ -39,7 +39,9 @@ wimaxasncp_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
-wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS)
+wimaxasncp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS)
 
 wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am
index b6c89efbdc..9033b90213 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/wimaxmacphy/Makefile.am
@@ -32,6 +32,10 @@ wimaxmacphy_la_SOURCES = \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
+wimaxmacphy_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS)
+
+wimaxmacphy_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS)
+
 wimaxmacphy_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 
 CLEANFILES = \
diff --git a/randpkt_core/Makefile.am b/randpkt_core/Makefile.am
index 07607ebc94..a3cb84090c 100644
--- a/randpkt_core/Makefile.am
+++ b/randpkt_core/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LIBRARIES = librandpkt_core.a
 
 CLEANFILES = \
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 6c6e98db04..01c44dbc7c 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -23,8 +23,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) \
-	-DDOC_DIR=\"$(docdir)\"
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DDOC_DIR=\"$(docdir)\" \
+	$(GLIB_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
 
 noinst_LIBRARIES = libui.a libui_dirty.a
 
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index 3242543d41..4e723bd49b 100644
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) \
+	$(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
 
 noinst_LIBRARIES = libcliui.a
 
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 4abaa5402b..3c9fc159a4 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(PORTAUDIO_INCLUDES)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GTK_CFLAGS) \
+	$(PORTAUDIO_INCLUDES)
 
 CLEANFILES = \
 	libgtkui.a				\
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index bf9f8c82e5..6263fcec1e 100644
--- 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) $(Qt_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) $(Qt_CFLAGS)
 
 noinst_LIBRARIES = libqtui.a
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index bd65b2ba37..d716817767 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.am.inc
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += -DWS_BUILD_DLL
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwiretap_generated.la
 lib_LTLIBRARIES = libwiretap.la
@@ -52,6 +52,7 @@ libwiretap_la_SOURCES = \
 
 libwiretap_generated_la_SOURCES = \
 	$(GENERATED_C_FILES)
+
 libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
 EXTRA_DIST = \
@@ -63,6 +64,7 @@ EXTRA_DIST = \
 	$(GENERATED_FILES)
 
 libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
+
 libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la
 
 k12text_lex.h : k12text.c
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index f718f42d5e..8711c108e6 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -23,11 +23,12 @@ include $(top_srcdir)/Makefile.am.inc
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL \
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \
 	-DTOP_SRCDIR=\"$(abs_top_srcdir)\" 	\
 	-DDATAFILE_DIR=\"$(pkgdatadir)\" 	\
 	-DEXTCAP_DIR=\"$(extcapdir)\" 		\
-	-DPLUGIN_INSTALL_DIR=\"$(plugindir)\"
+	-DPLUGIN_INSTALL_DIR=\"$(plugindir)\"	\
+	$(GLIB_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 # Optional headers for ABI checking
 wsutil_optional_abi_includes =
-- 
cgit v1.2.1