From e37b834a62a45c890cf05f208ffc077a1cf10d16 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 11 Apr 2010 19:16:32 +0200 Subject: lib/replace/wscript: inline LIBREPLACE_GETPASS into 'replace' metze --- lib/replace/wscript | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index 9af1e57050..7dbf468d11 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -308,6 +308,8 @@ def build(bld): REPLACE_SOURCE = REPLACE_H_SOURCE + if bld.CONFIG_SET('REPLACE_GETPASS'): REPLACE_SOURCE += ' getpass.c' + if not bld.CONFIG_SET('HAVE_GETIFADDRS'): REPLACE_SOURCE += ' getifaddrs.c' if not bld.CONFIG_SET('HAVE_DLOPEN'): REPLACE_SOURCE += ' dlfcn.c' if not bld.CONFIG_SET('HAVE_SOCKETPAIR'): REPLACE_SOURCE += ' socketpair.c' @@ -316,7 +318,7 @@ def build(bld): bld.SAMBA_LIBRARY('replace', source=REPLACE_SOURCE, group='base_libraries', - deps='LIBREPLACE_GETPASS nsl socket') + deps='nsl socket') TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c test/os2_delete.c test/getifaddrs.c''' @@ -347,10 +349,6 @@ def build(bld): CRYPT_SOURCES, group='base_libraries') - bld.SAMBA_SUBSYSTEM('LIBREPLACE_GETPASS', 'getpass.c', - group='base_libraries', - enabled=bld.CONFIG_SET('REPLACE_GETPASS')) - # build replacements for stdint.h and stdbool.h if needed bld.SAMBA_GENERATOR('replace_stdint_h', rule='cp ${SRC} ${TGT}', -- cgit