[SCM] Resolv Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Fri Oct 24 08:24:12 MDT 2014


The branch, master has been updated
       via  7f4d7eb cmake: Do not remove libresolv from required libraries.
      from  8946b82 Add ChangeLog file.

http://gitweb.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7f4d7eb9595c0a9217019348abcaf1d7a3c9695e
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 24 15:35:19 2014 +0200

    cmake: Do not remove libresolv from required libraries.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ConfigureChecks.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6dbfc88..41bed3a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -51,6 +51,8 @@ check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(resolv.h HAVE_RESOLV_H)
 
 # FUNCTIONS
+set(CMAKE_REQUIRED_LIBRARIES)
+
 find_library(RESOLV_LIRBRARY resolv)
 
 if (RESOLV_LIRBRARY)
@@ -92,8 +94,6 @@ check_function_exists(__res_search HAVE___RES_SEARCH)
 check_function_exists(res_nsearch HAVE_RES_NSEARCH)
 check_function_exists(__res_nsearch HAVE___RES_NSEARCH)
 
-set(CMAKE_REQUIRED_LIBRARIES)
-
 if (UNIX)
     if (NOT LINUX)
         # libsocket (Solaris)


-- 
Resolv Wrapper Repository


More information about the samba-cvs mailing list