From 530a3cefb45575353fd002e46d881be96d9cdc59 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Date: Sat, 6 Mar 2010 21:00:39 +0100
Subject: [PATCH] If no ABI is specified for GMP, pass no additional argument
 when configuring it.

---
 src/configure    | 7 ++++++-
 src/configure.in | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/configure b/src/configure
index c37002838..bae1b4a88 100755
--- a/src/configure
+++ b/src/configure
@@ -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
diff --git a/src/configure.in b/src/configure.in
index 3630de9bc..7d5cf166d 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -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