diff --git a/src/configure b/src/configure
index eb8807a8e..fac51db44 100755
--- a/src/configure
+++ b/src/configure
@@ -4100,8 +4100,12 @@ else
     LIBRARIES="${LIBRARIES} ${LIBPREFIX}gc.${LIBEXT}"
     SUBDIR="${SUBDIR} gc"
     BOEHM_HEADERS="-I\$(top_srcdir)/gc/include"
+    if test ${shared} = "no"; then
+      CLIBS="-lgc ${CLIBS}"
+    fi
   else
     BOEHM_HEADERS=""
+    CLIBS="-lgc ${CLIBS}"
   fi
   EXTRA_OBJS="${EXTRA_OBJS} alloc_2.${OBJEXT}"
   cat >>confdefs.h <<\_ACEOF
@@ -4121,11 +4125,10 @@ fi
 if test ${local_gmp} = "no" ; then
   LIBRARIES="${LIBRARIES} ${LIBPREFIX}gmp.${LIBEXT}"
   SUBDIR="${SUBDIR} gmp"
-fi
-if test ${shared} = "no"; then
-  if test ! ${boehm} = "no"; then
-    CLIBS="-lgc ${CLIBS}"
+  if test ${shared} = "no"; then
+    CLIBS="-lgmp ${CLIBS}"
   fi
+else
   CLIBS="-lgmp ${CLIBS}"
 fi
 if test ${runtime} ; then
diff --git a/src/configure.in b/src/configure.in
index e98cbc412..cc483d5eb 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -173,8 +173,12 @@ else
     LIBRARIES="${LIBRARIES} ${LIBPREFIX}gc.${LIBEXT}"
     SUBDIR="${SUBDIR} gc"
     BOEHM_HEADERS="-I\$(top_srcdir)/gc/include"
+    if test ${shared} = "no"; then
+      CLIBS="-lgc ${CLIBS}"
+    fi
   else
     BOEHM_HEADERS=""
+    CLIBS="-lgc ${CLIBS}"
   fi
   EXTRA_OBJS="${EXTRA_OBJS} alloc_2.${OBJEXT}"
   AC_DEFINE(GBC_BOEHM)
@@ -188,11 +192,10 @@ fi
 if test ${local_gmp} = "no" ; then
   LIBRARIES="${LIBRARIES} ${LIBPREFIX}gmp.${LIBEXT}"
   SUBDIR="${SUBDIR} gmp"
-fi
-if test ${shared} = "no"; then
-  if test ! ${boehm} = "no"; then
-    CLIBS="-lgc ${CLIBS}"
+  if test ${shared} = "no"; then
+    CLIBS="-lgmp ${CLIBS}"
   fi
+else
   CLIBS="-lgmp ${CLIBS}"
 fi
 if test ${runtime} ; then