From: stephan <stephan@noemail.net>
Date: Fri, 15 Nov 2024 10:53:57 +0000 (+0000)
Subject: configure: add optional pkg-config support for detecting ICU.
X-Git-Tag: major-relase~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eb9605e814275665ff0a24cbf910f8ce09a8470;p=thirdparty%2Fsqlite.git

configure: add optional pkg-config support for detecting ICU.

FossilOrigin-Name: 3e5b8077c6c6ce72ecab3110eb45943b9765372df789088982dbd6046a7c2523
---

2eb9605e814275665ff0a24cbf910f8ce09a8470
diff --cc auto.def
index 759cf07fe0,6cfc86b2b0..4871a98229
--- a/auto.def
+++ b/auto.def
@@@ -1126,25 -1126,25 +1126,31 @@@ proj-if-opt-truthy math 
  #
  #  --with-icu-ldflags=LDFLAGS
  #  --with-icu-cflags=CFLAGS
- #  --with-icu-config[=/path/to/icu-config]
+ #  --with-icu-config[=auto | pkg-config | /path/to/icu-config]
  #  --enable-icu-collations
  #
- # 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.
+ # --with-icu-config values:
  #
- # If --with-icu-ldflags/cflags and --with-icu-config are provided,
- # they are cumulative.  If neither are provided, icu-collations is not
 -#   - auto: use the first one of (pkg-config, icu-config) found.
++#   - auto: use the first one of (pkg-config, icu-config) found on the
++#     system.
+ #   - pkg-config: use only pkg-config to determine flags
+ #   - /path/to/icu-config: use that to determine flags
+ #
+ # If --with-icu-config is used as neither pkg-config nor icu-config
+ # are found, fail fatally.
+ #
+ # If both --with-icu-ldflags 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.
 -# icu-config binary or (pkg-config icu-uc) are found, we specifically
++# icu-config binary or (pkg-config icu-io) are 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 --cc manifest
index 1ce6cea3c6,a461cdcc05..92cde3b804
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C configure\sscript\sdoc\sadditions\sfor\sthe\sICU\sfeature\scheck.
- D 2024-11-15T10:12:03.805
 -C When\schecking\spkg-config\sfor\sICU\ssupport\suse\sicu-io\sinstead\sof\sicu-uc,\sas\sthat\scontains\sall\srequires\slibs\son\sLinux\sand\sBSD.
 -D 2024-11-15T10:47:11.414
++C configure:\sadd\soptional\spkg-config\ssupport\sfor\sdetecting\sICU.
++D 2024-11-15T10:53:57.203
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -13,7 -13,7 +13,7 @@@ F art/icon-80x90.gif 65509ce3e5f86a9cd6
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
- F auto.def dbbaf480acd0c5b9f330580aec6a43f50e5c37a69b1e5bb3f722c0620f617094
 -F auto.def 1a12e32026291cfe082a9841ccc426db542593b8974f051f1b56823839b5a830
++F auto.def 538d9a162a8fe4811c0a4a22a2a07df40ea4c334f683b94231bfc2a18f14b913
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
  F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
  F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@@ -2198,8 -2198,8 +2198,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 81202d2ab5963fdcf20555b6d0b31cc955ac27f1cd87656faea5c0611c9a2ee8
- R f0c6d5bed8faeb01cfe709bf9d6cb9a1
 -P 09caa94c9e846f9b3669b3f1acbb26b24b8bfcc9e512f17ea074dd92745c2597
 -R b87e57f1447c7c56c265c2868634f094
++P 1925a68fc2323f0788aac9c3c2bb3005182eb3286037bc383181b6aa150d4270 6ca457542e1dceac2d68fe3d29ff1f0beb31a77ca3073bd7d8a6c62faabcdc1d
++R 02dd7c141e8d6d129c07207797697869
++T +closed 6ca457542e1dceac2d68fe3d29ff1f0beb31a77ca3073bd7d8a6c62faabcdc1d Closed\sby\sintegrate-merge.
  U stephan
- Z 5ff845a37175f10e9a57fde007423669
 -Z 7f13984488108361d5319553ed81989a
++Z 467aed797000c9f6ea51561768e3c8cb
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1bd2038e40,4a5a83abdd..1f254347f8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1925a68fc2323f0788aac9c3c2bb3005182eb3286037bc383181b6aa150d4270
 -6ca457542e1dceac2d68fe3d29ff1f0beb31a77ca3073bd7d8a6c62faabcdc1d
++3e5b8077c6c6ce72ecab3110eb45943b9765372df789088982dbd6046a7c2523