From 3981399957a8f2d608adb33e9ced1c50bcb1f5dc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Oct 2010 14:52:25 +1100 Subject: s4-waf: removed the XATTR and SASL aliases these were hangovers from the old build system names Pair-Programmed-With: Andrew Bartlett --- lib/util/wscript_build | 2 +- source4/auth/gensec/wscript_build | 2 +- source4/wscript_build | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 91c85f0837..4e03e2df22 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -27,7 +27,7 @@ bld.SAMBA_SUBSYSTEM('UNIX_PRIVS', bld.SAMBA_SUBSYSTEM('WRAP_XATTR', source='wrap_xattr.c', - public_deps='XATTR', + public_deps='attr', deps='talloc', local_include=False ) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 4c8ced613b..a1c3257979 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -31,7 +31,7 @@ bld.SAMBA_MODULE('cyrus_sasl', source='cyrus_sasl.c', subsystem='gensec', init_function='gensec_sasl_init', - deps='CREDENTIALS SASL', + deps='CREDENTIALS sasl2', enabled=bld.CONFIG_SET('HAVE_SASL') ) diff --git a/source4/wscript_build b/source4/wscript_build index 4c2bc9c527..7fd6ee89b6 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -14,11 +14,6 @@ bld.SAMBA_MKVERSION('version.h') # bld.ENABLE_MAGIC_ORDERING() -# we don't always use consistent names for our subsystems. -# this sets up some aliases -bld.TARGET_ALIAS('attr', 'XATTR') -bld.TARGET_ALIAS('sasl2', 'SASL') - bld.RECURSE('../lib/replace') bld.RECURSE('../lib/talloc') bld.RECURSE('../lib/tdb') -- cgit