From c57b3777f814f4f4108abcf111ee873acb60a91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 22 Mar 2016 22:33:37 +0000 Subject: Add pkg.m4 and remove aclocal-flags script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add pkg-config 0.29.1 macros to our distribution. This makes the aclocal-flags script obsolete, since we are already not using GLib autoconf macros. ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am. Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c Reviewed-on: https://code.wireshark.org/review/14568 Reviewed-by: João Valverde --- wsutil/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'wsutil') diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 3e12fa43fb..c69b9bc3c6 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -21,8 +21,6 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -ACLOCAL_AMFLAGS = `../aclocal-flags` - AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \ -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ -DDATAFILE_DIR=\"$(pkgdatadir)\" \ -- cgit v1.2.3