Branch: master

897752b6 2015-09-07 12:51:19 Timothy Pearson
Fix FTBFS when cryptsetup support disabled
M config.h.cmake
M tdecore/tdehw/tdestoragedevice.cpp
diff --git a/config.h.cmake b/config.h.cmake
index 145fa2c..0e0e4a6 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 cdf004f..618a29c 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -97,6 +97,7 @@
 }
 
 void TDEStorageDevice::internalGetLUKSKeySlotStatus() {
+#if defined(WITH_CRYPTSETUP)
 	unsigned int i;
 	crypt_keyslot_info keyslot_status;
 	TDELUKSKeySlotStatus::TDELUKSKeySlotStatus tde_keyslot_status;
@@ -116,6 +117,7 @@
 		}
 		m_cryptKeyslotStatus.append(tde_keyslot_status);
 	}
+#endif
 }
 
 void TDEStorageDevice::internalInitializeLUKSIfNeeded() {