Fix static build on some systems and detect too old devmapper library.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@166 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/configure.in b/configure.in
index dc6c5a1..fc509c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,6 +73,8 @@ AC_ARG_ENABLE(selinux,
 
 saved_LIBS=$LIBS
 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
 LIBS=$saved_LIBS
 if test "x$enable_selinux" != xno; then

diff --git a/src/Makefile.am b/src/Makefile.am
index a61c59e..b4b9226 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ cryptsetup_SOURCES = \
 
 if STATIC_CRYPTSETUP
 _STATIC_FLAGS = -all-static
-_STATIC_LDADD = @LIBGCRYPT_LIBS@ @SELINUX_STATIC_LIBS@
+_STATIC_LDADD = @LIBGCRYPT_LIBS@ -lgpg-error @SELINUX_STATIC_LIBS@
 endif
 
 cryptsetup_LDADD = \