Fix detection of TDE include directory

This resolves remaining part of Bug 1159

acinclude.m4

@@ -2210,6 +2210,7 @@ AC_DEFUN([AC_SS_FIND_KDE_INCLUDE_DIR],
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/tde /usr/local/include/tde /include/tde /usr/X11R6/include/tde /usr/build/kde/include"
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/tde2 /usr/local/include/tde2 /include/tde2 /usr/X11R6/include/tde2 /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/tde-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

@@ -2237,6 +2237,7 @@ AC_DEFUN([AC_SS_FIND_KDE_INCLUDE_DIR],
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/tde /usr/local/include/tde /include/tde /usr/X11R6/include/tde /usr/build/kde/include"
 		ss_kde_include_test_dirs="$ss_kde_include_test_dirs /usr/include/tde2 /usr/local/include/tde2 /include/tde2 /usr/X11R6/include/tde2 /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/tde-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

@@ -104,7 +104,7 @@ AC_SS_FIND_QT
 AC_SS_HEADER([Checking KDE])
 
 SS_KDE_GENERAL_FILE_TO_SEARCH="bin/tde-config"
-SS_KDE_INCLUDE_FILE_TO_SEARCH="tde-config"
+SS_KDE_INCLUDE_FILE_TO_SEARCH="tdeversion.h"
 
 AC_SS_FIND_KDE