summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-09-07 12:51:19 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-09-07 12:51:19 -0500
commit897752b61a622dca67b10519e989d986f460ce14 (patch)
tree03a70d35517d2ee1c856ac924d75c34dfd00716f
parent9d5f5058a1e5e34b0f67c4a54a785975780119dd (diff)
downloadtdelibs-897752b6.tar.gz
tdelibs-897752b6.zip
Fix FTBFS when cryptsetup support disabled
-rw-r--r--config.h.cmake3
-rw-r--r--tdecore/tdehw/tdestoragedevice.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 145fa2c14..0e0e4a60d 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -130,6 +130,9 @@
/* Defines if lzma/xz is compiled */
#cmakedefine HAVE_XZ_SUPPORT 1
+/* Define OpenSC provider library */
+#cmakedefine OPENSC_PKCS11_PROVIDER_LIBRARY "@OPENSC_PKCS11_PROVIDER_LIBRARY@"
+
/* Defines if '[KDE4]' is added to KDE4 menu items */
#cmakedefine KDE4_MENU_SUFFIX 1
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index cdf004fb4..618a29c1b 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -97,6 +97,7 @@ TDEDiskDeviceType::TDEDiskDeviceType TDEStorageDevice::diskType() {
}
void TDEStorageDevice::internalGetLUKSKeySlotStatus() {
+#if defined(WITH_CRYPTSETUP)
unsigned int i;
crypt_keyslot_info keyslot_status;
TDELUKSKeySlotStatus::TDELUKSKeySlotStatus tde_keyslot_status;
@@ -116,6 +117,7 @@ void TDEStorageDevice::internalGetLUKSKeySlotStatus() {
}
m_cryptKeyslotStatus.append(tde_keyslot_status);
}
+#endif
}
void TDEStorageDevice::internalInitializeLUKSIfNeeded() {