replace/waf: fix libnsl checking on Solaris
authorBjörn Jacke <bj@sernet.de>
Thu, 7 Mar 2019 12:10:11 +0000 (13:10 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Nov 2020 06:53:42 +0000 (06:53 +0000)
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>
lib/replace/wscript

index 85bc11d2f01117cbe02405c448740f10bf4b1289..cb8b1db649f5df0609835e342a33977e644253b2 100644 (file)
@@ -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