[patch] configure fix

pam_mount-2.8-configure-crypt-fix.patch (text/plain), 1.44 KB, created by Sander Sweers on 2011-04-11 19:38:37 UTC

From 0373cf86f65c5d338b53f0b2cb060252c398a73e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <[e-mail]>
Date: Fri, 21 Jan 2011 03:00:05 +0100
Subject: [PATCH 1/1] build: fix configure --without-crypt{o,setup}

References: http://sf.net/support/tracker.php?aid=3151599
Signed-off-by: Jan Engelhardt <[e-mail]>
---
 configure.ac      |    8 ++------
 doc/changelog.txt |    2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index f5e2af3..acfbee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,19 +61,15 @@ AM_CONDITIONAL([HAVE_VND], [test "x$ac_cv_header_dev_vndvar_h" = "xyes"])
 PKG_CHECK_MODULES([libHX], [libHX >= 3.6])
 PKG_CHECK_MODULES([libxml], [libxml-2.0 >= 2.6])
 
-with_crypto="yes";
 AC_ARG_WITH(
 	[crypto],
 	AS_HELP_STRING([--without-crypto], [Disable use of OpenSSL cryptography]),
-	[],
-	[with_crypto="no"]
+	[with_crypto="$withval"]
 )
 
-with_cryptsetup="yes";
 AC_ARG_WITH([cryptsetup],
 	AS_HELP_STRING([--without-cryptsetup], [Disable use of libcryptsetup]),
-	[],
-	[with_cryptsetup="no"]
+	[with_crypto="$withval"]
 )
 
 if test "x$with_crypto" = "xyes"; then
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 7a4b137..f9c4ce4 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,8 @@ For details, see the history as recorded in the git repository.
 
 HEAD
 ====
+Fixes:
+- build: fix configure --without-crypt{o,setup}
 
 
 v2.8 (2010-12-22)
-- 
1.7.0.1