From: Björn Jacke <bj@sernet.de>
Date: Thu, 7 Mar 2019 12:10:11 +0000 (+0100)
Subject: replace/waf: fix libnsl checking on Solaris
X-Git-Tag: talloc-2.3.2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e2cf7905e146a40f788899e4759691aac6c942;p=thirdparty%2Fsamba.git

replace/waf: fix libnsl checking on Solaris

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13343

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 85bc11d2f01..cb8b1db649f 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -94,7 +94,8 @@ def configure(conf):
     if not conf.CONFIG_SET('HAVE_RPC_RPC_H'):
             Logs.warn('No rpc/rpc.h header found, tirpc or libntirpc missing?')
 
-    conf.SET_TARGET_TYPE('nsl', 'EMPTY')
+    if not conf.CHECK_LIB('nsl'):
+        conf.SET_TARGET_TYPE('nsl', 'EMPTY')
     conf.CHECK_HEADERS('rpc/rpc.h rpcsvc/yp_prot.h', lib='tirpc')
     if not conf.CONFIG_SET('HAVE_RPCSVC_YP_PROT_H'):
         if conf.CHECK_CFG(package='libnsl', args='--cflags --libs',
@@ -102,8 +103,6 @@ def configure(conf):
                           uselib_store='NSL'):
             conf.SET_TARGET_TYPE('nsl', 'SYSLIB')
             conf.CHECK_HEADERS('rpc/rpc.h rpcsvc/yp_prot.h', lib='tirpc nsl')
-        else:
-            conf.SET_TARGET_TYPE('nsl', 'SYSLIB')
     conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h', lib='tirpc nsl')
 
     # This file is decprecated with glibc >= 2.30 so we need to check if it