Browse Source

Update references of kscreensaver->tdescreensaver.

pull/2/head
Darrell Anderson 9 years ago
parent
commit
0ba43923ad
  1. 4
      CMakeLists.txt
  2. 2
      ConfigureChecks.cmake
  3. 2
      config.h.cmake
  4. 2
      configure.in.in
  5. 6
      kdesktop/ConfigureChecks.cmake
  6. 2
      kdesktop/lock/Makefile.am
  7. 2
      kdesktop/lock/lockdlg.cc

4
CMakeLists.txt

@ -173,7 +173,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )
option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
option( BUILD_TDESCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} )
@ -252,7 +252,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )
tde_conditional_add_subdirectory( BUILD_TDESCREENSAVER tdescreensaver )
tde_conditional_add_subdirectory( BUILD_KSTART kstart )
tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )

2
ConfigureChecks.cmake

@ -169,7 +169,7 @@ endif( )
# GL
if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_TDESCREENSAVER )
check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
if( HAVE_GLXCHOOSEVISUAL )
set( GL_LIBRARY "GL" )

2
config.h.cmake

@ -123,7 +123,7 @@
#cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@"
// kdesktop
#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
#cmakedefine TDESCREENSAVER_PAM_SERVICE "@TDESCREENSAVER_PAM_SERVICE@"
#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
// tdm

2
configure.in.in

@ -7,7 +7,7 @@ KDE_PASSWDLIBS
DEF_PAM_SERVICE(tdm, tdm, TDM)
DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER)
DEF_PAM_SERVICE(kss, tdescreensaver, TDESCREENSAVER)
dnl Checks for header files.
AC_HEADER_DIRENT

6
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 )

2
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)

2
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,

Loading…
Cancel
Save