From a04037ea709a81ef210d8ba729fd6f648c73a071 Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Wed, 21 Sep 2005 17:32:27 +0000
Subject: [PATCH] The latest optimizations for the cross-compile phase had
 deactivated linking against GMP also in the normal builds

---
 src/configure    | 18 ++++++++++--------
 src/configure.in | 16 +++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/configure b/src/configure
index 275ebbdd0..35994b482 100755
--- a/src/configure
+++ b/src/configure
@@ -9688,21 +9688,23 @@ if test "${with_gmp}" = "no" ; then
   { echo "$as_me:$LINENO: Not using GMP library at all.  Are you sure?" >&5
 echo "$as_me: Not using GMP library at all.  Are you sure?" >&6;}
   EXTRA_OBJS="${EXTRA_OBJS} big_ll.o"
-elif test "${with_system_gmp}" = "no" ; then
-  { echo "$as_me:$LINENO: Configuring included GMP library:" >&5
-echo "$as_me: Configuring included GMP library:" >&6;}
-  EXTRA_OBJS="${EXTRA_OBJS} big.o"
+else
 
 cat >>confdefs.h <<\_ACEOF
 #define WITH_GMP 1
 _ACEOF
 
-  test -d gmp && rm -rf gmp
-  if mkdir gmp; then
-   (destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
-     $srcdir/gmp/configure --disable-shared --prefix=${destdir} \
+  EXTRA_OBJS="${EXTRA_OBJS} big.o"
+  if test "${with_system_gmp}" = "no" ; then
+    { echo "$as_me:$LINENO: Configuring included GMP library:" >&5
+echo "$as_me: Configuring included GMP library:" >&6;}
+    test -d gmp && rm -rf gmp
+    if mkdir gmp; then
+     (destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
+       $srcdir/gmp/configure --disable-shared --prefix=${destdir} \
 	--infodir=${destdir}/doc --includedir=${destdir}/h \
         --libdir=${destdir} --build=${build_alias} --host=${host_alias} $with_gmp)
+    fi
   fi
 fi
 
diff --git a/src/configure.in b/src/configure.in
index 4874f8f26..46acda827 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -452,16 +452,18 @@ dnl Configure local GMP if needed
 if test "${with_gmp}" = "no" ; then
   AC_MSG_NOTICE(Not using GMP library at all.  Are you sure?)
   EXTRA_OBJS="${EXTRA_OBJS} big_ll.o"
-elif test "${with_system_gmp}" = "no" ; then
-  AC_MSG_NOTICE(Configuring included GMP library:)
-  EXTRA_OBJS="${EXTRA_OBJS} big.o"
+else
   AC_DEFINE( [WITH_GMP], [1], [Use GMP for bignums] )
-  test -d gmp && rm -rf gmp
-  if mkdir gmp; then
-   (destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
-     $srcdir/gmp/configure --disable-shared --prefix=${destdir} \
+  EXTRA_OBJS="${EXTRA_OBJS} big.o"
+  if test "${with_system_gmp}" = "no" ; then
+    AC_MSG_NOTICE(Configuring included GMP library:)
+    test -d gmp && rm -rf gmp
+    if mkdir gmp; then
+     (destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
+       $srcdir/gmp/configure --disable-shared --prefix=${destdir} \
 	--infodir=${destdir}/doc --includedir=${destdir}/h \
         --libdir=${destdir} --build=${build_alias} --host=${host_alias} $with_gmp)
+    fi
   fi
 fi