diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-18 15:18:46 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-18 15:18:46 +0000 |
| commit | 8937c60b6a65ba270439fee89d8fcc02877bcb30 (patch) | |
| tree | e4d3d9798ec573ba04d8e84bd5bf153f9362ee0c | |
| parent | 90fb8275c0d2e7765999680532ba8aa095addb66 (diff) | |
| download | tdebase-8937c60b.tar.gz tdebase-8937c60b.zip | |
[kdebase/kdebase] fixed pam support
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1221507 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | config.h.cmake | 5 | ||||
| -rw-r--r-- | kdesktop/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdesktop/ConfigureChecks.cmake | 16 |
3 files changed, 22 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index ba7520ccc..13d0cfb93 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -81,12 +81,15 @@ #cmakedefine HAVE_SYS_WAIT_H 1 #cmakedefine DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@" -// kdm, kcheckpass +// kdm, kcheckpass, kdesktop #cmakedefine HAVE_PAM 1 // kcheckpass #cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@" +// kdesktop +#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@" + // kdm #cmakedefine XBINDIR "@XBINDIR@" #define KDE_BINDIR "@TDE_BIN_DIR@" diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index 91bb06476..321c90c3c 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -9,6 +9,8 @@ # ################################################# +include( ConfigureChecks.cmake ) + add_subdirectory( lock ) add_subdirectory( pics ) add_subdirectory( patterns ) diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake new file mode 100644 index 000000000..da78021ff --- /dev/null +++ b/kdesktop/ConfigureChecks.cmake @@ -0,0 +1,16 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "kscreensaver"? + +if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) ) + set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" ) +endif( ) |