diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-04-10 21:52:09 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-10 21:57:35 +0200 |
| commit | b126891257fbe1929ebe592091c48e3735b14ccb (patch) | |
| tree | b1c5d7558af5c91b1faf7ef2383c30b2c2ba8982 | |
| parent | c9d4375d2699568b85722c3f252af9c4c3800f12 (diff) | |
| download | kvirc-b126891257fbe1929ebe592091c48e3735b14ccb.tar.gz kvirc-b126891257fbe1929ebe592091c48e3735b14ccb.zip | |
Fix detection of TDE include directory
This resolves remaining part of Bug 1159
(cherry picked from commit 1791f4e576ae9619cc34768b66155d3d5af3b1a0)
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | admin/acinclude.m4.in | 1 | ||||
| -rwxr-xr-x | configure.in | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 306c0b7f..18157ed6 100644 --- a/acinclude.m4 +++ b/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) diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 0d7272c6..ae6bb147 100644 --- a/admin/acinclude.m4.in +++ b/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) diff --git a/configure.in b/configure.in index cf125676..b250f413 100755 --- a/configure.in +++ b/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 |