From 313b29098c0bb580dc02150bae5711c0f9d879d2 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 25 Oct 2015 13:30:59 +0100 Subject: [PATCH] build:wafsamba: dead code removal in gettext detection Since the --gettext-location command-line option has no effect, the misleading code is removed. The samba functions ADD_CFLAGS must also be used in the future Signed-off-by: Thomas Nagy Reviewed-by: Reviewed-by: --- buildtools/wafsamba/wscript | 3 --- lib/replace/wscript | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index aca444be4010..f3e019c0b73b 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -78,9 +78,6 @@ def set_options(opt): help='additional directory to search for libiconv', action='store', dest='iconv_open', default='/usr/local', 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='None') opt.add_option('--without-gettext', help=("Disable use of gettext"), action="store_true", dest='disable_gettext', default=False) diff --git a/lib/replace/wscript b/lib/replace/wscript index 0be52f7a431e..a1c2094a00b7 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -361,13 +361,6 @@ removeea setea # try to find libintl (if --without-gettext is not given) conf.env.intl_libs='' if not Options.options.disable_gettext: - # any extra path given to look at? - if not Options.options.gettext_location == 'None': - conf.env['CFLAGS'].extend(["-I%s" % Options.options.gettext_location]); - conf.env['LDFLAGS'].extend(["-L%s" % Options.options.gettext_location]); - else: - conf.env['CFLAGS'].extend(["-I/usr/local"]); - conf.env['LDFLAGS'].extend(["-L/usr/local"]); conf.CHECK_HEADERS('libintl.h') conf.CHECK_LIB('intl') conf.CHECK_DECLS('dgettext gettext bindtextdomain textdomain bind_textdomain_codeset', headers="libintl.h") @@ -407,10 +400,6 @@ removeea setea conf.undefine('HAVE_DGETTEXT') conf.undefine('HAVE_DECL_DGETTEXT') - # 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') PTHREAD_CFLAGS='error'