diff -r 9b47474a82722eb296fde2b30468bf6db3064912 -r 6f778f237cbc6cf3cef7b3ccdd528f5e4d3b1046 configure
--- a/configure	Wed Apr 17 22:02:21 2013 -0500
+++ b/configure	Wed Apr 17 22:24:43 2013 -0500
@@ -19697,14 +19697,15 @@
    { (exit 1); exit 1; }; }
 fi
 
+$GMPH="gmp-i386.h"
 
 { echo "$as_me:$LINENO: checking whether gmp.h works for us" >&5
 echo $ECHO_N "checking whether gmp.h works for us... $ECHO_C" >&6; }
 oldCPPFLAGS=$CPPFLAGS
 if test "x$with_gmp_dir" != "x"; then
-  test -r $with_gmp_dir/include/gmp.h && cp $with_gmp_dir/include/gmp.h .
-  if test -r gmp.h && ! fgrep -q "USER_GMP_WRAP" gmp.h; then
-   patch -s -f gmp.h < $srcdir/gmp.h.patch \
+  test -r $with_gmp_dir/include/$GMPH && cp $with_gmp_dir/include/$GMPH .
+  if test -r $GMPH && ! fgrep -q "USER_GMP_WRAP" $GMPH; then
+   patch -s -f $GMPH < $srcdir/gmp.h.patch \
    && CPPFLAGS="$CPPFLAGS -I$PWD" \
    && echo "no, using locally patched gmp.h" \
    && gmp_inc_dir="GMP_inc_dir = $PWD"
@@ -19718,10 +19719,10 @@
   fi
 else
   # use default header location, and try to patch gmp.h locally, if necessary
-  test -r /usr/include/gmp.h && cp /usr/include/gmp.h .
-  test -r /usr/local/include/gmp.h && cp /usr/local/include/gmp.h .
-  if test -r gmp.h && ! fgrep -q "USER_GMP_WRAP" gmp.h; then
-   patch -s -f gmp.h < $srcdir/gmp.h.patch \
+  test -r /usr/include/$GMPH && cp /usr/include/$GMPH .
+  test -r /usr/local/include/$GMPH && cp /usr/local/include/$GMPH .
+  if test -r $GMPH && ! fgrep -q "USER_GMP_WRAP" $GMPH; then
+   patch -s -f $GMPH < $srcdir/gmp.h.patch \
    && CPPFLAGS="$CPPFLAGS -I$PWD" \
    && echo "no, using locally patched gmp.h" \
    && gmp_inc_dir="GMP_inc_dir = $PWD"