Fix static build (--disable-static-cryptsetup now works properly).

http://code.google.com/p/cryptsetup/issues/detail?id=91

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

diff --git a/ChangeLog b/ChangeLog
index 7ce2b9d..9abf9ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-01-05  Milan Broz  <mbroz@redhat.com>
+       * Fix static build (--disable-static-cryptsetup now works properly).
+
 2010-12-30  Milan Broz  <mbroz@redhat.com>
        * Add compile time crypto backends implementation
          (gcrypt, OpenSSL, NSS and userspace Linux kernel crypto api).

diff --git a/configure.in b/configure.in
index 655db23..04b87b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -124,12 +124,13 @@ saved_LIBS=$LIBS
 
 AC_ARG_ENABLE([static-cryptsetup],
        AS_HELP_STRING([--enable-static-cryptsetup],
-       [enable build of static cryptsetup binary]), [
+       [enable build of static cryptsetup binary]))
+if test x$enable_static_cryptsetup = xyes; then
        if test x$enable_static = xno; then
                AC_MSG_WARN([Requested static cryptsetup build, enabling static library.])
                enable_static=yes
        fi
-       enable_static_cryptsetup=yes])
+fi
 AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
 
 AC_ARG_ENABLE(selinux,