summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-01-30 14:55:15 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-01-30 14:55:15 +0100
commit91a3d227a5c593f38c489e275fa949115a42e271 (patch)
treed7558e0c3eeccbf5065dc5574b5ad7077a299650
parent12a175c1962d3ba39a18d172ae01f80cc2167c33 (diff)
downloadtdebase-91a3d227.tar.gz
tdebase-91a3d227.zip
Prevent hard-coded "tde/" in #include ...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kdesktop/lock/CMakeLists.txt1
-rw-r--r--kdesktop/lock/lockdlg.cc2
-rw-r--r--tdm/kfrontend/CMakeLists.txt1
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
4 files changed, 4 insertions, 2 deletions
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index a0ec2f08..05e14e93 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_SOURCE_DIR}/kcheckpass
${TDE_INCLUDE_DIR}
+ ${TDE_INCLUDE_DIR}/tde
${TQT_INCLUDE_DIRS}
${KRB5_INCLUDE_DIRS}
)
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index d51536dc..d4b456a9 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -59,7 +59,7 @@
#include <fixx11h.h>
#ifdef HAVE_KRB5
-#include <tde/libtdeldap.h>
+#include <libtdeldap.h>
#endif
#ifndef AF_LOCAL
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index 87c1a43f..d150a32c 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_SOURCE_DIR}/kcontrol/background
${TDE_INCLUDE_DIR}
+ ${TDE_INCLUDE_DIR}/tde
${TQT_INCLUDE_DIRS}
${KRB5_INCLUDE_DIRS}
)
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 5da8bfc5..7f45ca19 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -100,7 +100,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <X11/Xlib.h>
#ifdef HAVE_KRB5
-#include <tde/libtdeldap.h>
+#include <libtdeldap.h>
#endif
#define FIFO_DIR "/tmp/tdesocket-global/tdm"