Index: configure.in
===================================================================
diff -u -r0c6d577dc881e3d2bcedbab0306d6d6853f69f9b -rfb1c70479008e8b50c8b1ac0885af959fc316775
--- configure.in	(.../configure.in)	(revision 0c6d577dc881e3d2bcedbab0306d6d6853f69f9b)
+++ configure.in	(.../configure.in)	(revision fb1c70479008e8b50c8b1ac0885af959fc316775)
@@ -19,7 +19,7 @@
 # This will define a ${TEA_PLATFORM} variable == "unix" or "windows".
 #--------------------------------------------------------------------
 
-TEA_INIT([3.6])
+TEA_INIT([3.7])
 AC_CONFIG_AUX_DIR(config)
 
 #--------------------------------------------------------------------
@@ -54,6 +54,11 @@
 AC_ARG_WITH(tclinclude, 
         [  --with-tclinclude       directory containing the public Tcl  header files.], 
          with_tclinclude=${withval})
+AC_ARG_WITH(expat,
+        [  --with-expat=sys assumes a system-wide expat installation, 
+           --with-expat=<INC_DIR,LIB_DIR> point to a custom expat installation,
+           --without-expat falls back to the bundled expat installation],
+        [with_expat=$withval],[with_expat=bundle])
 
 subdirs=""
 
@@ -69,17 +74,18 @@
    libdirs_actiweb="actiweb rdf registry store xml patterns"
    apps_actiweb="actiweb persistence"
    subdirs="$subdirs library/store/XOTclSdbm/"
-dnl    AC_CONFIG_SUBDIRS(library/store/XOTclSdbm/)
    if ! test "$with_gdbm" = no; then
        subdirs="$subdirs library/store/XOTclGdbm/"
-dnl       AC_CONFIG_SUBDIRS(library/store/XOTclGdbm/)
    fi
    subdirs="$subdirs library/xml/TclExpat-1.1/"
-dnl    AC_CONFIG_SUBDIRS(library/xml/TclExpat-1.1/)
 else
    test_actiweb=""
    libdirs_actiweb=""
    apps_actiweb=""
+   if ! test "${with_expat}" = bundle ; then
+      AC_MSG_RESULT([WARNING: expat configuration ${with_expat} ignored])
+      with_expat="bundle"
+   fi
 fi
 
 AC_SUBST(subdirs)
@@ -454,7 +460,7 @@
    		mkdir -p $subdir
 		confdir=${srcdir}/$subdir
 	fi
-    (cd $subdir; echo $SHELL ${confdir}/configure ${ac_configure_args} --with-xotcl=${here}; eval $SHELL ${confdir}/configure ${ac_configure_args} --with-xotcl=${here})
+    (cd $subdir; echo $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-xotcl=${here}; eval $SHELL ${confdir}/configure ${ac_configure_args} --prefix=${prefix} --with-xotcl=${here})
 done