summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-30 16:52:08 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:18 +1000
commit20a8574717aef8f946ac9d8f3284e7318eeb9bf8 (patch)
treeda8eb809f200f5974114996f4a2f48768e91f659
parent0a6a808113a2417306f99080708fbc160856ed7e (diff)
downloadsamba-20a8574717aef8f946ac9d8f3284e7318eeb9bf8.tar.gz
samba-20a8574717aef8f946ac9d8f3284e7318eeb9bf8.tar.bz2
samba-20a8574717aef8f946ac9d8f3284e7318eeb9bf8.zip
s4-waf: look in libintl for dgettext()
-rw-r--r--source4/heimdal_build/wscript_build2
-rw-r--r--source4/heimdal_build/wscript_configure2
-rw-r--r--source4/wscript_build1
3 files changed, 3 insertions, 2 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index e3aeae9f2c..c70e719e43 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -309,7 +309,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5',
heimdal_autoproto='../heimdal/lib/krb5/krb5-protos.h',
heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o',
heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h',
- deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBNETIF LIBSAMBA-HOSTCONFIG INTL'
+ deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBNETIF LIBSAMBA-HOSTCONFIG intl'
)
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 8d39561e77..1f0811969b 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -25,6 +25,8 @@ conf.CHECK_FUNCS_IN('''getnameinfo sendmsg socket getipnodebyname gethostent get
'socket nsl',
checklibc=True)
+conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
+
conf.CHECK_FUNCS('iruserok')
conf.CHECK_FUNCS('bswap16')
diff --git a/source4/wscript_build b/source4/wscript_build
index 569f2e40a5..a8b0375d2f 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -21,7 +21,6 @@ bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC')
bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt')
# missing subsystems - need looking at
-bld.SAMBA_SUBSYSTEM('INTL', '') # external gettext library
bld.SAMBA_SUBSYSTEM('NETAPI', '') # for external libnet
bld.SAMBA_SUBSYSTEM('OPENPTY', '') # external openpty library
bld.SAMBA_SUBSYSTEM('SMBCLIENT', '') # for external libsmbclient