Index: xotcl/configure.in
===================================================================
diff -u -r9722a51911e1502444c173306c8c88f7f3888989 -r0fb94b7893b3423b536af13fa081e7190e0ec0a2
--- xotcl/configure.in	(.../configure.in)	(revision 9722a51911e1502444c173306c8c88f7f3888989)
+++ xotcl/configure.in	(.../configure.in)	(revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2)
@@ -59,6 +59,8 @@
         [  --with-tclinclude       directory containing the public Tcl  header files.], 
          with_tclinclude=${withval})
 
+subdirs=""
+
 if test "$with_all" = yes; then
    with_actiweb=yes
    with_xotclsh=yes
@@ -70,17 +72,22 @@
    test_actiweb="test-actiweb"
    libdirs_actiweb="actiweb rdf registry store xml patterns"
    apps_actiweb="actiweb persistence"
-   AC_CONFIG_SUBDIRS(library/store/XOTclSdbm/)
+   subdirs="$subdirs library/store/XOTclSdbm/"
+dnl    AC_CONFIG_SUBDIRS(library/store/XOTclSdbm/)
    if ! test "$with_gdbm" = no; then
-      AC_CONFIG_SUBDIRS(library/store/XOTclGdbm/)
+       subdirs="$subdirs library/store/XOTclGdbm/"
+dnl       AC_CONFIG_SUBDIRS(library/store/XOTclGdbm/)
    fi
-   AC_CONFIG_SUBDIRS(library/xml/TclExpat-1.1/)
+   subdirs="$subdirs library/xml/TclExpat-1.1/"
+dnl    AC_CONFIG_SUBDIRS(library/xml/TclExpat-1.1/)
 else
    test_actiweb=""
    libdirs_actiweb=""
    apps_actiweb=""
 fi
 
+AC_SUBST(subdirs)
+
 if test "$with_tk" = no; then with_xowish="" ; fi
 if test "$with_xotclsh" = yes; then XOTCLSH="xotclsh" ; else XOTCLSH=""; fi
 if test "$with_xowish" = yes;  then XOWISH="xowish"   ; else XOWISH=""; fi
@@ -335,6 +342,7 @@
 PKG_DIR="${PACKAGE_NAME}${PACKAGE_VERSION}"
 pkgdatadir="${datadir}/${PKG_DIR}"
 pkglibdir="${libdir}/${PKG_DIR}"
+# make sure this is right (then remove this comment)
 pkgincludedir="${includedir}/${PKG_DIR}"
 
 AC_SUBST(PKG_DIR)
@@ -376,6 +384,12 @@
 AC_SUBST(XOTCLSH)
 AC_SUBST(XOWISH)
 
+# include dir of xotcl during build process (i.e., does not assume installed)
+XOTCL_BUILD_INCLUDE_DIR="${XOTCL_SRC_DIR}/generic"
+XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}"
+AC_SUBST(XOTCL_BUILD_INCLUDE_DIR)
+AC_SUBST(XOTCL_BUILD_INCLUDE_SPEC)
+
 AC_SUBST(test_actiweb)
 AC_SUBST(libdirs_actiweb)
 AC_SUBST(apps_actiweb)
@@ -397,7 +411,7 @@
 # target, defined in Makefile.in
 #--------------------------------------------------------------------
 
-CONFIG_CLEAN_FILES="CONFIG_OUTPUT_FILES"
+CONFIG_CLEAN_FILES="CONFIG_OUTPUT_FILES autom4te.cache/"
 
 AC_SUBST(CONFIG_CLEAN_FILES)
 
@@ -414,3 +428,11 @@
 #--------------------------------------------------------------------
 
 AC_OUTPUT
+
+here=${PWD}
+
+for subdir in ${subdirs}
+do
+    (cd $subdir; eval $SHELL configure ${ac_configure_args} --with-xotcl=${here})
+done
+