diff options
| author | Christian Ambach <ambi@samba.org> | 2013-08-01 22:28:05 +0200 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2013-08-09 22:46:57 +0200 |
| commit | 07b3a048724a6b41282e1f673aea5ce2c1202a5e (patch) | |
| tree | 74f0fc72835969aaf34bc2a732b71df5da0874d2 /source3 | |
| parent | a742e87b39bed97ac59f5ec8bff9bf3cedf8b68a (diff) | |
| download | samba-07b3a048724a6b41282e1f673aea5ce2c1202a5e.tar.gz samba-07b3a048724a6b41282e1f673aea5ce2c1202a5e.tar.bz2 samba-07b3a048724a6b41282e1f673aea5ce2c1202a5e.zip | |
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>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/wscript | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/wscript b/source3/wscript index 3c0145b5c9..271314d723 100644 --- a/source3/wscript +++ b/source3/wscript @@ -98,7 +98,6 @@ def configure(conf): conf.CHECK_FUNCS('memalign posix_memalign hstrerror') conf.CHECK_FUNCS('shmget') conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True) - conf.CHECK_FUNCS('gettext dgettext bindtextdomain textdomain bind_textdomain_codeset') #FIXME: for some reason this one still fails conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl') conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv') @@ -331,8 +330,8 @@ if (0) { conf.CHECK_FUNCS(''' _acl __acl atexit -bindtextdomain _chdir __chdir chflags chmod _close __close _closedir -__closedir crypt16 devnm dgettext dirfd + _chdir __chdir chflags chmod _close __close _closedir +__closedir crypt16 devnm dirfd DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl _facl __facl _fchdir __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync @@ -341,7 +340,7 @@ fsetxattr _fstat __fstat fsync futimens futimes __fxstat getauthuid getcwd _getcwd __getcwd getdents __getdents getdirentries getgrent getgrnam getgrouplist getgrset getmntent getpagesize -getpwanam getpwent_r getrlimit gettext +getpwanam getpwent_r getrlimit glob grantpt hstrerror initgroups innetgr llseek _llseek __llseek _lseek __lseek _lstat __lstat lutimes @@ -357,7 +356,7 @@ setmntent setpgid setpriv setsid setuidx shmget shm_open sigaction sigblock sigprocmask sigset _stat __stat statvfs strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname -__sys_llseek syslog _telldir __telldir textdomain timegm +__sys_llseek syslog _telldir __telldir timegm utimensat vsyslog _write __write __xstat ''') |