Enable shadow related build flags in config.h

diff --git a/config.h.cmake b/config.h.cmake
index cacb97c..6e27a27 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -174,8 +174,8 @@
 #cmakedefine USE_PAM 1
 #cmakedefine TDM_PAM_SERVICE "@TDM_PAM_SERVICE@"
 
-#define USESHADOW 1
-#define HAVE_SHADOW 1
+#cmakedefine USESHADOW "@USESHADOW@"
+#cmakedefine HAVE_SHADOW "@HAVE_SHADOW@"
 
 #cmakedefine XDMCP 1
 

Fix hardcoded link flag to "dl" library
Fix "dlopen" function detection

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6e35ca7..21ec420 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -14,6 +14,20 @@
 
 tde_setup_architecture_flags( )
 
+
+##### check for libdl ###########################
+
+set( DL_LIBRARIES dl )
+check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
+if( NOT HAVE_LIBDL )
+  unset( DL_LIBRARIES )
+  check_function_exists( dlopen HAVE_DLOPEN )
+  if( HAVE_DLOPEN )
+    set( HAVE_LIBDL 1 )
+  endif( HAVE_DLOPEN )
+endif( NOT HAVE_LIBDL )
+
+
 # termios.h (tdm, tdeioslave)
 if( BUILD_TDM OR BUILD_TDEIOSLAVES )
   check_include_file( termios.h HAVE_TERMIOS_H )
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 80ea9c2..743a345 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -97,7 +97,7 @@
   LINK
     kdesktopsettings-static bgnd-static dmctl-static
     konq-shared tdeutils-shared
-    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
+    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES}
     ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
 )
 
diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt
index 9473db2..68566de 100644
--- a/konsole/konsole/CMakeLists.txt
+++ b/konsole/konsole/CMakeLists.txt
@@ -74,5 +74,5 @@
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} dl
+  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${DL_LIBRARIES}
 )
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index 89e0ef3..e3149ca 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -30,6 +30,6 @@
     ../NSPluginCallbackIface.stub NSPluginClassIface.skel
     nsplugin.cpp viewer.cpp qxteventloop.cpp
     glibevents.cpp
-  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt dl
+  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt ${DL_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )

Fix kate externatools command syntax

diff --git a/kate/data/externaltools b/kate/data/externaltools
index 9057b73..3dceade 100644
--- a/kate/data/externaltools
+++ b/kate/data/externaltools
@@ -9,7 +9,7 @@
 [externaltool_CVSLogforCurrentDocument]
 acname=externaltool_CVSLogforCurrentDocument
 cmdname=cvs-log
-command=if grep %filename %directory/CVS/Entries 2>&1>/dev/null ; then\n  cd %directory && cervisia -log %filename\nelse\n  kdialog --title Error --msgbox "The file '%filename' is not in CVS."\nfi
+command=if grep %filename %directory/CVS/Entries 2>&1 >/dev/null ; then\n  cd %directory && cervisia -log %filename\nelse\n  kdialog --title Error --msgbox "The file '%filename' is not in CVS."\nfi
 executable=cervisia
 icon=cervisia
 mimetypes=

Fix FTBFS because missing include directory in tdeioslave_nfs

diff --git a/tdeioslave/nfs/CMakeLists.txt b/tdeioslave/nfs/CMakeLists.txt
index c6ccd04..b45824d 100644
--- a/tdeioslave/nfs/CMakeLists.txt
+++ b/tdeioslave/nfs/CMakeLists.txt
@@ -11,6 +11,7 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}

Fix FTBFS in tdeioslave_smtp because missing headers

diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc
index 43c15ec..00dff36 100644
--- a/tdeioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cc
@@ -30,6 +30,11 @@
 
 #include <config.h>
 
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <stdio.h>
+
 #ifdef HAVE_LIBSASL2
 extern "C" {
 #include <sasl/sasl.h>
@@ -71,12 +76,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <assert.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif

Fix FTBFS because missing header in twin utils

diff --git a/twin/utils.cpp b/twin/utils.cpp
index ddd5a33..e7e5c7d 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <netdb.h>
 
+#include <sys/socket.h>
+
 #ifndef KCMRULES
 
 #include <tqapplication.h>