From: drh <>
Date: Tue, 9 Mar 2021 16:35:14 +0000 (+0000)
Subject: Math functions are enabled by default in the main configure script.
X-Git-Tag: version-3.35.0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42c93b5e9f061e3f29b7db3ce1d46fdc1a480980;p=thirdparty%2Fsqlite.git

Math functions are enabled by default in the main configure script.

FossilOrigin-Name: b7456e0715c63308b7b3acf49eb66ecd947481400d4688ae459e2e1499447bcd
---

diff --git a/configure b/configure
index 1858b99f15..50792db785 100755
--- a/configure
+++ b/configure
@@ -903,8 +903,8 @@ with_readline_inc
 enable_debug
 enable_amalgamation
 enable_load_extension
-enable_all
 enable_math
+enable_all
 enable_memsys5
 enable_memsys3
 enable_fts3
@@ -1558,8 +1558,8 @@ Optional Features:
                           separately
   --disable-load-extension
                           Disable loading of external extensions
-  --enable-all            Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions
   --disable-math          Disable math functions
+  --enable-all            Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions
   --enable-memsys5        Enable MEMSYS5
   --enable-memsys3        Enable MEMSYS3
   --enable-fts3           Enable the FTS3 extension
@@ -11421,16 +11421,6 @@ else
   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi
 
-
-########
-# The --enable-all argument is short-hand to enable
-# multiple extensions.
-# Check whether --enable-all was given.
-if test "${enable_all+set}" = set; then :
-  enableval=$enable_all;
-fi
-
-
 ##########
 # Do we want to support math functions
 #
@@ -11441,7 +11431,10 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support math functions" >&5
 $as_echo_n "checking whether to support math functions... " >&6; }
-if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "$enable_math" = "no"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MATH_FUNCTIONS"
@@ -11501,11 +11494,18 @@ if test "$ac_res" != no; then :
 
 fi
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi
 
+
+########
+# The --enable-all argument is short-hand to enable
+# multiple extensions.
+# Check whether --enable-all was given.
+if test "${enable_all+set}" = set; then :
+  enableval=$enable_all;
+fi
+
+
 ##########
 # Do we want to support memsys3 and/or memsys5
 #
diff --git a/configure.ac b/configure.ac
index fc56371b96..70664dd411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -591,27 +591,27 @@ else
   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi
 
-
-########
-# The --enable-all argument is short-hand to enable
-# multiple extensions.
-AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all],
-      [Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions]))
-
 ##########
 # Do we want to support math functions
 #
 AC_ARG_ENABLE(math, 
 AC_HELP_STRING([--disable-math],[Disable math functions]))
 AC_MSG_CHECKING([whether to support math functions])
-if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "$enable_math" = "no"; then
+  AC_MSG_RESULT([no])
+else
   AC_MSG_RESULT([yes])
   OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MATH_FUNCTIONS"
   AC_SEARCH_LIBS(ceil, m)
-else
-  AC_MSG_RESULT([no])
 fi
 
+
+########
+# The --enable-all argument is short-hand to enable
+# multiple extensions.
+AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all],
+      [Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions]))
+
 ##########
 # Do we want to support memsys3 and/or memsys5
 #
diff --git a/manifest b/manifest
index c4660f9abd..d98d10904f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sconfigure\sscript.\s\sMath\sfunctions\sare\senabled\nby\s--enable-all.
-D 2021-03-09T13:53:39.913
+C Math\sfunctions\sare\senabled\sby\sdefault\sin\sthe\smain\sconfigure\sscript.
+D 2021-03-09T16:35:14.946
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -34,8 +34,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 93d61f9bf141b9843b827e46d4ea965ece9344ac24cfffcba480d42d96ef62be x
-F configure.ac 839cabc5eb36b510dd9480d2890bee78f2b3db2c794fe03e1284106d299600dc
+F configure e8b5dc901c21f76a169d673bbfdee33350e68de59c0eaaade6d2de87884319db x
+F configure.ac 4e4b58b32f88c8da9914a2f2c3158f80e69907eccc019fcc7e3ba14ffd91c640
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/lemon.html 1bb72ece6271df0d901d233551dd985f2c6ba30d09382cf2d321ed951ab57491
@@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f86d8fae3b29de014d8bfcae38a15bdb15ddceabfcfff7829f3145cfd69dff2a
-R b60d7a43de7f3890003ba8300f69aac6
+P c79c6d18dee608e54ae31388b240cc521218309094502d8815111bb4ddf7d9ef
+R f581e1d9050c425139b43d0cdb2da613
 U drh
-Z 5304f26683ff2b02766a55ec7d7248c3
+Z bb7c5f3d3cf2818db8710511bff707ec
diff --git a/manifest.uuid b/manifest.uuid
index 5a9081cc2d..c9d6cbf9d2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c79c6d18dee608e54ae31388b240cc521218309094502d8815111bb4ddf7d9ef
\ No newline at end of file
+b7456e0715c63308b7b3acf49eb66ecd947481400d4688ae459e2e1499447bcd
\ No newline at end of file