|
@ -0,0 +1,30 @@ |
|
|
|
|
|
--- a/lib/util/charset/wscript_configure 2020-06-14
|
|
|
|
|
|
+++ b/lib/util/charset/wscript_configure 2020-06-14
|
|
|
|
|
|
@@ -37,15 +37,15 @@ conf.CHECK_CODE('''
|
|
|
|
|
|
lib='iconv', |
|
|
|
|
|
headers='errno.h iconv.h') |
|
|
|
|
|
|
|
|
|
|
|
-if conf.CHECK_CFG(package='icu-i18n',
|
|
|
|
|
|
- args='--cflags --libs',
|
|
|
|
|
|
- msg='Checking for icu-i18n',
|
|
|
|
|
|
- uselib_store='ICU_I18N'):
|
|
|
|
|
|
- for lib in conf.env['LIB_ICU_I18N']:
|
|
|
|
|
|
- conf.CHECK_LIB(lib, shlib=True, mandatory=True)
|
|
|
|
|
|
- conf.env['icu-libs'] = ' '.join(conf.env['LIB_ICU_I18N'])
|
|
|
|
|
|
- if not conf.CHECK_HEADERS('unicode/ustring.h'):
|
|
|
|
|
|
- conf.fatal('Found libicu, but unicode/ustring.h is missing')
|
|
|
|
|
|
- conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
|
|
|
|
|
|
-else:
|
|
|
|
|
|
- conf.env['icu-libs'] = ''
|
|
|
|
|
|
+# if conf.CHECK_CFG(package='icu-i18n',
|
|
|
|
|
|
+ # args='--cflags --libs',
|
|
|
|
|
|
+ # msg='Checking for icu-i18n',
|
|
|
|
|
|
+ # uselib_store='ICU_I18N'):
|
|
|
|
|
|
+ # for lib in conf.env['LIB_ICU_I18N']:
|
|
|
|
|
|
+ # conf.CHECK_LIB(lib, shlib=True, mandatory=True)
|
|
|
|
|
|
+ # conf.env['icu-libs'] = ' '.join(conf.env['LIB_ICU_I18N'])
|
|
|
|
|
|
+ # if not conf.CHECK_HEADERS('unicode/ustring.h'):
|
|
|
|
|
|
+ # conf.fatal('Found libicu, but unicode/ustring.h is missing')
|
|
|
|
|
|
+ # conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
|
|
|
|
|
|
+# else:
|
|
|
|
|
|
+conf.env['icu-libs'] = ''
|