lib/replace/wscript: inline LIBREPLACE_EXT into 'replace' as the autoconf system...

metze

diff --git a/lib/replace/wscript b/lib/replace/wscript
index ca0c88e401b2cc468b7c15dec3ae61a11d875ea9..6a5e2abf8cbd1f8f087947843cb706252c53b5fd 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -317,7 +317,7 @@ def build(bld):
     REPLACE_SOURCE = REPLACE_HOSTCC_SOURCE
 
     if bld.CONFIG_SET('REPLACE_GETPASS'):        REPLACE_SOURCE += ' getpass.c'
-
+    if not bld.CONFIG_SET('HAVE_CRYPT'):         REPLACE_SOURCE += ' crypt.c'
     if not bld.CONFIG_SET('HAVE_DLOPEN'):        REPLACE_SOURCE += ' dlfcn.c'
 
     if not bld.CONFIG_SET('HAVE_SOCKETPAIR'):    REPLACE_SOURCE += ' socketpair.c'
@@ -332,7 +332,7 @@ def build(bld):
     bld.SAMBA_LIBRARY('replace',
                       source=REPLACE_SOURCE,
                       group='base_libraries',
-                      deps='dl nsl socket')
+                      deps='crypt dl nsl socket')
 
     TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c
                       test/os2_delete.c test/getifaddrs.c'''
@@ -343,13 +343,6 @@ def build(bld):
                      deps='replace',
                      install=False)
 
-    CRYPT_SOURCES = []
-    if not 'HAVE_CRYPT' in bld.env: CRYPT_SOURCES.append('crypt.c')
-
-    bld.SAMBA_SUBSYSTEM('LIBREPLACE_EXT',
-                        CRYPT_SOURCES,
-                        group='base_libraries')
-
     # build replacements for stdint.h and stdbool.h if needed
     bld.SAMBA_GENERATOR('replace_stdint_h',
                         rule='cp ${SRC} ${TGT}',

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 769fa50cd6a344cd2d43ba2f3af761360ad16258..90c527b2eb8ae9949a9f8eae94a21acbc572ec57 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,13 +10,13 @@ bld.SAMBA_SUBSYSTEM('LIBWINBIND-CLIENT',
 bld.SAMBA_BINARY('nsstest',
        source='nsstest.c',
        installdir='BINDIR',
-       deps='LIBSAMBA-UTIL LIBREPLACE_EXT LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
+       deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
        )
 
 
 bld.SAMBA_BINARY('wbinfo',
        source='wbinfo.c',
        installdir='BINDIR',
-       deps='LIBSAMBA-UTIL LIBREPLACE_EXT LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
+       deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
        )
 

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 1ce42e80b4ea3f9b3690adf828a17d647200bf1a..03a812f577d067d28d473ca4cd282c60c2403fe8 100644 (file)
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -42,7 +42,7 @@ bld.SAMBA_MODULE('auth_unix',
        source='auth_unix.c',
        subsystem='auth',
        init_function='auth_unix_init',
-       deps='crypt pam PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET'
+       deps='pam PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET'
        )
 
 

diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 71605dff4b10a73a817953bbd515f7339648a50f..1308829801b679073e8ed11318fb3fad872c6571 100644 (file)
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
        source='loadparm.c generic.c util.c',
        pc_files='samba-hostconfig.pc',
        vnum='0.0.1',
-       deps='DYNCONFIG LIBREPLACE_EXT CHARSET',
+       deps='DYNCONFIG CHARSET',
        public_deps='LIBSAMBA-UTIL',
        public_headers='param.h'
        )