Merge pull request #11353 from kvuorine/fwknop-fixes
[feed/packages.git] / net / samba4 / patches / 104-samba-4.12-unbundle-icu.patch
1 --- a/lib/util/charset/wscript_configure 2020-06-14
2 +++ b/lib/util/charset/wscript_configure 2020-06-14
3 @@ -37,15 +37,15 @@ conf.CHECK_CODE('''
4 lib='iconv',
5 headers='errno.h iconv.h')
6
7 -if conf.CHECK_CFG(package='icu-i18n',
8 - args='--cflags --libs',
9 - msg='Checking for icu-i18n',
10 - uselib_store='ICU_I18N'):
11 - for lib in conf.env['LIB_ICU_I18N']:
12 - conf.CHECK_LIB(lib, shlib=True, mandatory=True)
13 - conf.env['icu-libs'] = ' '.join(conf.env['LIB_ICU_I18N'])
14 - if not conf.CHECK_HEADERS('unicode/ustring.h'):
15 - conf.fatal('Found libicu, but unicode/ustring.h is missing')
16 - conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
17 -else:
18 - conf.env['icu-libs'] = ''
19 +# if conf.CHECK_CFG(package='icu-i18n',
20 + # args='--cflags --libs',
21 + # msg='Checking for icu-i18n',
22 + # uselib_store='ICU_I18N'):
23 + # for lib in conf.env['LIB_ICU_I18N']:
24 + # conf.CHECK_LIB(lib, shlib=True, mandatory=True)
25 + # conf.env['icu-libs'] = ' '.join(conf.env['LIB_ICU_I18N'])
26 + # if not conf.CHECK_HEADERS('unicode/ustring.h'):
27 + # conf.fatal('Found libicu, but unicode/ustring.h is missing')
28 + # conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
29 +# else:
30 +conf.env['icu-libs'] = ''