Add definitions for X11_RGBFILE and XMLLINT in config.h

Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit 2706c5674e)
r14.0.x
gregory guy 4 years ago committed by Michele Calgaro
parent 3932891e3b
commit 132786c194
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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 )

@ -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>

@ -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;

Loading…
Cancel
Save