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 --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index be4ec0436c..57af9bf0b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ include ./Makefile.am.inc AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@ # Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS # in configure.ac in sync, otherwise there will be an error running autogen.sh. -ACLOCAL_AMFLAGS = `./aclocal-flags` +ACLOCAL_AMFLAGS = -I ./aclocal-fallback # Common headers COMMONCPPFLAGS = @@ -709,7 +709,7 @@ EXTRA_DIST = \ aclocal-fallback/ax_prog_cc_for_build.m4 \ aclocal-fallback/libsmi.m4 \ aclocal-fallback/libgcrypt.m4 \ - aclocal-flags \ + aclocal-fallback/pkg.m4 \ autogen.sh \ capinfos.c \ captype.c \ -- cgit v1.2.3