Index: configure
===================================================================
diff -u -reb758924a74f48512c98a40a539ab0c4e5a35de9 -r73fd4b59d6d389ccf3e64f4dcf2f5f14738eeffb
--- configure	(.../configure)	(revision eb758924a74f48512c98a40a539ab0c4e5a35de9)
+++ configure	(.../configure)	(revision 73fd4b59d6d389ccf3e64f4dcf2f5f14738eeffb)
@@ -756,7 +756,8 @@
 enable_option_checking
 with_aolserver3
 with_dtrace
-with_mongodb
+with_mongoc
+with_bson
 enable_profile
 enable_memcount
 enable_development
@@ -1415,8 +1416,12 @@
                           build an AOLserver 3 module; point to directory
                           containing aolsever/include (default: off)
   --with-dtrace           build nsf with dtrace (default: without)
-  --with-mongodb=MONGO_INCLUDE_DIR,MONGO_LIB_DIR
-                          build nsf with mongodb support (default: without)
+  --with-mongoc=MONGOC_INCLUDE_DIR,MONGOC_LIB_DIR
+                          build nsf with mongodb c-driver support (default:
+                          without)
+  --with-bson=BSON_INCLUDE_DIR,BSON_LIB_DIR
+                          build nsf with mongodb bson support (default:
+                          without)
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
@@ -2393,13 +2398,21 @@
 fi
 
 
-# Check whether --with-mongodb was given.
-if test "${with_mongodb+set}" = set; then :
-  withval=$with_mongodb; with_mongodb=$withval
+# Check whether --with-mongoc was given.
+if test "${with_mongoc+set}" = set; then :
+  withval=$with_mongoc; with_mongoc=$withval
 else
-  with_mongodb=no
+  with_mongoc=no
 fi
 
+
+# Check whether --with-bson was given.
+if test "${with_bson+set}" = set; then :
+  withval=$with_bson; with_bson=$withval
+else
+  with_bson=no
+fi
+
 # Check whether --enable-profile was given.
 if test "${enable_profile+set}" = set; then :
   enableval=$enable_profile; enable_profile=$enableval
@@ -2438,7 +2451,7 @@
 
 subdirs=""
 
-if ! test "$with_mongodb" = no; then
+if ! test "$with_mongoc" = no; then
    test_mongodb=test-mongdb
    subdirs="$subdirs library/mongodb"
 fi
Index: configure.ac
===================================================================
diff -u -reb758924a74f48512c98a40a539ab0c4e5a35de9 -r73fd4b59d6d389ccf3e64f4dcf2f5f14738eeffb
--- configure.ac	(.../configure.ac)	(revision eb758924a74f48512c98a40a539ab0c4e5a35de9)
+++ configure.ac	(.../configure.ac)	(revision 73fd4b59d6d389ccf3e64f4dcf2f5f14738eeffb)
@@ -37,10 +37,14 @@
 AC_ARG_WITH(dtrace,
 	AC_HELP_STRING([--with-dtrace], [build nsf with dtrace (default: without)]),
         [with_dtrace=$withval], [with_dtrace=no])
-AC_ARG_WITH(mongodb,
-	AC_HELP_STRING([--with-mongodb=MONGO_INCLUDE_DIR[,MONGO_LIB_DIR]], 
-		[build nsf with mongodb support (default: without)]),
-        	[with_mongodb=$withval], [with_mongodb=no])
+AC_ARG_WITH(mongoc,
+	AC_HELP_STRING([--with-mongoc=MONGOC_INCLUDE_DIR[,MONGOC_LIB_DIR]],
+		[build nsf with mongodb c-driver support (default: without)]),
+		[with_mongoc=$withval], [with_mongoc=no])
+AC_ARG_WITH(bson,
+	AC_HELP_STRING([--with-bson=BSON_INCLUDE_DIR[,BSON_LIB_DIR]],
+		[build nsf with mongodb bson support (default: without)]),
+		[with_bson=$withval], [with_bson=no])
 AC_ARG_ENABLE(profile,
 	AC_HELP_STRING([--enable-profile], [build nsf with profile support (default: disabled)]),
         [enable_profile=$enableval], [enable_profile=no])
@@ -63,7 +67,7 @@
 
 subdirs=""
 
-if ! test "$with_mongodb" = no; then
+if ! test "$with_mongoc" = no; then
    test_mongodb=test-mongdb
    subdirs="$subdirs library/mongodb"
 fi