diff options
| author | Christian Ambach <ambi@samba.org> | 2013-12-12 22:12:07 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-03-10 16:10:37 +0100 |
| commit | 7a64fb0d415cc55bd483908c9d5b98bb581581c3 (patch) | |
| tree | cc0eaec930d71a1661ef8aa764000778059c09c4 /buildtools/wafsamba | |
| parent | 05f917c2ff33371cf02a3e8203e5d7018701218d (diff) | |
| download | samba-7a64fb0d415cc55bd483908c9d5b98bb581581c3.tar.gz | |
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>
(cherry picked from commit a83f491810d34cc8b6eb4b0f40bbbb1440e0f84d)
Diffstat (limited to 'buildtools/wafsamba')
| -rwxr-xr-x | buildtools/wafsamba/wscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index fe2e51507e7..79842278861 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -80,8 +80,7 @@ def set_options(opt): match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) opt.add_option('--with-gettext', help='additional directory to search for gettext', - action='store', dest='gettext_location', default='/usr/local', - match = ['Checking for library intl', 'Checking for header libintl.h']) + action='store', dest='gettext_location', default='None') opt.add_option('--without-gettext', help=("Disable use of gettext"), action="store_true", dest='disable_gettext', default=False) |