Fix detection of TDE include directory

This resolves remaining part of Bug 1159
(cherry picked from commit 1791f4e576)

acinclude.m4

@@ -2201,6 +2201,7 @@ AC_DEFUN([AC_SS_FIND_KDE_INCLUDE_DIR],
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde /usr/local/include/kde /include/kde /usr/X11R6/include/kde /usr/build/kde/include"
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde2 /usr/local/include/kde2 /include/kde2 /usr/X11R6/include/kde2 /usr/include/X11/kde2"
 		test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="$SS_KDE_GENERAL_DIR/include $ss_kde_include_test_dirs"
+		test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="`$SS_KDE_GENERAL_DIR/bin/kde-config --expandvars --install include` $ss_kde_include_test_dirs"
 
 		AC_SS_FIND_FILE_PATH($SS_KDE_INCLUDE_FILE_TO_SEARCH,$ss_kde_include_test_dirs,SS_KDE_INCDIR)
 

admin/acinclude.m4.in

@@ -2201,6 +2201,7 @@ AC_DEFUN([AC_SS_FIND_KDE_INCLUDE_DIR],
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde /usr/local/include/kde /include/kde /usr/X11R6/include/kde /usr/build/kde/include"
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/kde2 /usr/local/include/kde2 /include/kde2 /usr/X11R6/include/kde2 /usr/include/X11/kde2"
 		test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="$SS_KDE_GENERAL_DIR/include $ss_kde_include_test_dirs"
+		test -n "$SS_KDE_GENERAL_DIR" && ss_kde_include_test_dirs="`$SS_KDE_GENERAL_DIR/bin/kde-config --expandvars --install include` $ss_kde_include_test_dirs"
 
 		AC_SS_FIND_FILE_PATH($SS_KDE_INCLUDE_FILE_TO_SEARCH,$ss_kde_include_test_dirs,SS_KDE_INCDIR)
 

configure.in

@@ -101,7 +101,7 @@ AC_SS_FIND_QT
 AC_SS_HEADER([Checking KDE])
 
 SS_KDE_GENERAL_FILE_TO_SEARCH="bin/kde-config"
-SS_KDE_INCLUDE_FILE_TO_SEARCH="kde-config"
+SS_KDE_INCLUDE_FILE_TO_SEARCH="kdeversion.h"
 
 AC_SS_FIND_KDE