[SCM] Resolv Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed Aug 29 14:20:45 UTC 2018
The branch, master has been updated
via cc057f2 cmake: Fix function detection
from 6a50539 cmake: Do not misuse CMAKE_REQUIRED_LIBRARIES
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cc057f2da934b85b446fc7fbfd1ea438bf6c5b0c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Aug 29 08:28:10 2018 +0200
cmake: Fix function detection
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
ConfigureChecks.cmake | 5 +++++
1 file changed, 5 insertions(+)
Changeset truncated at 500 lines:
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index fec66d0..0990940 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -59,6 +59,9 @@ if (RESOLV_LIRBRARY)
if (RES_SEND_IN_LIBRESOLV OR __RES_SEND_IN_LIBRESOLV)
set(HAVE_LIBRESOLV TRUE)
endif()
+
+ # If we have a libresolv, we need to check functions linking the library
+ set(CMAKE_REQUIRED_LIBRARIES ${RESOLV_LIRBRARY})
endif()
check_function_exists(res_init HAVE_RES_INIT)
@@ -91,6 +94,8 @@ check_function_exists(__res_search HAVE___RES_SEARCH)
check_function_exists(res_nsearch HAVE_RES_NSEARCH)
check_function_exists(__res_nsearch HAVE___RES_NSEARCH)
+unset(CMAKE_REQUIRED_LIBRARIES)
+
check_symbol_exists(ns_name_compress "sys/types.h;arpa/nameser.h" HAVE_NS_NAME_COMPRESS)
if (UNIX)
--
Resolv Wrapper Repository
More information about the samba-cvs
mailing list