diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index aa3d79b3..f5c9b159 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -3,17 +3,6 @@ include(CheckTypeSize) include(CheckSymbolExists) include(CheckLibraryExists) -find_program(some_x_program NAMES iceauth xrdb xterm) -if (NOT some_x_program) - set(some_x_program ${CMAKE_INSTALL_PREFIX}/bin/xrdb) - message("Warning: Could not determine X binary directory. Assuming ${CMAKE_INSTALL_PREFIX}/bin.") -endif (NOT some_x_program) -get_filename_component(proto_xbindir "${some_x_program}" PATH) -get_filename_component(xbindir "${proto_xbindir}" ABSOLUTE) -get_filename_component(xrootdir "${xbindir}" PATH) -set(XLIBDIR "${xrootdir}/lib/X11") -set(XKBDIR "${xrootdir}/share/X11") - check_function_exists(nice HAVE_NICE) check_include_files(malloc.h HAVE_MALLOC_H) kde4_bool_to_01(FONTCONFIG_FOUND HAVE_FONTCONFIG) # kcontrol/fonts diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake index 37da7f89..ca1656e7 100644 --- a/config-workspace.h.cmake +++ b/config-workspace.h.cmake @@ -12,17 +12,8 @@ /* KDE's configuration directory */ #define KDE_CONFDIR "${KDE4_CONFIG_INSTALL_DIR}" -/* KDE's static data directory */ -#define KDE_DATADIR "${KDE4_DATA_INSTALL_DIR}" - /* KDE's static libraries directory */ #define KDE_LIBDIR "${KDE4_LIB_INSTALL_DIR}" /* KDE's system configuration directory */ #define KDE_SYSCONFDIR "${KDE4_SYSCONF_INSTALL_DIR}" - -/* X libraries directory */ -#cmakedefine XLIBDIR "${XLIBDIR}" - -/* xkb resources directory */ -#cmakedefine XKBDIR "${XKBDIR}"