From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 16 Oct 2018 10:21:55 +0000 (+0200)
Subject: Keep macro values in config.h.cmake synchronized with Autotools
X-Git-Tag: dbus-1.13.8~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6978c1192c2ad7d0c447fd3a3233f334bf4e60d8;p=thirdparty%2Fdbus.git

Keep macro values in config.h.cmake synchronized with Autotools

Autotools sets the value of HAVE_xxx macros in config.h to 1 if
the corresponding value exists. This has not been used consistently
in config.h.cmake so far.

Bug: https://gitlab.freedesktop.org/dbus/dbus/issues/117
Reviewed-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index ab1deba7f..f12e29829 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -80,20 +80,20 @@
 #cmakedefine GLIB_VERSION_MAX_ALLOWED  @GLIB_VERSION_MAX_ALLOWED@
 
 // headers
-#cmakedefine HAVE_ALLOCA_H
-#cmakedefine HAVE_BYTESWAP_H
-#cmakedefine HAVE_CRT_EXTERNS_H
+#cmakedefine HAVE_ALLOCA_H 1
+#cmakedefine HAVE_BYTESWAP_H 1
+#cmakedefine HAVE_CRT_EXTERNS_H 1
 
 /* Define to 1 if you have dirent.h */
 #cmakedefine   HAVE_DIRENT_H 1
 
-#cmakedefine HAVE_DLFCN_H
+#cmakedefine HAVE_DLFCN_H 1
 
 /* Define to 1 if you have errno.h */
 #cmakedefine   HAVE_ERRNO_H 1
 
-#cmakedefine HAVE_EXECINFO_H
-#cmakedefine HAVE_EXPAT_H
+#cmakedefine HAVE_EXECINFO_H 1
+#cmakedefine HAVE_EXPAT_H 1
 
 /* Define to 1 if you have grp.h */
 #cmakedefine   HAVE_GRP_H 1
@@ -107,7 +107,7 @@
 /* Define to 1 if you have locale.h */
 #cmakedefine   HAVE_LOCALE_H 1
 
-#cmakedefine HAVE_MEMORY_H
+#cmakedefine HAVE_MEMORY_H 1
 
 /* Define to 1 if you have sys/poll.h */
 #cmakedefine    HAVE_POLL 1
@@ -118,19 +118,19 @@
 /* Define to 1 if you have stdint.h */
 #cmakedefine   HAVE_STDINT_H 1
 
-#cmakedefine HAVE_STDLIB_H
+#cmakedefine HAVE_STDLIB_H 1
 
 /* Define to 1 if you have stdio.h */
 #cmakedefine   HAVE_STDIO_H 1
 
-#cmakedefine HAVE_STRINGS_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYSLOG_H
-#cmakedefine HAVE_SYS_EVENTS_H
-#cmakedefine HAVE_SYS_INOTIFY_H
-#cmakedefine HAVE_SYS_PRCTL_H
-#cmakedefine HAVE_SYS_RESOURCE_H
-#cmakedefine HAVE_SYS_STAT_H
+#cmakedefine HAVE_STRINGS_H 1
+#cmakedefine HAVE_STRING_H 1
+#cmakedefine HAVE_SYSLOG_H 1
+#cmakedefine HAVE_SYS_EVENTS_H 1
+#cmakedefine HAVE_SYS_INOTIFY_H 1
+#cmakedefine HAVE_SYS_PRCTL_H 1
+#cmakedefine HAVE_SYS_RESOURCE_H 1
+#cmakedefine HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have sys/syslimits.h */
 #cmakedefine   HAVE_SYS_SYSLIMITS_H 1
@@ -138,9 +138,9 @@
 /* Define to 1 if you have sys/time.h */
 #cmakedefine    HAVE_SYS_TIME_H 1
 
-#cmakedefine HAVE_SYS_TYPES_H
+#cmakedefine HAVE_SYS_TYPES_H 1
 
-#cmakedefine HAVE_SYS_UIO_H
+#cmakedefine HAVE_SYS_UIO_H 1
 
 /* Define to 1 if you have sys/wait.h */
 #cmakedefine    HAVE_SYS_WAIT_H 1
@@ -152,7 +152,7 @@
 #cmakedefine   HAVE_UNISTD_H 1
 
 /* Define to 1 if you have ws2tcpip.h */
-#cmakedefine   HAVE_WS2TCPIP_H
+#cmakedefine   HAVE_WS2TCPIP_H 1
 
 // symbols
 /* Define to 1 if you have backtrace */
@@ -201,7 +201,7 @@
 #cmakedefine   HAVE_STRTOULL 1
 
 /* Define to 1 if you have pip2 */
-#cmakedefine   HAVE_PIPE2
+#cmakedefine   HAVE_PIPE2 1
 
 #cmakedefine HAVE_ACCEPT4 1
 #cmakedefine HAVE_DIRFD 1