diff options
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | kdesktop/lock/Makefile.am | 2 | ||||
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake index 9e59185a4..2d9927043 100644 --- a/kdesktop/ConfigureChecks.cmake +++ b/kdesktop/ConfigureChecks.cmake @@ -9,10 +9,8 @@ # ################################################# -# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "tdescreensaver"? - -if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) ) - set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" ) +if( WITH_PAM AND (NOT DEFINED TDESCREENSAVER_PAM_SERVICE) ) + set( TDESCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" ) endif( ) if( WITH_KDESKTOP_LOCK_BACKTRACE ) diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am index 5b6ccfd21..60a1531f5 100644 --- a/kdesktop/lock/Makefile.am +++ b/kdesktop/lock/Makefile.am @@ -18,7 +18,7 @@ lockprocess.o: ../kdesktopsettings.h ####### Build rules -PAM = @KSCREENSAVER_PAM_SERVICE@ +PAM = @TDESCREENSAVER_PAM_SERVICE@ install-data-local: -@test -n "$(DESTDIR)" || test -z "$(PAM)" || $(top_srcdir)/mkpamserv $(PAM) diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 252ade384..199cc95b7 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -565,7 +565,7 @@ void PasswordDlg::gplugStart() sprintf(fdbuf, "%d", sfd[1]); execlp("kcheckpass", "kcheckpass", #ifdef HAVE_PAM - "-c", KSCREENSAVER_PAM_SERVICE, + "-c", TDESCREENSAVER_PAM_SERVICE, #endif "-m", mPlugin->info->method, "-S", fdbuf, |