|
|
@ -1,13 +1,16 @@ |
|
|
|
diff --git a/lib/replace/wscript b/lib/replace/wscript
|
|
|
|
index fd00a42..337d559 100644
|
|
|
|
--- a/lib/replace/wscript
|
|
|
|
+++ b/lib/replace/wscript
|
|
|
|
@@ -340,22 +340,13 @@ def configure(conf):
|
|
|
|
@@ -416,22 +416,13 @@
|
|
|
|
|
|
|
|
conf.CHECK_FUNCS('prctl dirname basename') |
|
|
|
|
|
|
|
- strlcpy_in_bsd = False
|
|
|
|
-
|
|
|
|
+ # Not checking for libbsd
|
|
|
|
+ conf.CHECK_FUNCS('strlcpy strlcat')
|
|
|
|
+ conf.CHECK_FUNCS('getpeereid')
|
|
|
|
+ conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h')
|
|
|
|
+ conf.CHECK_FUNCS('setproctitle_init')
|
|
|
|
|
|
|
|
- # libbsd on some platforms provides strlcpy and strlcat
|
|
|
|
- if not conf.CHECK_FUNCS('strlcpy strlcat'):
|
|
|
|
- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
|
|
|
@ -22,17 +25,11 @@ index fd00a42..337d559 100644 |
|
|
|
-
|
|
|
|
- if not conf.CHECK_FUNCS('closefrom'):
|
|
|
|
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
|
|
|
|
+ # Not checking for libbsd
|
|
|
|
+ conf.CHECK_FUNCS('strlcpy strlcat')
|
|
|
|
+ conf.CHECK_FUNCS('getpeereid')
|
|
|
|
+ conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h')
|
|
|
|
+ conf.CHECK_FUNCS('setproctitle_init')
|
|
|
|
+
|
|
|
|
+ conf.CHECK_FUNCS('closefrom')
|
|
|
|
|
|
|
|
conf.CHECK_CODE(''' |
|
|
|
struct ucred cred; |
|
|
|
@@ -698,9 +689,6 @@ def configure(conf):
|
|
|
|
@@ -808,9 +799,6 @@
|
|
|
|
|
|
|
|
# look for a method of finding the list of network interfaces |
|
|
|
for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: |
|
|
@ -42,8 +39,8 @@ index fd00a42..337d559 100644 |
|
|
|
if conf.CHECK_CODE(''' |
|
|
|
#define %s 1 |
|
|
|
#define NO_CONFIG_H 1 |
|
|
|
@@ -713,7 +701,7 @@ def configure(conf):
|
|
|
|
#include "test/getifaddrs.c" |
|
|
|
@@ -823,7 +811,7 @@
|
|
|
|
#include "tests/getifaddrs.c" |
|
|
|
''' % method, |
|
|
|
method, |
|
|
|
- lib='nsl socket' + bsd_for_strlcpy,
|
|
|
@ -51,11 +48,11 @@ index fd00a42..337d559 100644 |
|
|
|
addmain=False, |
|
|
|
execute=True): |
|
|
|
break |
|
|
|
@@ -761,7 +749,6 @@ def build(bld):
|
|
|
|
@@ -871,7 +859,6 @@
|
|
|
|
break |
|
|
|
|
|
|
|
extra_libs = '' |
|
|
|
- if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd'
|
|
|
|
if bld.CONFIG_SET('HAVE_LIBRT'): extra_libs += ' rt' |
|
|
|
if bld.CONFIG_SET('REPLACE_REQUIRES_LIBSOCKET_LIBNSL'): extra_libs += ' socket nsl' |
|
|
|
|
|
|
|
bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC', |
|
|
|
REPLACE_HOSTCC_SOURCE, |