diff --git a/src/configure b/src/configure
index 9a18178f7..6cce28856 100755
--- a/src/configure
+++ b/src/configure
@@ -617,7 +617,7 @@ fi
 # Check whether --enable-clx or --disable-clx was given.
 if test "${enable_clx+set}" = set; then
   enableval="$enable_clx"
-  clx="$enable_clx"
+  clx="$enableval"
 fi
 
 # Check whether --with-tcp or --without-tcp was given.
@@ -626,9 +626,9 @@ if test "${with_tcp+set}" = set; then
   tcp="yes"
 fi
 
-# Check whether --enable-gmp or --disable-gmp was given.
-if test "${enable_gmp+set}" = set; then
-  enableval="$enable_gmp"
+# Check whether --enable-local-gmp or --disable-local-gmp was given.
+if test "${enable_local_gmp+set}" = set; then
+  enableval="$enable_local_gmp"
   gmp="${enableval}"
 fi
 
@@ -2761,11 +2761,12 @@ else
   test -d gmp && rm -rf gmp
   if mkdir gmp; then
    (cd gmp;
-     $srcdir/gmp/configure $gmp_flags)
+     $srcdir/gmp/configure --disable-shared --prefix=$bindir \
+	--includedir=${builddir}/h --libdir=${builddir} $gmp_flags)
   fi
 fi
 echo $ac_n "checking checking for Boehm-Weiser gc...""... $ac_c" 1>&6
-echo "configure:2769: checking checking for Boehm-Weiser gc..." >&5
+echo "configure:2770: checking checking for Boehm-Weiser gc..." >&5
 if test ${boehm} ; then
   echo "$ac_t""yes" 1>&6
   test -d gc && rm -rf gc
diff --git a/src/configure.in b/src/configure.in
index cbf9a1195..5964897eb 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -52,11 +52,11 @@ dnl 	[--enable-tk	Include Tk.],
 dnl 	tk="$enable_tk")
 AC_ARG_ENABLE(clx,
 	[--enable-clx	Include CLX.],
-	clx="$enable_clx")
+	clx="$enableval")
 AC_ARG_WITH(tcp,
 	[--with-tcp	Include socket interface.],
 	tcp="yes")
-AC_ARG_ENABLE(gmp,
+AC_ARG_ENABLE(local-gmp,
 	[--enable-local-gmp	Use already installed GMP library.],
 	gmp="${enableval}")
 AC_ARG_WITH(gmp,
@@ -263,7 +263,8 @@ else
   test -d gmp && rm -rf gmp
   if mkdir gmp; then
    (cd gmp;
-     $srcdir/gmp/configure $gmp_flags)
+     $srcdir/gmp/configure --disable-shared --prefix=$bindir \
+	--includedir=${builddir}/h --libdir=${builddir} $gmp_flags)
   fi
 fi
 dnl ---------------------------------------------------------------------