From 4a476fb93718e16effd65d5ba8db8236570edc58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 7 Oct 2014 00:11:31 +0200 Subject: [PATCH] Enable previously disabled build options in config.h (cherry picked from commit 223f0c75788822208fd74259969948658bc26e2c) --- config.h.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config.h.cmake b/config.h.cmake index e155819f9..ef0bbd5ec 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -383,7 +383,7 @@ #cmakedefine HAVE_MEMORY_H 1 /* Define if you want MIT-SHM support */ -#undef HAVE_MITSHM +#cmakedefine HAVE_MITSHM @HAVE_MITSHM@ /* Define if you have mkdtemp */ #cmakedefine HAVE_MKDTEMP 1 @@ -819,13 +819,13 @@ /* Define to the name of the environment variable that determines the dynamic library search path. */ -#undef LTDL_SHLIBPATH_VAR +#cmakedefine LTDL_SHLIBPATH_VAR "@LTDL_SHLIBPATH_VAR@" /* Define to the extension used for shared libraries, say, ".so". */ #undef LTDL_SHLIB_EXT /* Define to the system default library search path. */ -#undef LTDL_SYSSEARCHPATH +#cmakedefine LTDL_SYSSEARCHPATH "@LTDL_SYSSEARCHPATH@" /* Define to the sub-directory in which libtool stores uninstalled libraries. */ @@ -915,10 +915,10 @@ #endif /* where rgb.txt is in */ -#undef X11_RGBFILE +#cmakedefine X11_RGBFILE "@X11_RGBFILE@" /* Defines the executable of xmllint */ -#undef XMLLINT +#cmakedefine XMLLINT "@XMLLINT@" /* Defined if your system has XRandR support */ #cmakedefine XRANDR_SUPPORT 1 @@ -1177,10 +1177,10 @@ int snprintf(char *str, size_t n, char const *fmt, ...); #undef __KDE_HAVE_GCC_VISIBILITY /* path to su */ -#define __PATH_SU "@__PATH_SU@" +#cmakedefine __PATH_SU "@__PATH_SU@" /* path to sudo */ -#define __PATH_SUDO "@__PATH_SUDO@" +#cmakedefine __PATH_SUDO "@__PATH_SUDO@" #if defined(__SVR4) && !defined(__svr4__)