diff options
author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-16 20:35:32 +0000 |
---|---|---|
committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-16 20:35:32 +0000 |
commit | 3c5f08fc03c92d8f06fc8eaf06f50b4a94262c8d (patch) | |
tree | ebf9a8a1437c77865357aae6afdac95eb70dd57c | |
parent | c66fb6fbdadddf18d80127fc600f605c27207af9 (diff) | |
download | tdebase-3c5f08fc03c92d8f06fc8eaf06f50b4a94262c8d.tar.gz tdebase-3c5f08fc03c92d8f06fc8eaf06f50b4a94262c8d.zip |
[kdebase/kdm] added XDMCP support
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1225083 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | config.h.cmake | 3 | ||||
-rw-r--r-- | kdm/ConfigureChecks.cmake | 11 |
3 files changed, 15 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b8a02b99..c4609394d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,7 @@ option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF ) option( WITH_PAM "kdm should use PAM" OFF ) option( WITH_SHADOW "kdm should use shadow passwords" OFF ) +option( WITH_XDMCP "xdmcp support for kdm" OFF ) option( WITH_XINERAMA "Enable xinerama extension support" OFF ) option( WITH_ARTS "Enable aRts support" OFF ) option( WITH_I8K "Enable Dell laptop support (ksysguard)" OFF ) diff --git a/config.h.cmake b/config.h.cmake index 7b3372f09..318d2eac3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -136,6 +136,9 @@ #define USESHADOW 1 #define HAVE_SHADOW 1 +#cmakedefine XDMCP 1 + + // ksmserver #cmakedefine DBUS_SYSTEM_BUS "@DBUS_SYSTEM_BUS@" diff --git a/kdm/ConfigureChecks.cmake b/kdm/ConfigureChecks.cmake index 2ac6dbd29..162a8a6ba 100644 --- a/kdm/ConfigureChecks.cmake +++ b/kdm/ConfigureChecks.cmake @@ -106,6 +106,17 @@ if( NOT XAU_FOUND ) endif() +# xdmcp +if( WITH_XDMCP ) + pkg_search_module( XDMCP xdmcp ) + if( XDMCP_FOUND ) + set( XDMCP 1 CACHE INTERNAL "" FORCE ) + else() + tde_message_fatal( "xdmcp is requested, but was not found on your system" ) + endif() +endif() + + if( WITH_PAM ) set( USE_PAM 1 CACHE INTERNAL "" FORCE ) |