diff options
| author | Christian Ambach <ambi@samba.org> | 2013-08-01 22:28:05 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-08-20 10:52:15 +0200 |
| commit | 840044247b7ca4de61f3ea93210599c21be09f37 (patch) | |
| tree | 1bfe66406892b7f82d7ab1f8ecae1bea50a69f13 /source4 | |
| parent | 3b230734d198602657918ef7d257a21facbb0afd (diff) | |
| download | samba-840044247b7ca4de61f3ea93210599c21be09f37.tar.gz | |
waf: consolidate libintl related checks
consolidate the dealing with functions from libintl and the
handling of checking if libiconv is required or not
to a common place in lib/replace
also add a new samba_intl subsystem that has dependencies
on the appropriate set of libraries (libintl, libintl+libiconv or none)
that can be used as a general dependency by code that depends
on the internationalization libraries
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 07b3a048724a6b41282e1f673aea5ce2c1202a5e)
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/heimdal_build/wscript_configure | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 2bb465a1fd..bed63d67ba 100755 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -19,7 +19,7 @@ conf.CHECK_HEADERS('ifaddrs.h') conf.CHECK_HEADERS('''crypt.h errno.h inttypes.h netdb.h signal.h sys/bswap.h sys/file.h sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h sys/utsname.h time.h timezone.h ttyname.h netinet/in.h - netinet/in6.h netinet6/in6.h libintl.h''') + netinet/in6.h netinet6/in6.h''') conf.CHECK_HEADERS('curses.h term.h termcap.h', together=True) @@ -42,8 +42,6 @@ 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') |