Index: configure
===================================================================
diff -u -r11d61aae115751c1c6c0c5d507c98606c3b16c48 -rf265d8b18ef1925998a3ab7169f8d642769e6212
--- configure	(.../configure)	(revision 11d61aae115751c1c6c0c5d507c98606c3b16c48)
+++ configure	(.../configure)	(revision f265d8b18ef1925998a3ab7169f8d642769e6212)
@@ -734,10 +734,7 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-with_gdbm
 with_aolserver3
-with_actiweb
-with_expat
 with_dtrace
 enable_profile
 enable_memcount
@@ -1392,18 +1389,9 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gdbm=GDBM_INCLUDE_DIR,GDBM_LIB_DIR
-                          build with gdbm support; provide path to gdbm.h and
-                          optionally to the shared library (default: off)
   --with-aolserver3=AOL_SERVER_DIR
                           build an AOLserver 3 module; point to directory
                           containing aolsever/include (default: off)
-  --with-actiweb=yes|no   build with actiweb components (default: off)
-  --with-expat            choose expat support; --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-dtrace           build nsf with dtrace (default: without)
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
@@ -2346,14 +2334,6 @@
 #  - "enable" is for optional features
 #
 
-# Check whether --with-gdbm was given.
-if test "${with_gdbm+set}" = set; then :
-  withval=$with_gdbm; with_gdbm=$withval
-else
-  with_gdbm=no
-fi
-
-
 # Check whether --with-aolserver3 was given.
 if test "${with_aolserver3+set}" = set; then :
   withval=$with_aolserver3; with_aol3=$withval
@@ -2362,22 +2342,6 @@
 fi
 
 
-# Check whether --with-actiweb was given.
-if test "${with_actiweb+set}" = set; then :
-  withval=$with_actiweb; with_actiweb=$withval
-else
-  with_actiweb=no
-fi
-
-
-# Check whether --with-expat was given.
-if test "${with_expat+set}" = set; then :
-  withval=$with_expat; with_expat=$withval
-else
-  with_expat=bundle
-fi
-
-
 # Check whether --with-dtrace was given.
 if test "${with_dtrace+set}" = set; then :
   withval=$with_dtrace; with_dtrace=$withval
@@ -2416,30 +2380,13 @@
 
 subdirs=""
 
-if test "$with_actiweb" = yes; then
-   test_actiweb="test-actiweb"
-   libdirs_actiweb="actiweb rdf registry store xml patterns"
-   apps_actiweb="actiweb persistence"
-   subdirs="$subdirs library/store/XOTclSdbm/"
-   if ! test "$with_gdbm" = no; then
-       subdirs="$subdirs library/store/XOTclGdbm/"
-   fi
-   subdirs="$subdirs library/xml/TclExpat-1.1/"
-else
-   test_actiweb=""
-   libdirs_actiweb=""
-   apps_actiweb=""
-   if ! test "${with_expat}" = bundle ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: WARNING: expat configuration ${with_expat} ignored" >&5
-$as_echo "WARNING: expat configuration ${with_expat} ignored" >&6; }
-      with_expat="bundle"
-   fi
-fi
+test_actiweb=""
+libdirs_actiweb=""
+apps_actiweb=""
 
 
 
 
-
 #--------------------------------------------------------------------
 # __CHANGE__
 # Set your package name and version numbers here.  The NODOT_VERSION is
Index: configure.in
===================================================================
diff -u -r96fd7ec7c3e09038f2ac706a0ded966c2125be74 -rf265d8b18ef1925998a3ab7169f8d642769e6212
--- configure.in	(.../configure.in)	(revision 96fd7ec7c3e09038f2ac706a0ded966c2125be74)
+++ configure.in	(.../configure.in)	(revision f265d8b18ef1925998a3ab7169f8d642769e6212)
@@ -29,25 +29,11 @@
 #  - "with" is for external software (optional packages)
 #  - "enable" is for optional features
 #
-AC_ARG_WITH(gdbm,
-	AC_HELP_STRING([--with-gdbm=GDBM_INCLUDE_DIR,GDBM_LIB_DIR], 
-		 [build with gdbm support; provide path to gdbm.h and optionally
-                 to the shared library (default: off)]),
-        [with_gdbm=$withval], [with_gdbm=no])
 AC_ARG_WITH(aolserver3,
 	AC_HELP_STRING([--with-aolserver3=AOL_SERVER_DIR], 
 		[build an AOLserver 3 module; 
 		point to directory containing aolsever/include (default: off)]),
         [with_aol3=$withval], [with_aol3=no])
-AC_ARG_WITH(actiweb,
-	AC_HELP_STRING([--with-actiweb=yes|no], [build with actiweb components (default: off)]),
-        [with_actiweb=$withval], [with_actiweb=no])
-AC_ARG_WITH(expat,
-	AC_HELP_STRING([--with-expat], 
-		[ choose expat support; --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])
 AC_ARG_WITH(dtrace,
 	AC_HELP_STRING([--with-dtrace], [build nsf with dtrace (default: without)]),
         [with_dtrace=$withval], [with_dtrace=no])
@@ -69,29 +55,13 @@
 
 subdirs=""
 
-if test "$with_actiweb" = yes; then
-   test_actiweb="test-actiweb"
-   libdirs_actiweb="actiweb rdf registry store xml patterns"
-   apps_actiweb="actiweb persistence"
-   subdirs="$subdirs library/store/XOTclSdbm/"
-   if ! test "$with_gdbm" = no; then
-       subdirs="$subdirs library/store/XOTclGdbm/"
-   fi
-   subdirs="$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
+test_actiweb=""
+libdirs_actiweb=""
+apps_actiweb=""
 
 AC_SUBST(subdirs)
 
 
-
 #--------------------------------------------------------------------
 # __CHANGE__
 # Set your package name and version numbers here.  The NODOT_VERSION is
Index: library/mongodb/configure
===================================================================
diff -u -rc81b840c71a9f0de9d0a502e3e4ddfde57b81fdd -rf265d8b18ef1925998a3ab7169f8d642769e6212
--- library/mongodb/configure	(.../configure)	(revision c81b840c71a9f0de9d0a502e3e4ddfde57b81fdd)
+++ library/mongodb/configure	(.../configure)	(revision f265d8b18ef1925998a3ab7169f8d642769e6212)
@@ -728,8 +728,7 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.