summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2013-04-10 21:52:09 +0200
committerSlávek Banko <[email protected]>2013-04-10 21:55:04 +0200
commit1791f4e576ae9619cc34768b66155d3d5af3b1a0 (patch)
treef8c6250a52e0861f881c68526cc4644ab71b8f67
parent5a08fb9bbc782256dae8c9b08795a202352bf86a (diff)
downloadkvirc-1791f4e576ae9619cc34768b66155d3d5af3b1a0.tar.gz
kvirc-1791f4e576ae9619cc34768b66155d3d5af3b1a0.zip
Fix detection of TDE include directory
This resolves remaining part of Bug 1159
-rw-r--r--acinclude.m41
-rw-r--r--admin/acinclude.m4.in1
-rwxr-xr-xconfigure.in2
3 files changed, 3 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index d62babdb..ce65653a 100644
--- a/acinclude.m4
+++ b/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)
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index b0579c13..9b4102b6 100644
--- a/admin/acinclude.m4.in
+++ b/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)
diff --git a/configure.in b/configure.in
index d6f5010f..c19ccc8b 100755
--- a/configure.in
+++ b/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