diff --git a/src/modules/Gmp/configure.in b/src/modules/Gmp/configure.in
index f417d070b3040b181f9fc312ba41b49d40b6f7a5..61b99902362b1d2d8da84b71c4d3eea91eac1c48 100644
--- a/src/modules/Gmp/configure.in
+++ b/src/modules/Gmp/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.17 2000/09/04 16:04:33 grubba Exp $
+# $Id: configure.in,v 1.18 2000/09/05 13:01:01 grubba Exp $
 AC_INIT(mpz_glue.c)
 AC_CONFIG_HEADER(gmp_machine.h)
 AC_ARG_WITH(gmp,     [  --with(out)-gmp        Support bignums],[],[with_gmp=yes])
@@ -91,7 +91,8 @@ __MPN(PiKe)
 
 /* Kludge for some compilers only defining __STDC__ in strict mode. */
 #if !defined(__STDC__) && defined(HAVE_ANSI_CONCAT) && defined(PIKE_MPN_PREFIX)
-#define PIKE_MPN_CONCAT(x,y)	x##y
+#define PIKE_LOW_MPN_CONCAT(x,y)	x##y
+#define PIKE_MPN_CONCAT(x,y)	PIKE_LOW_MPN_CONCAT(x,y)
 #define __MPN(x)	PIKE_MPN_CONCAT(PIKE_MPN_PREFIX,x)
 #endif /* !__STDC__ && HAVE_ANSI_CONCAT && PIKE_MPN_PREFIX */
 
@@ -117,7 +118,8 @@ int main(int argc, char **argv)
 
 /* Kludge for some compilers only defining __STDC__ in strict mode. */
 #if !defined(__STDC__) && defined(HAVE_ANSI_CONCAT) && defined(PIKE_MPN_PREFIX)
-#define PIKE_MPN_CONCAT(x,y)	x##y
+#define PIKE_LOW_MPN_CONCAT(x,y)	x##y
+#define PIKE_MPN_CONCAT(x,y)	PIKE_LOW_MPN_CONCAT(x,y)
 #define __MPN(x)	PIKE_MPN_CONCAT(PIKE_MPN_PREFIX,x)
 #endif /* !__STDC__ && HAVE_ANSI_CONCAT && PIKE_MPN_PREFIX */
 
@@ -149,7 +151,7 @@ int main(int argc, char **argv)
     fi
   ])
 
-  if test $done = no; then
+  if test "x$done" = "xno"; then
     $3
     :
   fi
diff --git a/src/modules/Gmp/my_gmp.h b/src/modules/Gmp/my_gmp.h
index f158154d069f59dec9d7614d4a31b0739e31b494..f84c27f800830c59a367b8c28b1e925805b0ccd6 100644
--- a/src/modules/Gmp/my_gmp.h
+++ b/src/modules/Gmp/my_gmp.h
@@ -1,4 +1,4 @@
-/* $Id: my_gmp.h,v 1.8 2000/09/04 16:04:34 grubba Exp $
+/* $Id: my_gmp.h,v 1.9 2000/09/05 13:01:01 grubba Exp $
  *
  * These functions or something similar will hopefully be included
  * with Gmp-2.1 .
@@ -11,7 +11,8 @@
  * which leads to <gmp.h> using the wrong token concat method.
  */
 #if !defined(__STDC__) && defined(HAVE_ANSI_CONCAT) && defined(PIKE_MPN_PREFIX)
-#define PIKE_MPN_CONCAT(x,y)	x##y
+#define PIKE_LOW_MPN_CONCAT(x,y)	x##y
+#define PIKE_MPN_CONCAT(x,y)	PIKE_LOW_MPN_CONCAT(x,y)
 #define __MPN(x)	PIKE_MPN_CONCAT(PIKE_MPN_PREFIX,x)
 #endif /* !__STDC__ && HAVE_ANSI_CONCAT && PIKE_MPN_PREFIX */