From aa85c8c854bbbb0ed8a421b9a812ad0a14dd7c83 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 15 Nov 2024 10:12:03 +0000
Subject: [PATCH] configure script doc additions for the ICU feature check.

FossilOrigin-Name: 1925a68fc2323f0788aac9c3c2bb3005182eb3286037bc383181b6aa150d4270
---
 auto.def      | 15 ++++++++++++---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/auto.def b/auto.def
index 611a786387..759cf07fe0 100644
--- a/auto.def
+++ b/auto.def
@@ -1129,13 +1129,22 @@ proj-if-opt-truthy math {
 #  --with-icu-config[=/path/to/icu-config]
 #  --enable-icu-collations
 #
-# If both icu-ldflags and icu-config are provided, they are
-# cumulative.  If neither are provided, icu-collations is not honored
-# and a warning is emitted if it is provided.
+# If --with-icu-config is provided but icu-config cannot be used fail
+# fatally. If --with-icu-ldflags/cflags is/are provided, assume they
+# are valid.
+#
+# If --with-icu-ldflags/cflags and --with-icu-config are provided,
+# they are cumulative.  If neither are provided, icu-collations is not
+# honored and a warning is emitted if it is provided.
 #
 # Design note: though we can automatically enable ICU if the
 # icu-config binary is found, we specifically do not. ICU is always an
 # opt-in feature.
+#
+# Maintenance reminder: check-in 09caa94c9e84 added pkg-config support
+# to this but the result fails to link on both Linux and OpenBSD
+# (other systems were untested) because the pkg-config results are
+# missing a required library.
 proc sqlite-check-icu {} {
   define LDFLAGS_ICU [join [opt-val with-icu-ldflags ""]]
   define CFLAGS_ICU [join [opt-val with-icu-cflags ""]]
diff --git a/manifest b/manifest
index 6154a16529..1ce6cea3c6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\sthe\shandling\sof\sthe\snew\s--dev\sflag\swhich\scaused\sit\sto\sset\sthe\s--debug\sflag\sinstead\sof\sthe\s--with-debug\sflag\s(the\sformer\sis\sfor\sautosetup's\sinternal\suse).
-D 2024-11-14T19:34:28.930
+C configure\sscript\sdoc\sadditions\sfor\sthe\sICU\sfeature\scheck.
+D 2024-11-15T10:12:03.805
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def d314af75944a40fdc466212d7f40e5056af843ace7f4025591d63fb942a26e27
+F auto.def dbbaf480acd0c5b9f330580aec6a43f50e5c37a69b1e5bb3f722c0620f617094
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f778dfdd6d6a4975c903d8ca0ebfb4fa917d543289136ea0ab740cb47d2510c1
-R 8f1a4b67fcbeb88fc42130b5848bb2cd
+P 81202d2ab5963fdcf20555b6d0b31cc955ac27f1cd87656faea5c0611c9a2ee8
+R f0c6d5bed8faeb01cfe709bf9d6cb9a1
 U stephan
-Z 1bce6ce0c64505db6d931db182e302d9
+Z 5ff845a37175f10e9a57fde007423669
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4f7ed134be..1bd2038e40 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81202d2ab5963fdcf20555b6d0b31cc955ac27f1cd87656faea5c0611c9a2ee8
+1925a68fc2323f0788aac9c3c2bb3005182eb3286037bc383181b6aa150d4270