If no ABI is specified for GMP, pass no additional argument when configuring it.

This commit is contained in:
Juan Jose Garcia Ripoll 2010-03-06 21:00:39 +01:00
parent bdd33eee1d
commit 530a3cefb4
2 changed files with 12 additions and 2 deletions

7
src/configure vendored
View file

@ -5517,13 +5517,18 @@ $as_echo "$as_me: Configuring included GMP library:" >&6;}
gmp_build="${build_alias}"
fi
ECL_GMP_HEADER='ecl/gmp.h'
if test "x$ABI" = "x"; then
GMP_ABI=""
else
GMP_ABI="ABI=$ABI"
fi
if mkdir gmp; then
(destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
$srcdir/gmp/configure --disable-shared --prefix=${destdir} \
--infodir=${destdir}/doc --includedir=${destdir}/ecl --with-pic \
--libdir=${destdir} --build=${gmp_build} --host=${host_alias} \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" CC="${CC} ${PICFLAG}" \
ABI=$ABI $with_gmp)
"$GMP_ABI" $with_gmp)
fi
else
if test "x$ECL_GMP_HEADER" = "x"; then

View file

@ -382,6 +382,11 @@ else
gmp_build="${build_alias}"
fi
ECL_GMP_HEADER='ecl/gmp.h'
if test "x$ABI" = "x"; then
GMP_ABI=""
else
GMP_ABI="ABI=$ABI"
fi
if mkdir gmp; then
dnl Notice we need -DPIC to force the assembler to generate PIC code
(destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
@ -389,7 +394,7 @@ else
--infodir=${destdir}/doc --includedir=${destdir}/ecl --with-pic \
--libdir=${destdir} --build=${gmp_build} --host=${host_alias} \
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" CC="${CC} ${PICFLAG}" \
ABI=$ABI $with_gmp)
"$GMP_ABI" $with_gmp)
fi
else
if test "x$ECL_GMP_HEADER" = "x"; then