updated

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

diff --git a/configure.in b/configure.in
index 3d925fe..936d165 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,10 @@
 AC_PREREQ(2.57)
-AC_INIT(cryptsetup,1.1.0-rc3)
+AC_INIT(cryptsetup,1.1.3)
+
+dnl library version from <major>.<minor>.<release>[-<suffix>]
+LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
+LIBCRYPTSETUP_VERSION_INFO=1:0:0
+
 AC_CONFIG_SRCDIR(src/cryptsetup.c)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -37,7 +42,7 @@ LIBS=$saved_LIBS
 
 AM_PATH_LIBGCRYPT(1.1.42,,[AC_MSG_ERROR('You need the gcrypt library')])
 
-AC_CHECK_FUNCS([setlocale, posix_memalign])
+AC_CHECK_FUNCS([posix_memalign])
 
 AC_C_CONST
 AC_C_BIGENDIAN
@@ -71,9 +76,34 @@ AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared_library = xno)
 AC_ARG_ENABLE(selinux,
 [  --disable-selinux       disable selinux support [[default=auto]]],[], [])
 
+AC_ARG_ENABLE([udev],AS_HELP_STRING([--disable-udev],[disable udev support]),[], enable_udev=yes)
+
+dnl Try to use pkg-config for devmapper, but fallback to old detection
 saved_LIBS=$LIBS
-AC_CHECK_LIB(devmapper, dm_task_set_name,,[AC_MSG_ERROR('You need the device-mapper library')])
-DEVMAPPER_LIBS=$LIBS
+if AC_RUN_LOG([pkg-config --exists --print-errors devmapper]); then
+       PKG_PROG_PKG_CONFIG
+       if test x$enable_static = xyes; then
+               PKG_CONFIG="$PKG_CONFIG --static"
+       fi
+       PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.03])
+       LIBS="$LIBS $DEVMAPPER_LIBS"
+else
+       AC_CHECK_LIB(devmapper, dm_task_set_name,,
+               [AC_MSG_ERROR('You need the device-mapper library')])
+       AC_CHECK_LIB(devmapper, dm_task_set_message,,
+               [AC_MSG_ERROR([The device-mapper library on your system is too old.])])
+       DEVMAPPER_LIBS=$LIBS
+fi
+
+AC_CHECK_DECLS([DM_UDEV_DISABLE_DISK_RULES_FLAG], [have_cookie=yes], [have_cookie=no], [#include <libdevmapper.h>])
+if test "x$enable_udev" = xyes; then
+       if test "x$have_cookie" = xno; then
+               AC_MSG_WARN([The device-mapper library on your system has no udev support, udev support disabled.])
+       else
+               AC_DEFINE(USE_UDEV, 1, [Try to use udev synchronisation?])
+       fi
+fi
+
 LIBS=$saved_LIBS
 if test "x$enable_selinux" != xno; then
        AC_CHECK_LIB(sepol, sepol_bool_set)
@@ -89,20 +119,13 @@ if test "x$enable_selinux" != xno; then
        fi
 fi
 
-if test x$enable_static = xyes; then
-       saved_LIBS2=$LIBS
-       LIBS="$LIBS -static"
-       # Check if it there is still not some missing dependency like static selinux libs
-       AC_SEARCH_LIBS([dm_set_selinux_context], [devmapper],,
-               [AC_MSG_ERROR([Your system requires SElinux libraries for static compilation.])])
-       LIBS=$saved_LIBS2
-fi
-
 LIBS=$saved_LIBS
 
 DEVMAPPER_LIBS="$DEVMAPPER_LIBS $LIB_PTHREAD"
-AC_SUBST(DEVMAPPER_LIBS)
-AC_SUBST(SELINUX_STATIC_LIBS)
+AC_SUBST([DEVMAPPER_LIBS])
+AC_SUBST([SELINUX_STATIC_LIBS])
+AC_SUBST([LIBCRYPTSETUP_VERSION])
+AC_SUBST([LIBCRYPTSETUP_VERSION_INFO])
 
 dnl ==========================================================================
 AC_DEFUN([CS_DEFINE],