summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-11 19:16:32 +0200
committerStefan Metzmacher <metze@samba.org>2010-04-12 08:39:44 +0200
commite37b834a62a45c890cf05f208ffc077a1cf10d16 (patch)
treef590bcab141580cc6f653d184edaf7551575a822
parenta9e4abaa6e72425017953f95e2f22cc4af6d7455 (diff)
downloadsamba-e37b834a62a45c890cf05f208ffc077a1cf10d16.tar.gz
samba-e37b834a62a45c890cf05f208ffc077a1cf10d16.tar.bz2
samba-e37b834a62a45c890cf05f208ffc077a1cf10d16.zip
lib/replace/wscript: inline LIBREPLACE_GETPASS into 'replace'
metze
-rw-r--r--lib/replace/wscript8
1 files 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}',