summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-09-24 15:26:15 +0200
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-09-28 00:26:31 +0900
commit132786c1940e2e205a2263568186a142dc9f3d48 (patch)
tree4211cc414451535082d530e7fdbd9d7cecd996d9
parent3932891e3b88a707644551486dfdc6a2b5bae539 (diff)
downloadtdelibs-132786c1940e2e205a2263568186a142dc9f3d48.tar.gz
tdelibs-132786c1940e2e205a2263568186a142dc9f3d48.zip
Add definitions for X11_RGBFILE and XMLLINT in config.h
Signed-off-by: gregory guy <gregory-tde@laposte.net> (cherry picked from commit 2706c5674eb1ea3fffdca4d8c3edb3b25335e731)
-rw-r--r--CMakeLists.txt24
-rw-r--r--kdoctools/meinproc.cpp5
-rw-r--r--tdeui/kcolordialog.cpp6
3 files changed, 31 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04754eb00..1b673e2ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1164,6 +1164,30 @@ if( NOT WIN32 AND NOT ICEAUTH_PATH )
endif( NOT WIN32 AND NOT ICEAUTH_PATH )
+##### find the rgb.txt file
+
+message( STATUS "Looking for rgb.txt" )
+find_file( PATH_RGB rgb.txt
+ PATHS
+ /usr/share/X11
+ /usr/X11R6/lib/X11
+ /usr/openwin/lib/X11
+)
+if( PATH_RGB )
+ message( STATUS "Found rgb.txt file: ${PATH_RGB}" )
+ set( X11_RGBFILE "${PATH_RGB}" )
+endif()
+
+
+##### Look for xmllint
+
+find_program( XMLLINT_EXE xmllint )
+if( XMLLINT_EXE )
+ set( XMLLINT "${XMLLINT_EXE}" )
+ message( STATUS "Found xmllint: ${XMLLINT}" )
+endif()
+
+
##### write configure files #####################
configure_file( config.h.cmake config.h )
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index a63f1e185..1cf57660f 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -1,4 +1,7 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 458fb50a8..b37bcf42c 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -64,7 +64,10 @@
#include <config.h>
#include <kdebug.h>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#ifdef Q_WS_X11
#include <X11/Xlib.h>
@@ -626,9 +629,6 @@ static const char * const *namedColorFilePath( void )
#ifdef X11_RGBFILE
X11_RGBFILE,
#endif
- "/usr/share/X11/rgb.txt",
- "/usr/X11R6/lib/X11/rgb.txt",
- "/usr/openwin/lib/X11/rgb.txt", // for Solaris.
0
};
return path;