summaryrefslogtreecommitdiffstats
path: root/kxsldbg
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-06-28 15:14:51 +0200
committergregory guy <gregory-tde@laposte.net>2021-03-11 15:04:14 +0100
commit4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 (patch)
treee532b01e8168b2f849f8aaa3266a58b088705726 /kxsldbg
parent10d21d001e92e653cec6b6d1c05983abd00a1195 (diff)
downloadtdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.tar.gz
tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.zip
Conversion to the cmake building system.
Delete empty files (dummy.cpp, xsldbgconfig.h). Remove hard-coded path for the kmdr-executor executable. Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander. Add man pages taken from the Debian packaging. Signed-off-by: gregory guy <gregory-tde@laposte.net> Fix linking - kxsldbgcommon-static and kimagemapeditorcommon-static needs to be embedded. Move the linking of xml and readline libraries to the appropriate static libraries. Add build option WITH_QUANTA_CVSSERVICE. Add a test whether the readline can be linked standalone or whether ncurses is needed. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kxsldbg')
-rw-r--r--kxsldbg/CMakeLists.txt84
-rw-r--r--kxsldbg/kxsldbg.h2
-rw-r--r--kxsldbg/kxsldbgpart/CMakeLists.txt109
-rw-r--r--kxsldbg/kxsldbgpart/Makefile.am3
-rw-r--r--kxsldbg/kxsldbgpart/dummy.cpp0
-rw-r--r--kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt34
-rw-r--r--kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt54
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/arraylist.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/callstack.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/cmds.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/debug.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/files.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/help.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp10
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/options.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/search.cpp7
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/search.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/utils.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h0
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h4
-rw-r--r--kxsldbg/xsldbgmain.cpp1
29 files changed, 372 insertions, 4 deletions
diff --git a/kxsldbg/CMakeLists.txt b/kxsldbg/CMakeLists.txt
new file mode 100644
index 00000000..c8d0a2da
--- /dev/null
+++ b/kxsldbg/CMakeLists.txt
@@ -0,0 +1,84 @@
+#add_subdirectory( data )
+add_subdirectory( kxsldbgpart )
+
+add_compile_options( ${ICU_CXXFLAGS} )
+
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${LIBXML_INCLUDE_DIRS}
+ ${LIBXSLT_INCLUDE_DIRS}
+ ${READLINE_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kxsldbg (executable)
+
+tde_add_executable( kxsldbg AUTOMOC
+
+ SOURCES
+ kxsldbg.cpp
+ main.cpp
+ kxsldbgif.skel
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdeparts-shared
+ tqtnotfier-static
+ kxsldbgcommon-static
+ xsldbg-static
+ ${READLINE_LIBRARIES}
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### xsldbg (executable)
+
+tde_add_executable( xsldbg AUTOMOC
+
+ SOURCES
+ xsldbgmain.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdeparts-shared
+ xsldbg-static
+ ${READLINE_LIBRARIES}
+
+ DEPENDENCIES
+ xsldbg-static
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( kxsldbg )
+
+
+##### other data
+
+install(
+ FILES kxsldbg_shell.rc
+ DESTINATION ${DATA_INSTALL_DIR}/kxsldbg
+)
+
+tde_create_translated_desktop(
+ SOURCE xsldbg.desktop
+ DESTINATION ${APPS_INSTALL_DIR}/.hidden
+)
+
+tde_create_translated_desktop( kxsldbg.desktop )
diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h
index a60805bd..1d3420ad 100644
--- a/kxsldbg/kxsldbg.h
+++ b/kxsldbg/kxsldbg.h
@@ -2,7 +2,7 @@
#define KXSLDBG_H
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <tdeapplication.h>
diff --git a/kxsldbg/kxsldbgpart/CMakeLists.txt b/kxsldbg/kxsldbgpart/CMakeLists.txt
new file mode 100644
index 00000000..b3776dde
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/CMakeLists.txt
@@ -0,0 +1,109 @@
+add_subdirectory( libtqtnotfier )
+add_subdirectory( libxsldbg )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${LIBXML_INCLUDE_DIRS}
+ ${LIBXSLT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+add_compile_options( ${ICU_CXXFLAGS} )
+
+
+##### kxsldbgcommon (static)
+
+tde_add_library( kxsldbgcommon STATIC_PIC AUTOMOC
+
+ SOURCES
+ kxsldbg_partif.skel
+ xsldbgwalkspeed.ui
+ xsldbgtemplates.ui
+ xsldbgsources.ui
+ xsldbgmsgdialog.ui
+ xsldbglocalvariables.ui
+ xsldbgglobalvariables.ui
+ xsldbgentities.ui
+ xsldbgconfig.ui
+ xsldbgcallstack.ui
+ xsldbgbreakpoints.ui
+ xsldbgwalkspeedimpl.cpp
+ xsldbgtemplatesimpl.cpp
+ xsldbgtemplatelistitem.cpp
+ xsldbgsourcesimpl.cpp
+ xsldbgoutputview.cpp
+ xsldbglocalvariablesimpl.cpp
+ xsldbglocallistitem.cpp
+ xsldbglistitem.cpp
+ xsldbginspector.cpp
+ xsldbgglobalvariablesimpl.cpp
+ xsldbggloballistitem.cpp
+ xsldbgentitiesimpl.cpp
+ xsldbgdoc.cpp
+ xsldbgdialogbase.cpp
+ xsldbgdebugger.cpp
+ xsldbgconfigimpl.cpp
+ xsldbgcallstackimpl.cpp
+ xsldbgbreakpointsimpl.cpp
+ xsldbgbreakpointlistitem.cpp
+ qxsldbgdoc.cpp
+ kxsldbg_part.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdeparts-shared
+ kjs-shared
+ xsldbg-static
+ tqtnotfier-static
+)
+
+
+##### libkxsldbgpart (kpart)
+
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
+
+tde_add_kpart( libkxsldbgpart AUTOMOC
+
+ SOURCES
+ dummy.cpp
+ EMBED
+ kxsldbgcommon-static
+ LINK
+ tdecore-shared
+ tdeui-shared
+ kjs-shared
+ tdeio-shared
+ tdeparts-shared
+ katepartinterfaces-shared
+ ${READLINE_LIBRARIES}
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE kxsldbg_part.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+ FILES kxsldbg_part.rc
+ DESTINATION ${DATA_INSTALL_DIR}/kxsldbgpart
+)
+
diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am
index d04553b4..2861ca20 100644
--- a/kxsldbg/kxsldbgpart/Makefile.am
+++ b/kxsldbg/kxsldbgpart/Makefile.am
@@ -8,6 +8,7 @@ noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbr
kde_module_LTLIBRARIES = libkxsldbgpart.la
+CLEANFILES = dummy.cpp
libkxsldbgpart_la_SOURCES = dummy.cpp
SUBDIRS = libtqtnotfier libxsldbg
@@ -29,3 +30,5 @@ partrc_DATA = kxsldbg_part.rc
KDE_ICON = AUTO
+dummy.cpp:
+ echo > dummy.cpp
diff --git a/kxsldbg/kxsldbgpart/dummy.cpp b/kxsldbg/kxsldbgpart/dummy.cpp
deleted file mode 100644
index e69de29b..00000000
--- a/kxsldbg/kxsldbgpart/dummy.cpp
+++ /dev/null
diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
new file mode 100644
index 00000000..ef507a7c
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt
@@ -0,0 +1,34 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${LIBXML_INCLUDE_DIRS}
+ ${LIBXSLT_INCLUDE_DIRS}
+ ${READLINE_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+add_compile_options( ${ICU_CXXFLAGS} )
+
+
+##### tqtnotfier (static)
+
+tde_add_library( tqtnotfier STATIC_PIC AUTOMOC
+
+ SOURCES
+ xsldbgthread.cpp
+ xsldbgnotifier.cpp
+ xsldbgevent.cpp
+ xsldbgdebuggerbase.cpp
+ qtnotifier2.cpp
+ LINK
+ ${LIBXSLT_LIBRARIES}
+ ${READLINE_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+)
diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp
index 29ff227e..d717a1f9 100644
--- a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp
+++ b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp
@@ -15,8 +15,10 @@
* *
***************************************************************************/
-
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#include <pthread.h> /* need to create/work with process thread */
#include <errno.h> /* need for EAGAIN */
#include <stdlib.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
new file mode 100644
index 00000000..056331ce
--- /dev/null
+++ b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt
@@ -0,0 +1,54 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${LIBXML_INCLUDE_DIRS}
+ ${LIBXSLT_INCLUDE_DIRS}
+ ${READLINE_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+add_compile_options( ${ICU_CXXFLAGS} )
+
+##### xsldbg (static)
+
+tde_add_library( xsldbg STATIC_PIC AUTOMOC
+
+ SOURCES
+ allmoc.cpp
+ xsldbgthread.cpp
+ xsldbg.cpp
+ xsldbgmsg.cpp
+ variable_cmds.cpp
+ utils.cpp
+ trace_cmds.cpp
+ template_cmds.cpp
+ search_cmds.cpp
+ search.cpp
+ param_cmds.cpp
+ os_cmds.cpp
+ options_unix.cpp
+ options.cpp
+ option_cmds.cpp
+ nodeview_cmds.cpp
+ help_unix.cpp
+ files_unix.cpp
+ files.cpp
+ file_cmds.cpp
+ debug.cpp
+ callstack.cpp
+ breakpoint_cmds.cpp
+ breakpoint.cpp
+ arraylist.cpp
+ debugXSL.cpp
+ LINK
+ ${LIBXSLT_LIBRARIES}
+ ${LIBEXSLT_LIBRARIES}
+ ${READLINE_LIBRARIES}
+)
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h b/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h
index 81398459..f6256429 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h
@@ -20,6 +20,10 @@
#ifndef ARRAYLIST_H
#define ARRAYLIST_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef USE_KDE_DOCS
/**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h
index fd410366..09002c9c 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h
@@ -21,6 +21,10 @@
#ifndef XSLBREAKPOINT_H
#define XSLBREAKPOINT_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef USE_KDE_DOCS
/**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/callstack.h b/kxsldbg/kxsldbgpart/libxsldbg/callstack.h
index fd87b9bd..60bf4652 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/callstack.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/callstack.h
@@ -20,6 +20,10 @@
#ifndef XSLCALLSTACK_H
#define XSLCALLSTACK_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/**
* Provide a call stack support
*
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h
index f12648c7..ff15bdc7 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h
@@ -20,6 +20,10 @@
#ifndef CMDS_H
#define CMDS_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/* See the top of debugXSL.c for a list of command names and thier shortcuts */
#ifndef USE_KDE_DOCS
typedef enum { /* id's for commands of xslDbgShell */
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debug.h b/kxsldbg/kxsldbgpart/libxsldbg/debug.h
index c38f37eb..f05c50e4 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/debug.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/debug.h
@@ -19,6 +19,10 @@
#ifndef XSL_DEBUG_H
#define XSL_DEBUG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h
index df50a53b..479448a3 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h
@@ -34,6 +34,10 @@
#ifndef __DEBUG_XSL__
#define __DEBUG_XSL__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef USE_XSLDBG_AS_THREAD
#include "xsldbgmsg.h"
#include "xsldbgthread.h"
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.h b/kxsldbg/kxsldbgpart/libxsldbg/files.h
index 05e49828..89557e28 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/files.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/files.h
@@ -19,6 +19,10 @@
#ifndef FILES_H
#define FILES_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef BUILD_DOCS
#include "search.h"
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help.h b/kxsldbg/kxsldbgpart/libxsldbg/help.h
index de77a71d..9c1c9a0a 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help.h
@@ -19,6 +19,10 @@
#ifndef XSLDBG_HELP_H
#define XSLDBG_HELP_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef USE_KDE_DOCS
/**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index 8593ab6b..0bcd8edb 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -20,6 +20,14 @@
* Uses docs/xsldoc.xsl docs/xsldoc.xml and xslproc to generate text
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef XSLDBG_BIN
+#define XSLDBG_BIN "xsldbg"
+#endif
+
#include "xsldbg.h"
#include "options.h"
#include "utils.h"
@@ -28,7 +36,7 @@
#include "files.h"
#include <stdlib.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <kstandarddirs.h>
/**
* helpTop:
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.h b/kxsldbg/kxsldbgpart/libxsldbg/options.h
index 60ab69d3..4ce99f42 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.h
@@ -19,6 +19,10 @@
#ifndef OPTIONS_H
#define OPTIONS_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "arraylist.h"
/**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h
index 6fd7a9f3..e8840234 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h
@@ -18,6 +18,10 @@
#ifndef TQTNOTIFIER_H
#define TQTNOTIFIER_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#if defined WIN32
#include <libxsldbg/xsldbgwin32config.h>
#endif
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
index 68fcd7e1..6d30193d 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
@@ -7,6 +7,13 @@
email : k_isdale@tpg.com.au
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef XSLDBG_BIN
+#define XSLDBG_BIN "xsldbg"
+#endif
#include "xsldbg.h"
#include "debugXSL.h"
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.h b/kxsldbg/kxsldbgpart/libxsldbg/search.h
index 20fc82b4..bc7d082c 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search.h
@@ -20,6 +20,10 @@
#ifndef XSLSEARCH_H
#define XSLSEARCH_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef USE_KDE_DOCS
/**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.h b/kxsldbg/kxsldbgpart/libxsldbg/utils.h
index 28b297b0..ada7b693 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/utils.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/utils.h
@@ -23,6 +23,10 @@
#ifndef XSLDBG_UTILS_H
#define XSLDBG_UTILS_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef BUILD_DOCS
#include <stdio.h>
#include <string.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
index 27250e31..dd9a067e 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
@@ -20,6 +20,10 @@
#ifndef XSLDEBUGGER_H
#define XSLDEBUGGER_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef USE_KDE_DOCS
/**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h
deleted file mode 100644
index e69de29b..00000000
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h
+++ /dev/null
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
index e75c8419..2b4486e3 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
@@ -21,6 +21,10 @@
#ifndef XSLDBGEVENT_H
#define XSLDBGEVENT_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#if defined WIN32
#include <libxsldbg/xsldbgwin32config.h>
#endif
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h
index 0e164f0e..81ced500 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h
@@ -19,6 +19,10 @@
#ifndef XSLDBGIO_H
#define XSLDBGIO_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef BUILD_DOCS
#include <libxml/tree.h> /* needed for definition of xmlChar */
#endif
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h
index 12b16a3c..9d953d87 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h
@@ -19,6 +19,10 @@
#ifndef XSLDBGMSG_H
#define XSLDBGMSG_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef WIN32
# include <libxsldbg/xsldbgwin32config.h>
#else
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
index d83e71f3..f0c4a56b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
@@ -19,6 +19,10 @@
#ifndef XSLDBGTHREAD_H
#define XSLDBGTHREAD_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#if defined WIN32
#include <libxsldbg/xsldbgwin32config.h>
#endif
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index fb9b619d..5e0b35ef 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -33,7 +33,6 @@
#include "kxsldbgpart/libxsldbg/xsldbg.h"
#include "kxsldbgpart/libxsldbg/options.h"
-#include <libxslt/xsltutils.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>