-dnl Check for Berkeley DB3 library
-if test "x$db3_required" = "xyes"; then
- AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
+dnl Determine whether or not to use filename mangling
+AC_MSG_CHECKING([whether or not to use filename mangling])
+AC_ARG_WITH(mangling,
+ [ --with-mangling enable filename mangling],
+ if test "$withval" = "yes"; then
+ if test "x$did_scheme" != "xcnid"; then
+ AC_MSG_ERROR([DID scheme must be CNID to use filename mangling])
+ else
+ AC_DEFINE(FILE_MANGLING, 1)
+ AC_MSG_RESULT([yes])
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+ , AC_MSG_RESULT([no])
+)
+
+if test "$did_scheme" = "cnid"; then
+ USE_CDB="yes"
+else
+ USE_CDB="no"
+fi
+
+dnl Determine whether or not to use CDB or transactional DB store
+AC_MSG_CHECKING([whether or not to use CNID with Concurrent Data Store])
+AC_ARG_WITH(cdb,
+ [ --with-cdb enable CNID with Concurrent Data Store],
+ if test "$withval" = "no"; then
+ if test "x$did_scheme" != "xcnid"; then
+ USE_CDB="no"
+ AC_MSG_ERROR([DID scheme must be CNID to use CDB])
+ else
+ USE_CDB="no"
+ AC_MSG_RESULT([no])
+ fi
+ else
+ USE_CDB="yes"
+ AC_MSG_RESULT([yes])
+ fi
+ , AC_MSG_RESULT([yes])
+)
+
+if test "$USE_CDB" = "yes"; then
+ AC_DEFINE(CNID_DB_CDB, 1)
+fi
+
+dnl Check for Berkeley DB library
+if test "x$bdb_required" = "xyes"; then
+ AC_PATH_BDB(, [AC_MSG_ERROR([Berkeley DB library not found!])])