From 8cd606ddc2d4999d4a87f784cd5cfc8381f9b314 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 20 Nov 2008 17:10:09 +0000 Subject: MPFR: correctly re-install config.{guess,sub} with autotools >=2.0.0. /trunk/scripts/build/mpfr.sh | 14 13 1 0 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/build/mpfr.sh b/scripts/build/mpfr.sh index 664e341..a7c6d72 100644 --- a/scripts/build/mpfr.sh +++ b/scripts/build/mpfr.sh @@ -37,7 +37,19 @@ do_mpfr_extract() { if [ ! -f .autotools.ct-ng ]; then CT_DoLog DEBUG "Re-building autotools files" CT_DoExecLog ALL autoreconf -fi - CT_DoExecLog ALL libtoolize -f + # Starting with libtool-1.9f, config.{guess,sub} are no longer + # installed without -i, but starting with libtool-2.2.6, they + # are no longer removed without -i. Sight... Just use -i with + # libtool >=2 + # See: http://sourceware.org/ml/crossgcc/2008-11/msg00046.html + # and: http://sourceware.org/ml/crossgcc/2008-11/msg00048.html + libtoolize_opt= + case "$(libtoolize --version |head -n 1 |gawk '{ print $(NF); }')" in + 0.*) ;; + 1.*) ;; + *) libtoolize_opt=-i;; + esac + CT_DoExecLog ALL libtoolize -f ${libtoolize_opt} touch .autotools.ct-ng fi CT_Popd -- cgit v0.10.2-6-g49f6