Index: library/mongodb/configure.ac
===================================================================
diff -u -re5837b2b6a65987c826cba577fc4cab810881375 -r9297b4159bf699939e464a50dedf193406061a77
--- library/mongodb/configure.ac	(.../configure.ac)	(revision e5837b2b6a65987c826cba577fc4cab810881375)
+++ library/mongodb/configure.ac	(.../configure.ac)	(revision 9297b4159bf699939e464a50dedf193406061a77)
@@ -9,7 +9,7 @@
 # need to modify this file are marked by the string __CHANGE__
 #-----------------------------------------------------------------------
 
-configdir=$(srcdir)/../../config
+configdir=$(srcdir)/../../tclconfig
 
 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -31,28 +31,28 @@
 
 TEA_INIT([3.9])
 
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR([../../tclconfig])
 
 #--------------------------------------------------------------------
 # specify some extra flags
 #--------------------------------------------------------------------
-AC_ARG_WITH(mongoc,
+AC_ARG_WITH([mongoc],
         [  --with-mongoc=MONGOC_INCLUDE_DIR[,MONGOC_LIB_DIR]
             absolute path to mongo.h and optionally the path to the library,
            --without-mongoc disables build of the mongo interface],
         [with_mongoc=$withval], [with_mongoc=no])
-AC_ARG_WITH(bson,
+AC_ARG_WITH([bson],
         [  --with-bson=BSON_INCLUDE_DIR[,BSON_LIB_DIR]
             absolute path to bson.h and optionally the path to the library,
            --without-bson disables build of the mongo interface],
         [with_bson=$withval], [with_bson=no])
 
-AC_ARG_WITH(nsf,
+AC_ARG_WITH([nsf],
         [  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
             absolute path to nsfConfig.sh,
            --without-nsf disables, but this is pointless],
         [with_nsf=$withval], [AC_MSG_ERROR([--with-nsf is required])])
-AC_ARG_ENABLE(development,
+AC_ARG_ENABLE([development],
 	AS_HELP_STRING([--enable-development],
 		[build nsf with development support (intensive runtime checking, etc.; default: disabled)]),
         [enable_development=$enableval], [enable_development=no])