diff options
| author | Christian Ambach <ambi@samba.org> | 2013-12-12 22:12:07 +0100 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2014-01-03 05:04:44 +0100 |
| commit | a83f491810d34cc8b6eb4b0f40bbbb1440e0f84d (patch) | |
| tree | 079f7af74959334d6903f716c71af6df143ae46c /lib/replace | |
| parent | df6ddcfbfcd33274c1b768ce26829b0ad9278cd0 (diff) | |
| download | samba-a83f491810d34cc8b6eb4b0f40bbbb1440e0f84d.tar.gz samba-a83f491810d34cc8b6eb4b0f40bbbb1440e0f84d.tar.xz samba-a83f491810d34cc8b6eb4b0f40bbbb1440e0f84d.zip | |
waf:lib/replace change detection of gettext
convert this to an automatic check: if no option is given, try to find gettext
and if found, use it
if user has specified --with-gettext, then bail out if it could not be found
in case of --without-gettext, skip all gettext related configure checks
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>
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/wscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index 6784dd3cb81..5f29e9fe7b0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -367,6 +367,7 @@ removeea setea headers='netinet/in.h arpa/nameser.h resolv.h') + # try to find libintl (if --without-gettext is not given) conf.env.intl_libs='' if not Options.options.disable_gettext: conf.CHECK_HEADERS('libintl.h') @@ -398,10 +399,10 @@ removeea setea if conf.env['HAVE_GETTEXT'] and conf.env['HAVE_DGETTEXT']: # save for dependency definitions conf.env.intl_libs='iconv intl' - else: - conf.fatal('library gettext not found, try specifying the path to ' + - 'it with --with-gettext=</path/to/gettext> or ' + - '--without-gettext to build without''') + + # 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']): + conf.fatal('library gettext not found at specified location') conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True, headers='pthread.h') |