From e031e12d06c77e0a05ad0c30c21f3afea94764af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 17 May 2021 18:10:38 +0200 Subject: Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- tdm/kfrontend/kgapp.cpp | 6 +++--- tdm/kfrontend/kgapp.h | 2 +- tdm/kfrontend/kgreeter.cpp | 14 +++++++++----- tdm/kfrontend/kgverify.cpp | 8 ++++---- tdm/kfrontend/kgverify.h | 4 ++-- tdm/kfrontend/sakdlg.cpp | 8 ++++---- 6 files changed, 23 insertions(+), 19 deletions(-) (limited to 'tdm') diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index a48dcf93a..6c77b444b 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -124,14 +124,14 @@ void GreeterApp::init() startTimer( pingInterval * 60000 ); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif } void GreeterApp::deviceChanged(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifdef WITH_XRANDR if (device->type() == TDEGenericDeviceType::Monitor) { KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); @@ -139,7 +139,7 @@ void GreeterApp::deviceChanged(TDEGenericDevice* device) { delete randrsimple; } #endif // WITH_XRANDR -#endif // __TDE_HAVE_TDEHWLIB +#endif // WITH_TDEHWLIB } void diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h index c9e2802c1..4b6c65f6a 100644 --- a/tdm/kfrontend/kgapp.h +++ b/tdm/kfrontend/kgapp.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define KGAPP_H #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #else #define TDEGenericDevice void 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 +#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 -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -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:")); } diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index d3b0a71b8..44353087a 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmlabel.h" -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -100,7 +100,7 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , isClear(true) , inGreeterPlugin(false) , abortRequested(false) -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB , cardLoginInProgress(false) , cardLoginDevice(NULL) #endif @@ -329,7 +329,7 @@ KGVerify::start() return; } else -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (!cardLoginInProgress) #endif { @@ -672,7 +672,7 @@ KGVerify::handleVerify() greet->textPrompt(msg, echo, ndelay); inGreeterPlugin = !ndelay; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (cardLoginInProgress) { TQString autoPIN = cardLoginDevice->autoPIN(); if (autoPIN != TQString::null) { diff --git a/tdm/kfrontend/kgverify.h b/tdm/kfrontend/kgverify.h index b76cf55f1..7e3b7f89f 100644 --- a/tdm/kfrontend/kgverify.h +++ b/tdm/kfrontend/kgverify.h @@ -77,7 +77,7 @@ class TQPopupMenu; class TQTimer; class KPushButton; class KLibrary; -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB class TDECryptographicCardDevice; #endif @@ -184,7 +184,7 @@ class KGVerify : public TQObject, public KGreeterPluginHandler { static TQVariant getConf( void *ctx, const char *key, const TQVariant &dflt ); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB bool cardLoginInProgress; TDECryptographicCardDevice* cardLoginDevice; #endif diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp index 52bffc47e..a15012a17 100644 --- a/tdm/kfrontend/sakdlg.cpp +++ b/tdm/kfrontend/sakdlg.cpp @@ -10,7 +10,7 @@ #include -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include #include #include @@ -136,7 +136,7 @@ SAKDlg::SAKDlg(TQWidget *parent) connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); mSAKProcess->start(); -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); @@ -175,7 +175,7 @@ void SAKDlg::processInputPipeCommand(TQString command) { } void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TQString login_name = TQString::null; X509CertificatePtrList certList = cdevice->cardX509Certificates(); if (certList.count() > 0) { @@ -221,7 +221,7 @@ void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { } void SAKDlg::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB // #endif } -- cgit v1.2.1