From a83f491810d34cc8b6eb4b0f40bbbb1440e0f84d Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Thu, 12 Dec 2013 22:12:07 +0100 Subject: 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 Reviewed-by: Andrew Bartlett --- lib/replace/wscript | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/replace') 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= 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') -- cgit