cmake: Put defines in config.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 040aaee7bad7869f543c0a6a3f7ac788c41e8570..e370efd7c8d446b7befed45b035efed2e9af79fb 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -299,9 +299,6 @@ int main(void) {
 
     return strncmp(res->ai_canonname, \"0.0.0.0\", sizeof(\"0.0.0.0\")) != 0;
 }" HAVE_GETADDRINFO_SETS_CANONNAME_FOR_IPADDRESSES)
-if (HAVE_GETADDRINFO_SETS_CANONNAME_FOR_IPADDRESSES)
-    add_definitions(-DHAVE_GETADDRINFO_SETS_CANONNAME_FOR_IPADDRESSES)
-endif (HAVE_GETADDRINFO_SETS_CANONNAME_FOR_IPADDRESSES)
 
 # check whether getaddrinfo() returns EAI_SERVICE when the requested service is not available for the requested socket type.
 check_c_source_runs("#include <stddef.h>
@@ -324,9 +321,6 @@ int main(void) {
     rc = getaddrinfo(NULL, \"echo\", &hints, &res);
     return rc != EAI_SERVICE;
 }" HAVE_GETADDRINFO_USES_EAI_SERVICE)
-if (HAVE_GETADDRINFO_USES_EAI_SERVICE)
-    add_definitions(-DHAVE_GETADDRINFO_USES_EAI_SERVICE)
-endif (HAVE_GETADDRINFO_USES_EAI_SERVICE)
 
 # check for non-NULL gethostent()
 check_c_source_runs("#include <stddef.h>
@@ -338,8 +332,5 @@ int main(void) {
     endhostent();
     return hostent == NULL;
 }" HAVE_NONNULL_GETHOSTENT)
-if (HAVE_NONNULL_GETHOSTENT)
-    add_definitions(-DHAVE_NONNULL_GETHOSTENT)
-endif (HAVE_NONNULL_GETHOSTENT)
 
 set(NWRAP_REQUIRED_LIBRARIES ${_REQUIRED_LIBRARIES} CACHE INTERNAL "nss_wrapper required system libraries")

diff --git a/config.h.cmake b/config.h.cmake
index ddb3582a1c892dcdc3fd62a91e7b64d857af944b..15f6afc04f173cb11bfd47ab286a5db1ab0b2e1f 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -84,6 +84,9 @@
 #cmakedefine HAVE_BSD_SETGRENT 1
 #cmakedefine HAVE_LINUX_GETNAMEINFO 1
 #cmakedefine HAVE_LINUX_GETNAMEINFO_UNSIGNED 1
+#cmakedefine HAVE_GETADDRINFO_SETS_CANONNAME_FOR_IPADDRESSES 1
+#cmakedefine HAVE_GETADDRINFO_USES_EAI_SERVICE 1
+#cmakedefine HAVE_NONNULL_GETHOSTENT 1
 
 #cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1
 #cmakedefine HAVE_STRUCT_PASSWD_PW_CLASS 1