From 39389a12e5acfa2f43b3ac30b69deacd61411b6a Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Tue, 10 Jan 2017 21:57:53 -0500
Subject: Run libtoolize before aclocal.

libtoolize installs files in m4/ which aclocal is going to include.

Prior to this change this sequence:
 1) ./autogen.sh
 2) ./configure
 3) make

Results in aclocal (and subsequently ./configure) being rerun in step 3
(because there are files in m4/ that are are newer than aclocal.m4).

Change-Id: I70589ab3cede6b7cd48e089c8be4d4c98dab3b6a
Reviewed-on: https://code.wireshark.org/review/19609
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 autogen.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index ad20852c07..f33565d66f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -135,13 +135,13 @@ fi
 
 $DIE
 
+LTARGS=" --copy --force"
+echo $LIBTOOLIZE $LTARGS
+$LIBTOOLIZE $LTARGS || exit 1
 aclocal_flags="-I m4"
 aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
 echo $ACLOCAL $aclocalinclude
 $ACLOCAL $aclocalinclude || exit 1
-LTARGS=" --copy --force"
-echo $LIBTOOLIZE $LTARGS
-$LIBTOOLIZE $LTARGS || exit 1
 echo $AUTOHEADER
 $AUTOHEADER || exit 1
 echo $AUTOMAKE --add-missing --gnu $am_opt
-- 
cgit v1.2.3