From ed350dd350e7b02a53d305d4330aa0b545d2eea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 21 Mar 2016 06:00:35 +0000 Subject: Don't move config.guess and config.sub for autogen.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- autogen.sh | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'autogen.sh') 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 -- cgit v1.2.1