Merge trunk into wasi-patches branch and add missing yes/no result to the configure...

FossilOrigin-Name: adc0ede0a43241b85563408d0de8e640a75ec4f7bdfe5e48acc5cdd6b182b88c

diff --cc configure
index 7b1a6d4d6b0a40e5c0f87a8d1e64189fa502b28f,75ca8935ffbcef2a768d55fac0c65197ad5932d2..56e74f5ecc9e97344e47d1968c4727f7f217c869
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -10397,64 -10393,6 +10397,68 @@@ RELEASE=`cat $srcdir/VERSION
  $as_echo "$as_me: Release set to $RELEASE" >&6;}
  
  
 +##########
 +# Handle --with-wasi-sdk=DIR
 +#
 +# This must be early because it changes the toolchain.
 +#
 +
 +# Check whether --with-wasi-sdk was given.
 +if test "${with_wasi_sdk+set}" = set; then :
 +  withval=$with_wasi_sdk; with_wasisdk=${withval}
 +fi
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WASI SDK directory" >&5
 +$as_echo_n "checking for WASI SDK directory... " >&6; }
 +if ${ac_cv_c_wasi_sdk+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +
 +  # First check to see if --with-tcl was specified.
 +  if test x"${with_wasi_sdk}" != x ; then
 +    if ! test -d "${with_wasi_sdk}" ; then
 +      as_fn_error $? "${with_wasi_sdk} directory doesn't exist" "$LINENO" 5
 +    fi
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&5
 +$as_echo "${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&6; }
 +    use_wasi_sdk=yes
 +  else
 +    use_wasi_sdk=no
 +  fi
 +
 +fi
 +
 +if test "${use_wasi_sdk}" = "no" ; then
 +  HAVE_WASI_SDK=""
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
 +else
 +  HAVE_WASI_SDK=1
 +# Changing --host and --target have no effect here except to possibly
 +# cause confusion. autoconf has finished processing them by this
 +# point.
 +#
 +#  host_alias=wasm32-wasi
 +#  target=wasm32-wasi
 +#
 +# Merely changing CC and LD to the wasi-sdk's is enough to get
 +# sqlite3.o building in WASM format.
 +  CC="${with_wasi_sdk}/bin/clang"
 +  LD="${with_wasi_sdk}/bin/wasm-ld"
 +  RANLIB="${with_wasi_sdk}/bin/llvm-ranlib"
 +  cross_compiling=yes
 +  enable_threadsafe=no
 +  use_tcl=no
 +  enable_tcl=no
 +  # libtool is apparently hard-coded to use gcc for linking DLLs, so
 +  # we disable the DLL build...
 +  enable_shared=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
 +fi
 +
 +
 +
  #########
  # Locate a compiler for the build machine.  This compiler should
  # generate command-line programs that run on the build machine.

diff --cc configure.ac
index 5391f08020a3e323e8ef45e78bfcaad458dc24fa,5f905db40caad90d622a9be5744a996dd44453af..53be0a6868599d18dc0384bacb9259393adef8ab
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -158,54 -158,6 +158,56 @@@ RELEASE=`cat $srcdir/VERSION
  AC_MSG_NOTICE(Release set to $RELEASE)
  AC_SUBST(RELEASE)
  
 +##########
 +# Handle --with-wasi-sdk=DIR
 +#
 +# This must be early because it changes the toolchain.
 +#
 +AC_ARG_WITH(wasi-sdk,
 +AS_HELP_STRING([--with-wasi-sdk=DIR],
 +       [directory containing the WASI SDK. Triggers cross-compile to WASM.]), with_wasisdk=${withval})
 +AC_MSG_CHECKING([for WASI SDK directory])
 +AC_CACHE_VAL(ac_cv_c_wasi_sdk,[
 +  # First check to see if --with-tcl was specified.
 +  if test x"${with_wasi_sdk}" != x ; then
 +    if ! test -d "${with_wasi_sdk}" ; then
 +      AC_MSG_ERROR([${with_wasi_sdk} directory doesn't exist])
 +    fi
 +    AC_MSG_RESULT([${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL])
 +    use_wasi_sdk=yes
 +  else
 +    use_wasi_sdk=no
 +  fi
 +])
 +if test "${use_wasi_sdk}" = "no" ; then
 +  HAVE_WASI_SDK=""
++  AC_MSG_RESULT([no])
 +else
 +  HAVE_WASI_SDK=1
 +# Changing --host and --target have no effect here except to possibly
 +# cause confusion. autoconf has finished processing them by this
 +# point.
 +#
 +#  host_alias=wasm32-wasi
 +#  target=wasm32-wasi
 +#
 +# Merely changing CC and LD to the wasi-sdk's is enough to get
 +# sqlite3.o building in WASM format.
 +  CC="${with_wasi_sdk}/bin/clang"
 +  LD="${with_wasi_sdk}/bin/wasm-ld"
 +  RANLIB="${with_wasi_sdk}/bin/llvm-ranlib"
 +  cross_compiling=yes
 +  enable_threadsafe=no
 +  use_tcl=no
 +  enable_tcl=no
 +  # libtool is apparently hard-coded to use gcc for linking DLLs, so
 +  # we disable the DLL build...
 +  enable_shared=no
++  AC_MSG_RESULT([yes])
 +fi
 +AC_SUBST(HAVE_WASI_SDK)
 +
 +
  #########
  # Locate a compiler for the build machine.  This compiler should
  # generate command-line programs that run on the build machine.

diff --cc manifest
index 7c99ab488330ce6ce7f322e4c8fd6af08683915e,863f3ea91d779eb1b930850bc6ac11c57015d26b..a10ed5916eb9654736ff4a6e2edebec10da5feb9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Incorporate\swasi-sdk\sRANLIB\sconfigure\sscript\spatch\sfrom\sthe\sVMware\sOCTO\steam.
- D 2022-12-24T15:34:16.082
 -C Fix\sduplicate\ssemicolon\sin\sbtreeInt.h.\n[forum:/forumpost/8db1711ca2|Forum\spost\s8db1711ca2]
 -D 2023-01-11T20:52:15.984
++C Merge\strunk\sinto\swasi-patches\sbranch\sand\sadd\smissing\syes/no\sresult\sto\sthe\sconfigure\sscript's\soutput\sfor\sthe\s--with-wasi-sdk=PATH\stest.
++D 2023-01-11T22:45:20.283
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -33,8 -33,8 +33,8 @@@ F autoconf/tea/win/nmakehlp.c b01f822ea
  F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
  F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
  F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
- F configure 7932e767cf730e8161b65bca56dee4d3bba56acd90808ac262e8c6345d1ca006 x
- F configure.ac b5f9355c46b73222ea1a9a16be868e016adda9b9b6349bfc3f72ae267f38331c
 -F configure 9cbf6a15a4b5f2b3551a466420e5f51ce04c40aaed7f90c886402bf0b66ec110 x
 -F configure.ac 48dc6bfee293eef05910faf085760f2fd79b680aa47b50e8e6a22ca40bb026bb
++F configure 6ba84abf7878bb072d460766d29e492028468775d4c09464940343092eb6493c x
++F configure.ac 4654d32ac0a0d0b48f1e1e79bdc3d777b723cf2f63c33eb1d7c4ed8b435938e8
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
  F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
@@@ -627,9 -627,9 +627,9 @@@ F src/notify.c 89a97dc854c3aa62ad5f384e
  F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97
  F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
- F src/os_kv.c 73f89ab97ecdb3216857d2acc8395103f89164eaadac87cce4e9e16445c89541
+ F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c 1086fcd1e024f009576d64bb7e1fc7f2cbcb5076c26246c5be127143330a9658
 -F src/os_unix.c 9107314500e44908e8d2cdf1ed3333ca5fa17dcfdf9c6a079002b4df90d5f806
++F src/os_unix.c ca8e0cd2fb8ec774cfe6bb1f101e480f2a8f913716976d95c5556fee780c099e
  F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c d3122cf67f327f1e2df12d06236a3473a8099542071e257067552f42917f172d
@@@ -645,12 -645,12 +645,12 @@@ F src/printf.c ff4b05e38bf928ff1b80d3dd
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 83de67e4857be2866d048c98e93f65461d8a0408ca4ce88fec68ebfe030997ae
- F src/shell.c.in 8e411527c1b470c16e83be447ad6f8e957af7cf35a92ccce96e73fa286377b6f
- F src/sqlite.h.in 0d6a58aaf31e88f309d4ca0e06611182785adaa969ae0ab44db2febcc6045b77
+ F src/select.c 146222acbf9ea4e7f99c45a9e3cb4a0ba7e02c4f0df5186094ea1f9ea9907a02
 -F src/shell.c.in f7c75d1a9f900516e40f17f040668d5797592344bd88cff7ee7df586de6893c6
 -F src/sqlite.h.in 231d505c86ac4688b82259529273fe5fb2cce86cb80ea50628ff776113b5c706
++F src/shell.c.in 007d30baf6aa51e5b7148facab9c5a92ada9e684a2436b70062c7cbca320d1b0
++F src/sqlite.h.in 7be540a872826ab3374534b4dae855faf03b28db78e995e6fe98cb833c3607c4
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
- F src/sqliteInt.h 98bc12d3191ff4c70e8491b639784c83d577b7177377d4fb344826ac56bae8a8
+ F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
+ F src/sqliteInt.h 079ccd9c161f4b74967188fd6321810159fdc4c32371b68559719828fac20f43
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2067,8 -2068,8 +2068,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 52f40ab12e437c59af2b91c7ac105ab7784db57fc8d9ab7a1356f17092681f43
- R 93cdd50555e4edfd8abc358599b58d5a
 -P ab5bcb91cda45576ae9f3f272ec92eb3be3c26436a440ebb89f51f49c42e0fd2
 -R 06e2ca2ba2e5fe806ceb97c200db87f2
 -U drh
 -Z 3af3ada0fac1f257d08b7786ac3b51a1
++P 478fe96ee7f3ffd5732231b75e6f04e898a59368b3c91f79e6af9496dfcef6d3 7526c46632578a2b602622b9debc406b52af4a42cc880970c4307d13853d59d3
++R 5ee0a5dc148df08bb72fa9f7b42ab4d1
 +U stephan
- Z 748c24f9d507d828fe21c349ea9e2c67
++Z 38bf5f86327b02eef8312b8f75a4ee2f
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 433404363d5d3a2c2c5c01838056a7cf71be04c1,e0cc37f71e242f7cbea0c5e873f144ed851426dc..ffbab4fa11003faca0db7d8e804d47aa3e857ecd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 478fe96ee7f3ffd5732231b75e6f04e898a59368b3c91f79e6af9496dfcef6d3
 -7526c46632578a2b602622b9debc406b52af4a42cc880970c4307d13853d59d3
++adc0ede0a43241b85563408d0de8e640a75ec4f7bdfe5e48acc5cdd6b182b88c

diff --cc src/os_unix.c
Simple merge

diff --cc src/shell.c.in
Simple merge

diff --cc src/sqlite.h.in
Simple merge