minor fixes, global spellcheck

[platform/upstream/cryptsetup.git] / configure.in

diff --git a/configure.in b/configure.in
index 8d71bd8..758bd4e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 AC_PREREQ([2.67])
-AC_INIT([cryptsetup],[1.3.2-cvs])
+AC_INIT([cryptsetup],[1.4.1])
 
 dnl library version from <major>.<minor>.<release>[-<suffix>]
 LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
-LIBCRYPTSETUP_VERSION_INFO=3:0:2
+LIBCRYPTSETUP_VERSION_INFO=4:0:0
 
 AC_CONFIG_SRCDIR(src/cryptsetup.c)
 AC_CONFIG_MACRO_DIR([m4])
@@ -124,13 +124,11 @@ AC_DEFUN([CONFIGURE_NETTLE], [
                [AC_MSG_ERROR('You need Nettle cryptographic library.')])
 
        saved_LIBS=$LIBS
-       AC_CHECK_LIB(nettle, nettle_sha512_init,,
-               [AC_MSG_ERROR('You need Nettle library version 2.1 or more recent.')])
+       AC_CHECK_LIB(nettle, nettle_ripemd160_init,,
+               [AC_MSG_ERROR('You need Nettle library version 2.4 or more recent.')])
        CRYPTO_LIBS=$LIBS
        LIBS=$saved_LIBS
 
-       AC_MSG_WARN([Nettle backend does NOT provide backward compatibility (missing ripemd160 hash).])
-
        CRYPTO_STATIC_LIBS=$CRYPTO_LIBS
 ])
 
@@ -220,6 +218,11 @@ if test x$enable_static_cryptsetup = xyes; then
        AC_CHECK_LIB(devmapper, dm_task_set_uuid,,
                AC_MSG_ERROR([Cannot link with static device-mapper library.]))
 
+       dnl Try to detect uuid static library.
+       LIBS="$saved_LIBS -static"
+       AC_CHECK_LIB(uuid, uuid_generate,,
+               AC_MSG_ERROR([Cannot find static uuid library.]))
+
        LIBS=$saved_LIBS
        PKG_CONFIG=$saved_PKG_CONFIG
 fi
@@ -257,6 +260,25 @@ AC_DEFUN([CS_NUM_WITH], [AC_ARG_WITH([$1],
        [CS_DEFINE([$1], [$3], [$2])]
 )])
 
+dnl ==========================================================================
+dnl Python bindings
+AC_ARG_ENABLE([python], AS_HELP_STRING([--enable-python],[enable Python bindings]),
+[with_python=$enableval],
+[with_python=no])
+
+if test "x$with_python" = "xyes"; then
+       AM_PATH_PYTHON([2.4])
+
+       if ! test -x "$PYTHON-config" ; then
+            AC_MSG_ERROR([Cannot find python development packages to build bindings])
+       fi
+
+       PYTHON_INCLUDES=$($PYTHON-config --includes)
+       AC_SUBST(PYTHON_INCLUDES)
+fi
+AM_CONDITIONAL([PYTHON_CRYPTSETUP], [test "x$with_python" = "xyes"])
+
+dnl ==========================================================================
 CS_STR_WITH([plain-hash],   [password hashing function for plain mode], [ripemd160])
 CS_STR_WITH([plain-cipher], [cipher for plain mode], [aes])
 CS_STR_WITH([plain-mode],   [cipher mode for plain mode], [cbc-essiv:sha256])
@@ -285,5 +307,6 @@ src/Makefile
 po/Makefile.in
 man/Makefile
 tests/Makefile
+python/Makefile
 ])
 AC_OUTPUT