Fix the --enable-memsysN options in configure so that they actually work.

FossilOrigin-Name: 679552550e085497b98478bbe28056d99fe4aab4

diff --git a/configure b/configure
index ee62dcc9bd654952644e52e4c0261475ecf5f293..de3dfdd49d1f7a8beb1c75437b22f3f5d9d4035b 100755 (executable)
--- a/configure
+++ b/configure
@@ -11349,14 +11349,14 @@ fi
 #
 # Check whether --enable-memsys3 was given.
 if test "${enable_memsys3+set}" = set; then :
-  enableval=$enable_memsys3;
+  enableval=$enable_memsys3; enable_memsys3=yes
 else
-  enable_memsys3=yes
+  enable_memsys3=no
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
 $as_echo_n "checking whether to support MEMSYS3... " >&6; }
-if test "$enable_memsys3" = "yes"; then
+if test "${enable_memsys3}" = "yes"; then
   SQLITE_ENABLE_MEMSYS3=1
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -11367,14 +11367,14 @@ fi
 
 # Check whether --enable-memsys5 was given.
 if test "${enable_memsys5+set}" = set; then :
-  enableval=$enable_memsys5;
+  enableval=$enable_memsys5; enable_memsys5=yes
 else
-  enable_memsys3=yes
+  enable_memsys5=no
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
 $as_echo_n "checking whether to support MEMSYS5... " >&6; }
-if test "$enable_memsys5" = "yes"; then
+if test "${enable_memsys5}" = "yes"; then
   SQLITE_ENABLE_MEMSYS5=1
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }

diff --git a/configure.ac b/configure.ac
index 7ab6bf90247664acb61e739043b5d71632d09073..da8d7db09f38294f174f54d85e6ceda1bad0be86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -592,9 +592,10 @@ fi
 # Do we want to support memsys3 and/or memsys5
 #
 AC_ARG_ENABLE(memsys3, 
-AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),,enable_memsys3=yes)
+  AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
+  [enable_memsys3=yes],[enable_memsys3=no])
 AC_MSG_CHECKING([whether to support MEMSYS3])
-if test "$enable_memsys3" = "yes"; then
+if test "${enable_memsys3}" = "yes"; then
   SQLITE_ENABLE_MEMSYS3=1
   AC_MSG_RESULT([yes])
 else
@@ -602,9 +603,10 @@ else
 fi
 AC_SUBST(SQLITE_MEMSYS5)
 AC_ARG_ENABLE(memsys5, 
-AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),,enable_memsys3=yes)
+  AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),
+  [enable_memsys5=yes],[enable_memsys5=no])
 AC_MSG_CHECKING([whether to support MEMSYS5])
-if test "$enable_memsys5" = "yes"; then
+if test "${enable_memsys5}" = "yes"; then
   SQLITE_ENABLE_MEMSYS5=1
   AC_MSG_RESULT([yes])
 else

diff --git a/manifest b/manifest
index 6391e1baa3cba156511d128d4e9a40e88859f781..2f9c340bb9e5ed7494ac992922f17aacc5c1d848 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s--enable-memsys3\sand\s--enable-memsys5\soptions\sto\sthe\sconfigure\sscript.
-D 2016-07-25T11:27:22.245
+C Fix\sthe\s--enable-memsysN\soptions\sin\sconfigure\sso\sthat\sthey\sactually\swork.
+D 2016-07-25T11:32:09.826
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -30,8 +30,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 7f1096018e7277653bdccbc3522763950716c04e x
-F configure.ac 312a1d5cee98d125c4d5af63ae244d1d4d4e61ae
+F configure 71e6c9bb642ef53357cb8dbc858fc84998f3bc6d x
+F configure.ac b67f6fc9f3e22edabd4be3911289400423e5ffa9
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html e2118945e5f07ed146b45c9cd2b2dd6eabb8ebf2
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -1507,7 +1507,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 e1e022383114525241454f63ea8b9768fb7ec657
-R f029b1d7e77fec56f765d45dc22f3d18
+P 67e1dc9842dc8a6ae5edef21bdb2ef6d3f4a17b7
+R bb2ee4817e32d59609fbb5b8d40bbd12
 U drh
-Z 774059649b6fa0105cfafff42cfa581a
+Z dcc29f2a3f4c1199964573b0937d7a95

diff --git a/manifest.uuid b/manifest.uuid
index 3b4218203e074b4e9747d110cb1776a9a4bb07d5..faaef17b8e58a054c55991f33c8ab0f2981dd5c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-67e1dc9842dc8a6ae5edef21bdb2ef6d3f4a17b7
\ No newline at end of file
+679552550e085497b98478bbe28056d99fe4aab4
\ No newline at end of file