From 232fd8ba0aa9728a3cabd6372fc1ecaaa38d416e Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Thu, 1 Aug 2013 23:00:21 +0200 Subject: [PATCH] waf: replace dependency to libintl with samba_intl Signed-off-by: Christian Ambach Reviewed-by: Andrew Bartlett Autobuild-User(master): Christian Ambach Autobuild-Date(master): Mon Aug 12 00:46:34 CEST 2013 on sn-devel-104 (cherry picked from commit 20b64eae75b8809d67b8c2824616996bb4722612) The last 5 patches address bug #9911 - Build Samba 4.0.x on AIX with IBM XL C/C++. --- nsswitch/wscript_build | 2 +- source3/wscript_build | 2 +- source4/heimdal_build/wscript_build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build index a7d64898aa2..55ba776e5d7 100644 --- a/nsswitch/wscript_build +++ b/nsswitch/wscript_build @@ -81,7 +81,7 @@ elif (host_os.rfind('aix') > -1): if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): bld.SAMBA_LIBRARY('pamwinbind', source='pam_winbind.c', - deps='intl talloc wbclient winbind-client iniparser pam', + deps='talloc wbclient winbind-client iniparser pam samba_intl', cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR, realname='pam_winbind.so', install_path='${PAMMODULESDIR}' diff --git a/source3/wscript_build b/source3/wscript_build index 99971942975..924bde7b877 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1287,7 +1287,7 @@ bld.SAMBA3_BINARY('net', talloc netapi addns - intl + samba_intl popt_samba3 pdb libsmb diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index d9fc9e3af92..082b1d04131 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -670,7 +670,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_KRB5"): HEIMDAL_LIBRARY('krb5', KRB5_SOURCE, version_script='lib/krb5/version-script.map', includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include', - deps='roken wind asn1 hx509 hcrypto intl com_err HEIMDAL_CONFIG heimbase execinfo', + deps='roken wind asn1 hx509 hcrypto com_err HEIMDAL_CONFIG heimbase execinfo samba_intl', vnum='26.0.0', ) KRB5_PROTO_SOURCE = KRB5_SOURCE + ['lib/krb5/expand_path.c', 'lib/krb5/plugin.c', 'lib/krb5/context.c'] @@ -894,7 +894,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COM_ERR'): HEIMDAL_LIBRARY('com_err', 'lib/com_err/com_err.c lib/com_err/error.c', includes='../heimdal/lib/com_err', - deps='roken intl', + deps='roken samba_intl', vnum='0.25', version_script='lib/com_err/version-script.map', ) -- 2.11.4.GIT