sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

waf:lib/replace gettext configure checks

Browse Source 
Make sure we only try to work with gettext if we found
the prototypes and were able to link

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9911

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Fri Jan 17 19:30:33 CET 2014 on sn-devel-104
This commit is contained in:
Christian Ambach 2013-07-25 19:41:02 +02:00
parent 31db0c8acd
commit da891e2101
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/replace/wscript
View File

@ -407,6 +407,15 @@ removeea setea
# save for dependency definitions # save for dependency definitions
conf.env.intl_libs='iconv intl' conf.env.intl_libs='iconv intl'
# did we find both prototypes and a library to link against?
# if not, unset the detected values (see Bug #9911)
if not (conf.env['HAVE_GETTEXT'] and conf.env['HAVE_DECL_GETTEXT']):
conf.undefine('HAVE_GETTEXT')
conf.undefine('HAVE_DECL_GETTEXT')
if not (conf.env['HAVE_DGETTEXT'] and conf.env['HAVE_DECL_DGETTEXT']):
conf.undefine('HAVE_DGETTEXT')
conf.undefine('HAVE_DECL_DGETTEXT')
# did the user insist on gettext (--with-gettext)? # did the user insist on gettext (--with-gettext)?
if Options.options.gettext_location != 'None' and (not conf.env['HAVE_GETTEXT'] or not conf.env['HAVE_DGETTEXT']): if Options.options.gettext_location != 'None' and (not conf.env['HAVE_GETTEXT'] or not conf.env['HAVE_DGETTEXT']):
conf.fatal('library gettext not found at specified location') conf.fatal('library gettext not found at specified location')