diff --git a/src/Makefile.in b/src/Makefile.in
index 72b41d252..acec97667 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -59,36 +59,35 @@ ecl_min$(EXE): $(LIBRARIES) .gdbinit
 .gdbinit: $(srcdir)/util/gdbinit
 	cp $(srcdir)/util/gdbinit $@
 
-libecl.a:
-	(echo $(SUBDIR) | grep gmp) && cp $(top_srcdir)/gmp/*.h h/
+libecl.a: libgmp.a libgc.a
 	cd c; $(MAKE)
 libgc.a:
-	cd gc; $(MAKE); mv .libs/libgc.a ..
+	if (echo $(SUBDIR) | grep gc); then \
+	  cd gc; $(MAKE) install; \
+	fi
 libgmp.a:
-	cd gmp; $(MAKE); mv .libs/libgmp.a ..
+	if (echo $(SUBDIR) | grep gmp); then \
+	  cd gmp; $(MAKE) install; \
+	fi
 
 BUILD-STAMP: config.status
 	(echo "#"; uname -a) > $@
 	head -8 config.status | tail -6 >> $@
 install: BUILD-STAMP
-	for i in $(TARGETS); do	$(INSTALL_PROGRAM) $$i $(PREFIX)$(bindir); strip $(PREFIX)$(bindir)/$$i; done
+	for i in $(TARGETS); do	\
+	  $(INSTALL_PROGRAM) $$i $(PREFIX)$(bindir); \
+	  strip $(PREFIX)$(bindir)/$$i; \
+	done
 	$(INSTALL_DATA) $(srcdir)/etc/ecl.1 $(PREFIX)$(mandir)
-	test -d $(PREFIX)$(libdir) || (mkdir $(PREFIX)$(libdir); chmod 755 $(PREFIX)$(libdir))
-	test -d $(PREFIX)$(libdir)/h || (mkdir $(PREFIX)$(libdir)/h; chmod 755 $(PREFIX)$(libdir)/h)
+	test -d $(PREFIX)$(libdir) || \
+	  (mkdir $(PREFIX)$(libdir); chmod 755 $(PREFIX)$(libdir))
+	test -d $(PREFIX)$(libdir)/h || \
+	  (mkdir $(PREFIX)$(libdir)/h; chmod 755 $(PREFIX)$(libdir)/h)
 	$(INSTALL_DATA) BUILD-STAMP $(PREFIX)$(libdir)
 	$(INSTALL_DATA) h/config.h $(PREFIX)$(libdir)/h
-	if ( echo $(SUBDIR) | grep gmp ); then \
-	$(INSTALL_DATA) gmp/?*.h $(PREFIX)$(libdir)/h; \
-	$(INSTALL_DATA) $(srcdir)/gmp/?*.h $(PREFIX)$(libdir)/h; \
-	fi
 	for i in $(LSP_LIBRARIES) $(LIBRARIES); do \
-	$(INSTALL_DATA) $$i $(PREFIX)$(libdir); \
+	  $(INSTALL_DATA) $$i $(PREFIX)$(libdir); \
 	done
-	if ( echo $(SUBDIR) | grep gmp ); then \
-	for i in $(srcdir)/gc/include/?*.h; do $(INSTALL_DATA) $$i $(PREFIX)$(libdir)/h/`basename $$i`; done; \
-	test -d $(PREFIX)$(libdir)/h/private  || (mkdir $(PREFIX)$(libdir)/h/private; chmod 755 $(PREFIX)$(libdir)/h/private); \
-	for i in $(srcdir)/gc/include/private/?*.h; do $(INSTALL_DATA) $$i $(PREFIX)$(libdir)/h/private/`basename $$i`; done; \
-	fi
 	$(INSTALL_DATA) help.doc $(PREFIX)$(libdir)
 	cd c; $(MAKE) PREFIX="$(PREFIX)" install
 	cd doc; $(MAKE) PREFIX="$(PREFIX)" install
@@ -131,4 +130,4 @@ test3:
 	-for i in lsp cmp clos clx tk; do test -f lib$$i.a && mv lib$$i.a stage2; done
 	make clean_lisp
 	./ecl < compile2.lsp
-	for i in lsp clos cmp clx tk; do test -d $$i && diff --exclude=\*.o $$i stage2/$$i; done
\ No newline at end of file
+	for i in lsp clos cmp clx tk; do test -d $$i && diff --exclude=\*.o $$i stage2/$$i; done
diff --git a/src/c/Makefile.in b/src/c/Makefile.in
index d20e93363..3e1e994d8 100644
--- a/src/c/Makefile.in
+++ b/src/c/Makefile.in
@@ -9,7 +9,7 @@ VPATH	= @srcdir@
 #
 CC	= @CC@
 DEFS	= -D@host@
-CFLAGS	= -c -I../h -I$(HDIR) -I$(top_srcdir)/gc/include @CFLAGS@ $(DEFS)
+CFLAGS	= -c -I../h -I$(HDIR) @BOEHM_HEADERS@ @CFLAGS@ $(DEFS)
 
 SHELL	= /bin/sh
 RM	= @RM@
@@ -66,7 +66,7 @@ clean:
 
 # Build rules
 
-./dpp$(EXE): $(srcdir)/dpp.c
+$(DPP): $(srcdir)/dpp.c
 	$(CC) @CFLAGS@ -I$(HDIR) $(srcdir)/dpp.c  -o $@
 
 #
diff --git a/src/configure b/src/configure
index 6cce28856..c319f37b0 100755
--- a/src/configure
+++ b/src/configure
@@ -12,19 +12,19 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
---disable-boehm	Disable Boehm's garbage collector."
+--with-tcp             Include socket interface."
 ac_help="$ac_help
---enable-clx	Include CLX."
+--disable-boehm        Disable Boehm's garbage collector."
 ac_help="$ac_help
---with-tcp	Include socket interface."
+--enable-local-boehm   Use already installed Boehm GC library."
 ac_help="$ac_help
---enable-local-gmp	Use already installed GMP library."
+--enable-local-gmp     Use already installed GMP library."
 ac_help="$ac_help
---with-gmp=args	Configure supplied GMP library with arguments."
+--with-gmp=args        Configure supplied GMP library with arguments."
 ac_help="$ac_help
---disable-shared	Enable building dynamically loadable extensions."
+--disable-shared       Enable building dynamically loadable extensions."
 ac_help="$ac_help
---with-oldloop		Use the old MIT LOOP macro."
+--with-oldloop         Use the old MIT LOOP macro."
 ac_help="$ac_help
   --with-x                use the X Window System"
 
@@ -606,6 +606,12 @@ echo "$ac_t""$host" 1>&6
 
 
 
+# Check whether --with-tcp or --without-tcp was given.
+if test "${with_tcp+set}" = set; then
+  withval="$with_tcp"
+  tcp="yes"
+fi
+
 # Check whether --enable-boehm or --disable-boehm was given.
 if test "${enable_boehm+set}" = set; then
   enableval="$enable_boehm"
@@ -614,22 +620,16 @@ else
   boehm="yes"
 fi
 
-# Check whether --enable-clx or --disable-clx was given.
-if test "${enable_clx+set}" = set; then
-  enableval="$enable_clx"
-  clx="$enableval"
-fi
-
-# Check whether --with-tcp or --without-tcp was given.
-if test "${with_tcp+set}" = set; then
-  withval="$with_tcp"
-  tcp="yes"
+# Check whether --enable-local-boehm or --disable-local-boehm was given.
+if test "${enable_local_boehm+set}" = set; then
+  enableval="$enable_local_boehm"
+  local_boehm="${enableval}"; boehm="yes"
 fi
 
 # 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}"
+  local_gmp="${enableval}"
 fi
 
 # Check whether --with-gmp or --without-gmp was given.
@@ -1552,8 +1552,14 @@ SUBDIR=c
 CLIBS="${CLIBS} -lgmp -lm"
 if test ${boehm} ; then
   LIBRARIES="${LIBRARIES} libgc.a"
+  if test ${local_boehm}; then
+    BOEHM_HEADERS=""
+  else
+    LIBRARIES="${LIBRARIES} libgc.a"
+    SUBDIR="${SUBDIR} gc"
+    BOEHM_HEADERS="-I\$(top_srcdir)/gc/include"
+  fi
   CLIBS="-lgc ${CLIBS}"
-  SUBDIR="${SUBDIR} gc"
   EXTRA_OBJS="${EXTRA_OBJS} alloc_2.o"
   cat >> confdefs.h <<\EOF
 #define GBC_BOEHM 1
@@ -1568,12 +1574,7 @@ if test ${shared} = "yes"; then
 EOF
 
 fi
-if test ${gmp} ; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_LOCAL_GMP 1
-EOF
-
-else
+if test ! ${local_gmp} ; then
   LIBRARIES="${LIBRARIES} libgmp.a"
   SUBDIR="${SUBDIR} gmp"
 fi
@@ -1634,13 +1635,13 @@ fi
 
 
   echo $ac_n "checking whether stack growns downwards""... $ac_c" 1>&6
-echo "configure:1638: checking whether stack growns downwards" >&5
+echo "configure:1639: checking whether stack growns downwards" >&5
   
   if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1644 "configure"
+#line 1645 "configure"
 #include "confdefs.h"
 
 char *f2() {
@@ -1661,7 +1662,7 @@ int main() {
 }
 
 EOF
-if { (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -1679,12 +1680,12 @@ fi
 
 
   echo $ac_n "checking if arguments can be accessed through vector""... $ac_c" 1>&6
-echo "configure:1683: checking if arguments can be accessed through vector" >&5
+echo "configure:1684: checking if arguments can be accessed through vector" >&5
   if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1688 "configure"
+#line 1689 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -1709,7 +1710,7 @@ int main() {
 }
 
 EOF
-if { (eval echo configure:1713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
@@ -1728,12 +1729,12 @@ fi
 
 
 echo $ac_n "checking appropiate type for fixnums""... $ac_c" 1>&6
-echo "configure:1732: checking appropiate type for fixnums" >&5
+echo "configure:1733: checking appropiate type for fixnums" >&5
 if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 1738 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
@@ -1748,7 +1749,7 @@ int main() {
   exit(0);
 }
 EOF
-if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cl_fixnum=`cat conftestval`
 echo "$ac_t""${cl_fixnum}" 1>&6
@@ -1766,12 +1767,12 @@ rm -fr conftest*
 fi
 
 echo $ac_n "checking most positive fixnum""... $ac_c" 1>&6
-echo "configure:1770: checking most positive fixnum" >&5
+echo "configure:1771: checking most positive fixnum" >&5
 if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1775 "configure"
+#line 1776 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
@@ -1789,7 +1790,7 @@ int main() {
   exit(0);
 }
 EOF
-if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cl_fixnum_limit=`cat conftestval`
 echo "$ac_t""${cl_fixnum_limit}" 1>&6
@@ -1809,14 +1810,14 @@ fi
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1813: checking whether byte ordering is bigendian" >&5
+echo "configure:1814: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 1820 "configure"
+#line 1821 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1827,11 +1828,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 1835 "configure"
+#line 1836 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1842,7 +1843,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -1862,7 +1863,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1866 "configure"
+#line 1867 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -1875,7 +1876,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:1879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -1904,7 +1905,7 @@ fi
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1908: checking for X" >&5
+echo "configure:1909: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1966,12 +1967,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1970 "configure"
+#line 1971 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2040,14 +2041,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2044 "configure"
+#line 2045 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -2153,17 +2154,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2157: checking whether -R must be followed by a space" >&5
+echo "configure:2158: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 2160 "configure"
+#line 2161 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -2179,14 +2180,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 2183 "configure"
+#line 2184 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -2218,7 +2219,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2222: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2223: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2226,7 +2227,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2230 "configure"
+#line 2231 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2237,7 +2238,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2259,7 +2260,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2263: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2264: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2267,7 +2268,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2271 "configure"
+#line 2272 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2278,7 +2279,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2307,12 +2308,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2311: checking for gethostbyname" >&5
+echo "configure:2312: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 2317 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -2335,7 +2336,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -2356,7 +2357,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2360: checking for gethostbyname in -lnsl" >&5
+echo "configure:2361: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2364,7 +2365,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2368 "configure"
+#line 2369 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2375,7 +2376,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2405,12 +2406,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2409: checking for connect" >&5
+echo "configure:2410: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2415 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -2433,7 +2434,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -2454,7 +2455,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2458: checking for connect in -lsocket" >&5
+echo "configure:2459: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2462,7 +2463,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2466 "configure"
+#line 2467 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2473,7 +2474,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2497,12 +2498,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2501: checking for remove" >&5
+echo "configure:2502: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2506 "configure"
+#line 2507 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2525,7 +2526,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -2546,7 +2547,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2550: checking for remove in -lposix" >&5
+echo "configure:2551: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2554,7 +2555,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2558 "configure"
+#line 2559 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2565,7 +2566,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2589,12 +2590,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2593: checking for shmat" >&5
+echo "configure:2594: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2599 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2617,7 +2618,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -2638,7 +2639,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2642: checking for shmat in -lipc" >&5
+echo "configure:2643: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2646,7 +2647,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2650 "configure"
+#line 2651 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2657,7 +2658,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2690,7 +2691,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2694: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2695: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2698,7 +2699,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2702 "configure"
+#line 2703 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2709,7 +2710,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2753,11 +2754,11 @@ fi
 XLIBS="$XLIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
 echo $ac_n "checking checking for gmp...""... $ac_c" 1>&6
-echo "configure:2757: checking checking for gmp..." >&5
-if test ${gmp} ; then
-  echo "$ac_t""no" 1>&6
+echo "configure:2758: checking checking for gmp..." >&5
+if test ${local_gmp} ; then
+  echo "$ac_t""already installed" 1>&6
 else
-  echo "$ac_t""yes" 1>&6
+  echo "$ac_t""configuring local copy" 1>&6
   test -d gmp && rm -rf gmp
   if mkdir gmp; then
    (cd gmp;
@@ -2766,17 +2767,17 @@ else
   fi
 fi
 echo $ac_n "checking checking for Boehm-Weiser gc...""... $ac_c" 1>&6
-echo "configure:2770: checking checking for Boehm-Weiser gc..." >&5
-if test ${boehm} ; then
-  echo "$ac_t""yes" 1>&6
+echo "configure:2771: checking checking for Boehm-Weiser gc..." >&5
+if test ${local_boehm} ; then
+  echo "$ac_t""already installed" 1>&6
+else
+  echo "$ac_t""configuring local copy" 1>&6
   test -d gc && rm -rf gc
   if mkdir gc; then
    (cd gc;
-     $srcdir/gc/configure --libdir="$libdir" --bindir="$bindir" \
-	 --includedir="$includedir" --disable-shared)
+     $srcdir/gc/configure --disable-shared --prefix=$bindir \
+	--includedir=${builddir}/h --libdir=${builddir})
   fi
-else
-  echo "$ac_t""no" 1>&6
 fi
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -2945,6 +2946,7 @@ s%@TKLIBS@%$TKLIBS%g
 s%@SUBDIR@%$SUBDIR%g
 s%@LIBRARIES@%$LIBRARIES%g
 s%@LSP_LIBRARIES@%$LSP_LIBRARIES%g
+s%@BOEHM_HEADERS@%$BOEHM_HEADERS%g
 s%@CP@%$CP%g
 s%@RM@%$RM%g
 s%@MV@%$MV%g
diff --git a/src/configure.in b/src/configure.in
index 5964897eb..4b4491387 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -44,27 +44,30 @@ AC_SUBST(mandir)
 AC_SUBST(infodir)
 AC_SUBST(builddir)
 AC_SUBST(top_srcdir)
-AC_ARG_ENABLE(boehm,
-	[--disable-boehm	Disable Boehm's garbage collector.],
-	boehm="${enableval}", boehm="yes")
 dnl AC_ARG_ENABLE(tk,
-dnl 	[--enable-tk	Include Tk.],
+dnl 	[--enable-tk            Include Tk.],
 dnl 	tk="$enable_tk")
-AC_ARG_ENABLE(clx,
-	[--enable-clx	Include CLX.],
-	clx="$enableval")
+dnl AC_ARG_ENABLE(clx,
+dnl 	[--enable-clx           Include CLX.],
+dnl 	clx="$enableval")
 AC_ARG_WITH(tcp,
-	[--with-tcp	Include socket interface.],
+	[--with-tcp             Include socket interface.],
 	tcp="yes")
+AC_ARG_ENABLE(boehm,
+	[--disable-boehm        Disable Boehm's garbage collector.],
+	boehm="${enableval}", boehm="yes")
+AC_ARG_ENABLE(local-boehm,
+	[--enable-local-boehm   Use already installed Boehm GC library.],
+	local_boehm="${enableval}"; boehm="yes")
 AC_ARG_ENABLE(local-gmp,
-	[--enable-local-gmp	Use already installed GMP library.],
-	gmp="${enableval}")
+	[--enable-local-gmp     Use already installed GMP library.],
+	local_gmp="${enableval}")
 AC_ARG_WITH(gmp,
-	[--with-gmp=args	Configure supplied GMP library with arguments.],
+	[--with-gmp=args        Configure supplied GMP library with arguments.],
 	[gmp_flags=$withval; enable_local_gmp=no],
 	gmp_flags="")
 dnl AC_ARG_ENABLE(locative,
-dnl 	[--enable-locative	Include locative support.],
+dnl 	[--enable-locative      Include locative support.],
 dnl 	locative="$enable_locative")
 dnl AC_ARG_ENABLE(threads,
 dnl 	[--enable-threads	Include the multiple thread facility.],
@@ -73,10 +76,10 @@ dnl AC_ARG_ENABLE(runtime,
 dnl 	[--enable-runtime	Build no compiler.],
 dnl 	runtime="$enable_runtime")
 AC_ARG_ENABLE(shared,
-	[--disable-shared	Enable building dynamically loadable extensions.],
+	[--disable-shared       Enable building dynamically loadable extensions.],
 	shared="$enable_shared",shared="yes")
 AC_ARG_WITH(oldloop,
-	[--with-oldloop		Use the old MIT LOOP macro.],
+	[--with-oldloop         Use the old MIT LOOP macro.],
 	oldloop="yes")
 
 ### ----------------------------------------------------------------------
@@ -107,6 +110,7 @@ AC_SUBST(TKLIBS)dnl		Libraries with the Tcl/Tk components
 AC_SUBST(SUBDIR)dnl		Subdirectories that make should process
 AC_SUBST(LIBRARIES)dnl		GMP, Boehm's GC, etc
 AC_SUBST(LSP_LIBRARIES)dnl	Libraries produced by lisp translator
+AC_SUBST(BOEHM_HEADERS)dnl	Header path for Boehm GC
 
 dnl ----------------------------------------------------------------------
 dnl           checks for UNIX variants that set DEFS
@@ -148,8 +152,14 @@ SUBDIR=c
 CLIBS="${CLIBS} -lgmp -lm"
 if test ${boehm} ; then
   LIBRARIES="${LIBRARIES} libgc.a"
+  if test ${local_boehm}; then
+    BOEHM_HEADERS=""
+  else
+    LIBRARIES="${LIBRARIES} libgc.a"
+    SUBDIR="${SUBDIR} gc"
+    BOEHM_HEADERS="-I\$(top_srcdir)/gc/include"
+  fi
   CLIBS="-lgc ${CLIBS}"
-  SUBDIR="${SUBDIR} gc"
   EXTRA_OBJS="${EXTRA_OBJS} alloc_2.o"
   AC_DEFINE(GBC_BOEHM)
 else
@@ -158,9 +168,7 @@ fi
 if test ${shared} = "yes"; then
   AC_DEFINE(ENABLE_DLOPEN)
 fi
-if test ${gmp} ; then
-  AC_DEFINE(HAVE_LOCAL_GMP)
-else
+if test ! ${local_gmp} ; then
   LIBRARIES="${LIBRARIES} libgmp.a"
   SUBDIR="${SUBDIR} gmp"
 fi
@@ -256,10 +264,10 @@ dnl ---------------------------------------------------------------------
 dnl		GNU multiprecision library
 dnl
 AC_MSG_CHECKING(checking for gmp...)
-if test ${gmp} ; then
-  AC_MSG_RESULT(no)
+if test ${local_gmp} ; then
+  AC_MSG_RESULT(already installed)
 else
-  AC_MSG_RESULT(yes, configuring)
+  AC_MSG_RESULT(configuring local copy)
   test -d gmp && rm -rf gmp
   if mkdir gmp; then
    (cd gmp;
@@ -271,16 +279,16 @@ dnl ---------------------------------------------------------------------
 dnl		Boehm-Weiser garbage collector
 dnl
 AC_MSG_CHECKING(checking for Boehm-Weiser gc...)
-if test ${boehm} ; then
-  AC_MSG_RESULT(yes, configuring)
+if test ${local_boehm} ; then
+  AC_MSG_RESULT(already installed)
+else
+  AC_MSG_RESULT(configuring local copy)
   test -d gc && rm -rf gc
   if mkdir gc; then
    (cd gc;
-     $srcdir/gc/configure --libdir="$libdir" --bindir="$bindir" \
-	 --includedir="$includedir" --disable-shared)
+     $srcdir/gc/configure --disable-shared --prefix=$bindir \
+	--includedir=${builddir}/h --libdir=${builddir})
   fi
-else
-  AC_MSG_RESULT(no)
 fi
 dnl ---------------------------------------------------------------------
 dnl		Final pass over configuration files