diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-22 22:33:37 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-23 02:33:43 +0000 |
| commit | c57b3777f814f4f4108abcf111ee873acb60a91c (patch) | |
| tree | 635ad83b4cd42f8eec27bdbb0fd303cb38813c2d /Makefile.am | |
| parent | 125989780ba8e658ad0d1f1c71ec01e6d36a2266 (diff) | |
| download | wireshark-c57b3777f814f4f4108abcf111ee873acb60a91c.tar.gz | |
Add pkg.m4 and remove aclocal-flags script
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 <j@v6e.pt>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |