Merge branch 'debian' into squeeze

[kerberos/krb5-strength.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 89bcc9e7cd4e7a8bde1a8f54f04655a3c6e27ed0..1e0760c5de6ab05cca360b88ac627d9492500891 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl See LICENSE for licensing terms.
 
 dnl Basic Autoconf configuration.
 AC_PREREQ([2.64])
-AC_INIT([krb5-strength], [2.2], [eagle@eyrie.org])
+AC_INIT([krb5-strength], [3.0], [eagle@eyrie.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_LIBOBJ_DIR([portable])
 AC_CONFIG_MACRO_DIR([m4])
@@ -50,11 +50,7 @@ AC_CHECK_FUNCS([krb5_get_init_creds_opt_free],
 AC_CHECK_DECLS([krb5_kt_free_entry], [], [], [RRA_INCLUDES_KRB5])
 AC_LIBOBJ([krb5-extra])
 RRA_LIB_KRB5_RESTORE
-
-dnl Temporary hack to force building with SQLite.
-AC_CHECK_HEADERS([sqlite3.h])
-AC_DEFINE([HAVE_SQLITE3], 1, [Define if SQLite 3 is available.])
-LIBS="$LIBS -lsqlite3"
+RRA_LIB_SQLITE_OPTIONAL
 
 dnl Probe for libdl, which is used for the test suite.
 save_LIBS="$LIBS"