configure: avoid performing multiple checks for -lm on behalf of --enable-fts4 and...

FossilOrigin-Name: 6940caa192fa0cc84dbd24191a940aec96c304c68e60ead8f239e85d093e01e0

diff --git a/auto.def b/auto.def
index eda38ec49779527096b822071da1b12155f30d53..fddcff08a3c334f847473fd6ef11b1f9e6625b28 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -718,7 +718,7 @@ sqlite-check-tcl
 #     to an unexpanded makefile var name.
 #
 #   - CFLAGS_JIMSH = any flags needed for buildng a BTCLSH-compatible
-#     jimsh. The defaults may be pass on to configure as
+#     jimsh. The defaults may be passed on to configure as
 #     CFLAGS_JIMSH=...
 set useJimForCodeGen 0 ; # Set to 1 when using jimsh for code generation.
                          # May affect later decisions.
@@ -818,7 +818,7 @@ proj-if-opt-truthy threadsafe {
 ########################################################################
 # Do we want temporary databases in memory?
 #
-if {1} {
+apply {{} {
   set ts [opt-val with-tempstore no]
   set tsn 1
   msg-checking "Use an in-RAM database for temporary tables? "
@@ -833,8 +833,7 @@ if {1} {
   }
   msg-result $ts
   define TEMP_STORE $tsn
-  unset ts tsn
-}
+}}
 
 ########################################################################
 # sqlite-check-line-editing jumps through proverbial hoops to try to
@@ -1185,11 +1184,13 @@ sqlite-check-emsdk
 # the required linker flags (which may be empty even if the math APIs
 # are found, depending on the OS).
 proc affirm-have-math {featureName} {
-  if {![msg-quiet proj-check-function-in-lib log m]} {
-    user-error "Missing math APIs for $featureName"
+  if {"" eq [get-define LDFLAGS_MATH ""]} {
+    if {![msg-quiet proj-check-function-in-lib log m]} {
+      user-error "Missing math APIs for $featureName"
+    }
+    define LDFLAGS_MATH [get-define lib_log ""]
+    undefine lib_log
   }
-  define LDFLAGS_MATH [get-define lib_log ""]
-  undefine lib_log
 }
 
 ########################################################################

diff --git a/manifest b/manifest
index 22d5ef6cc2bb722fea4e7c1f32cdb438456dbab7..07716f5a0bf2485361ecc7e39af9776b0783930c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\svfstrace.c\sextension\sto\sshow\ssymbolic\snames\sfor\sthe\svarious\nSHM\slocks.
-D 2024-11-13T18:23:18.773
+C configure:\savoid\sperforming\smultiple\schecks\sfor\s-lm\son\sbehalf\sof\s--enable-fts4\sand\s--enable-fts5.
+D 2024-11-14T12:09:09.948
 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 dd7d48438426327c37f51f8e289492058744656e2da03197c31e4fb76398050c
+F auto.def 82d2276abaf7f590b700fa0c2db952a76a6ecac53d98f54a72d969269d31db36
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2199,8 +2199,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 2560cc7072c923f534a5de1e15d2b0dd4ac5faf0a8876d9e3bf9804345585444
-R 5d29f4bc70b99f0334d8d6e56e448522
-U drh
-Z 8e77042ea0a98703802cf67ef314193e
+P c0dd7de8f1e8eb745a8beff086d8b40b289c2dd75fe099a86ccc2bd0581f5e9a
+R 892e60ac59326933dc516a31c2821f96
+U stephan
+Z f6f990db909fc14949365b2f71d1a958
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 446d6d59f612fa47552f3d81f9a53de4e4010522..cadad5f64a0aed24b08133eadf5aaae8a47b08b8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c0dd7de8f1e8eb745a8beff086d8b40b289c2dd75fe099a86ccc2bd0581f5e9a
+6940caa192fa0cc84dbd24191a940aec96c304c68e60ead8f239e85d093e01e0