Minor cleanups to the previous checkin. No functional changes.

FossilOrigin-Name: 0146a0da534edb9def39dc49f8c3f3055cff2154a0a8b383670e4415021f0e28

diff --git a/auto.def b/auto.def
index e5e5dd003f2364691c39ffed7d3928deb31509ee..ce9a5b2efc570eb9ae3e217713231d3865d2e186 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -1335,22 +1335,6 @@ foreach {boolFlag featureFlag ifSetEvalThis} {
   }
 }
 
-apply {{} {
-  # Copy all CFLAGS entries matching -DSQLITE_OMIT* and
-  # -DSQLITE_ENABLE* to OPT_FEATURE_FLAGS. This behavior is derived
-  # from the legacy build and was missing the 3.48.0 release (the
-  # initial Autosetup port).
-  # https://sqlite.org/forum/forumpost/9801e54665afd728
-  foreach cf [get-define CFLAGS ""] {
-    switch -glob -- $cf {
-      -DSQLITE_OMIT* -
-      -DSQLITE_ENABLE* {
-        sqlite-add-feature-flag $cf
-      }
-    }
-  }
-}}
-
 ########################################################################
 # Invert the above loop's logic for some SQLITE_OMIT_...  cases. If
 # config option $boolFlag is false, [sqlite-add-feature-flag
@@ -1367,8 +1351,28 @@ foreach {boolFlag featureFlag} {
   }
 }
 
+########################################################################
+# Copy all CFLAGS entries matching -DSQLITE_OMIT* and
+# -DSQLITE_ENABLE* to OPT_FEATURE_FLAGS. This behavior is derived
+# from the legacy build and was missing the 3.48.0 release (the
+# initial Autosetup port).
+# https://sqlite.org/forum/forumpost/9801e54665afd728
+#
+# If any configure flags for features are in conflict with
+# CFLAGS-specified feature flags, all bets are off.  There are no
+# guarantees about which one will take precedence.
+foreach cf [get-define CFLAGS ""] {
+  switch -glob -- $cf {
+    -DSQLITE_OMIT* -
+    -DSQLITE_ENABLE* {
+      sqlite-add-feature-flag $cf
+    }
+  }
+}
+
 #########################################################################
-# Show the final feature flag sets:
+# Remove duplicates from the final feature flag sets and show them to
+# the user:
 apply {{} {
   set oFF [get-define OPT_FEATURE_FLAGS]
   if {"" ne $oFF} {

diff --git a/manifest b/manifest
index 253c559eeed925294eab266d7278e4ee6f6d42ef..51b35ce6abc9dca41fb1747c4dca34b64af31563 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbuild\sregression,\sintroduced\sin\s[d2fe6b05f38d9d]\s(3.48.0),\sin\swhich\sSQLITE_OMIT\sand\sSQLITE_ENABLE\sflags\spassed\sto\sconfigure\svia\sCFLAGS\swere\snot\spropagated\sto\sthe\sOPT_FEATURE_FLAGS\slist.\sReported\sin\s[forum:9801e54665afd728|forum\spost\s9801e54665afd728].
-D 2025-01-30T11:16:30.503
+C Minor\scleanups\sto\sthe\sprevious\scheckin.\sNo\sfunctional\schanges.
+D 2025-01-30T11:59:11.599
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,7 +14,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def a7320253577d229daf414dcd643c42d9b3ee353d81a2705ae91476a09765c228
+F auto.def 8b63374e48c2ddf7a8ec2c31e0116b3cfd8262f357aa00e824d6bea918010a35
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2205,8 +2205,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 6d3a3d4e5105a61e73de201f8398dd1548480ae68cb49f2b9809d357f64946ec
-R 159ac299c64886384af636bf7c65df6f
+P eedf45369461a329ada9c89706b1c17e0c02135afe1f43f3e1c8f00b857a6c9c
+R e148b21bd34918b3a7ffbb849ac8fbcb
 U stephan
-Z 53b462d2c2c45db9bc7fbc4dd52f86d5
+Z f33b2af8099eed51a43c2e484e21e8a4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b6083f05b346d8ba33c010e3b86ed8565b31374f..ce486642f8c9d3950d0a37c1ea2e246aa0026c33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eedf45369461a329ada9c89706b1c17e0c02135afe1f43f3e1c8f00b857a6c9c
+0146a0da534edb9def39dc49f8c3f3055cff2154a0a8b383670e4415021f0e28