diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-17 18:10:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-18 02:14:50 +0200 |
| commit | e031e12d06c77e0a05ad0c30c21f3afea94764af (patch) | |
| tree | 0ff0fc4a899b33b2fe83f7c3a2c98b6f48a2f9a9 /tdm/kfrontend/kgreeter.cpp | |
| parent | 1389e296969df0acf7f393b698a3a0f1fb572026 (diff) | |
| download | tdebase-e031e12d06c77e0a05ad0c30c21f3afea94764af.tar.gz tdebase-e031e12d06c77e0a05ad0c30c21f3afea94764af.zip | |
Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdm/kfrontend/kgreeter.cpp')
| -rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 27905e61d..c5e5e37e7 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "kgreeter.h" #include "kconsole.h" #include "tdmconfig.h" @@ -35,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <dmctl.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <ksslcertificate.h> #include <tdehardwaredevices.h> #include <tdecryptographiccarddevice.h> @@ -247,7 +251,7 @@ KGreeter::~KGreeter() void KGreeter::cryptographicCardWatcherSetup() { cardLoginUser = TQString::null; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -861,7 +865,7 @@ KGreeter::verifySetUser( const TQString &user ) } void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifndef HAVE_KRB5 // Don't enable card-based logins if Kerberos integration was disabled return; @@ -945,7 +949,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { } void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB cardLoginUser = TQString::null; userView->setEnabled(false); verify->lockUserEntry(false); @@ -1338,7 +1342,7 @@ KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft ) } } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (cardLoginUser != TQString::null) { verify->setPasswordPrompt(i18n("PIN:")); } |