]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Restore empty string default for conf.env['icu-libs']
authorEarl Chew <earl_chew@yahoo.com>
Sat, 11 May 2024 02:46:28 +0000 (19:46 -0700)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 14 May 2024 14:44:06 +0000 (14:44 +0000)
The reworked ICU libraries configuration code used [] as
default for conf.env['icu-libs']. This breaks dependency analysis
in samba_deps.py because SAMBA_SUBSYSTEM() expects deps to be
a string.

Signed-off-by: Earl Chew <earl_chew@yahoo.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue May 14 14:44:06 UTC 2024 on atb-devel-224

lib/util/charset/wscript_configure

index c49b55a4fd4b7452005827c1b7bef4697b5d1b30..adae44eab5e40dbddba838b64df19f5af6d76d7a 100644 (file)
@@ -46,3 +46,5 @@ if conf.CHECK_CFG(package='icu-i18n icu-uc',
     if not conf.CHECK_HEADERS('unicode/ustring.h', lib='icui18n'):
         conf.fatal('Found icui18n, but unicode/ustring.h is missing')
     conf.DEFINE('HAVE_UTF8_NORMALISATION', 1)
+else:
+    conf.env['icu-libs'] = ''