summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-03-21 06:00:35 +0000
committerJoão Valverde <j@v6e.pt>2016-03-23 02:10:08 +0000
commited350dd350e7b02a53d305d4330aa0b545d2eea3 (patch)
treecd5b6891ad9b82152ff360d3c2bb4575d876239e /autogen.sh
parentb175e16d6e00bd17a1d1e65cb36a5c89a2ea49b4 (diff)
downloadwireshark-ed350dd350e7b02a53d305d4330aa0b545d2eea3.tar.gz
Don't move config.guess and config.sub for autogen.sh
Libtoolize won't touch them if they exist (since 2.2.x at least). Change-Id: I6bac9980523c27d1ee2f5a008d25a93a3ef5f175 Reviewed-on: https://code.wireshark.org/review/14567 Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh11
1 files changed, 0 insertions, 11 deletions
diff --git a/autogen.sh b/autogen.sh
index 19b4e8516d..e3219d737a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -139,20 +139,9 @@ aclocal_flags=`./aclocal-flags`
aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
echo $ACLOCAL $aclocalinclude
$ACLOCAL $aclocalinclude || exit 1
-#
-# We do NOT want libtoolize overwriting our versions of config.guess and
-# config.sub, so move them away and then move them back.
-# We don't omit "--force", as we want libtoolize to install other files
-# without whining.
-#
-mv config.guess config.guess.save-libtool
-mv config.sub config.sub.save-libtool
LTARGS=" --copy --force"
echo $LIBTOOLIZE $LTARGS
$LIBTOOLIZE $LTARGS || exit 1
-rm -f config.guess config.sub
-mv config.guess.save-libtool config.guess
-mv config.sub.save-libtool config.sub
echo $AUTOHEADER
$AUTOHEADER || exit 1
echo $AUTOMAKE --add-missing --gnu $am_opt