Index: enforcer/configure.ac
===================================================================
--- enforcer/configure.ac	(revision 2881)
+++ enforcer/configure.ac	(working copy)
@@ -142,24 +142,36 @@
 		[enable_mysql="${enableval}"],
 		[enable_mysql="no"])
 
+AC_ARG_ENABLE(sqlite3,
+        AC_HELP_STRING([--disable-sqlite3],
+                [Disable sqlite3 database driver]),
+		[enable_sqlite3="${enableval}"],
+		[enable_sqlite3="yes"])
+
 AC_MSG_CHECKING(if we should use SQLite or MySQL)
 if test "x${enable_mysql}" = "xyes"; then
-	AC_MSG_RESULT(MySQL)
+	if test "x${enable_sqlite3}" = "xyes"; then
+		AC_MSG_ERROR([Both SQLite3 and MySQL enabled where exactly one needed])
+	else
+		AC_MSG_RESULT(MySQL)
 
-	ACX_MYSQL
+		ACX_MYSQL
 
-    	DB_TYPE=mysql
-	DB_INCLUDES=$MYSQL_INCLUDES
-	DB_LIBS=$MYSQL_LIBS
+	    	DB_TYPE=mysql
+		DB_INCLUDES=$MYSQL_INCLUDES
+		DB_LIBS=$MYSQL_LIBS
 
-        AC_DEFINE_UNQUOTED(SQL_BIN, "$MYSQL", [database binary]) 
-	AC_DEFINE_UNQUOTED(SQL_SETUP, "$opendnssecdatadir/database_create.mysql", [database setup script])
+	        AC_DEFINE_UNQUOTED(SQL_BIN, "$MYSQL", [database binary]) 
+		AC_DEFINE_UNQUOTED(SQL_SETUP, "$opendnssecdatadir/database_create.mysql", [database setup script])
 
-	AC_SUBST(DB_TYPE) 
-	AC_SUBST(DB_INCLUDES) 
-	AC_SUBST(DB_LIBS) 
+		AC_SUBST(DB_TYPE) 
+		AC_SUBST(DB_INCLUDES) 
+		AC_SUBST(DB_LIBS) 
 
-else
+		AM_CONDITIONAL([USE_MYSQL], true)
+	fi
+
+elif test "x${enable_sqlite3}" = "xyes"; then
 	AC_MSG_RESULT(SQLite)
 
 	ACX_SQLITE3
@@ -175,9 +187,12 @@
 	AC_SUBST(DB_INCLUDES) 
 	AC_SUBST(DB_LIBS) 
 
+	AM_CONDITIONAL([USE_MYSQL], false)
+else
+	AC_MSG_ERROR([None of SQLite3 and MySQL enabled where exactly one needed])
+	AM_CONDITIONAL([USE_MYSQL], false)
 fi
 
-AM_CONDITIONAL([USE_MYSQL], [test "x${enable_mysql}" = "xyes"])
 
 CONFIG_DIR=$opendnssecsysconfdir
 CONFIG_FILE=$opendnssecsysconfdir/conf.xml