aboutsummaryrefslogtreecommitdiffstats
path: root/autogen.sh
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-03-22 22:33:37 +0000
committerJoão Valverde <j@v6e.pt>2016-03-23 02:33:43 +0000
commitc57b3777f814f4f4108abcf111ee873acb60a91c (patch)
tree635ad83b4cd42f8eec27bdbb0fd303cb38813c2d /autogen.sh
parent125989780ba8e658ad0d1f1c71ec01e6d36a2266 (diff)
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 'autogen.sh')
-rwxr-xr-xautogen.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index e3219d7..c1b0a54 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -135,7 +135,7 @@ fi
$DIE
-aclocal_flags=`./aclocal-flags`
+aclocal_flags="-I ./aclocal-fallback"
aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
echo $ACLOCAL $aclocalinclude
$ACLOCAL $aclocalinclude || exit 1